Thomas Buck 10 anni fa
parent
commit
ac446b1050
4 ha cambiato i file con 4 aggiunte e 12 eliminazioni
  1. 2
    0
      ChangeLog
  2. BIN
      data/font-0.tga
  3. 2
    11
      src/Render.cpp
  4. 0
    1
      test/mtk_tga.cpp

+ 2
- 0
ChangeLog Vedi File

@@ -6,6 +6,8 @@
6 6
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
7 7
 
8 8
 	[ 20140111 ]
9
+	* Rewrote GLString Unit Test, now using TTF Font
10
+	* Removed included TGA font and loading code
9 11
 	* Rewrote Matrix Unit Test now using greatest
10 12
 	* Documented MatMath, fixed bug in helRandomNum(),
11 13
 	  added better Unit Test

BIN
data/font-0.tga Vedi File


+ 2
- 11
src/Render.cpp Vedi File

@@ -252,23 +252,14 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
252 252
 	}
253 253
 
254 254
 	extern char *gFontFilename;
255
-	if (mTexture.loadFontTTF(gFontFilename,
255
+	if ((font_id = mTexture.loadFontTTF(gFontFilename,
256 256
 									  //0x303f, 0x3093-0x303f)) // Hiragana
257
-									  32, 126 - 32)  // ASCII
257
+									  32, 126 - 32))  // ASCII
258 258
 		 > -1)
259 259
 	{
260 260
 		++numTextures;
261 261
 	}
262 262
 
263
-	snprintf(filename, 126, "%s%s", textureDir, "font-0.tga");
264
-	filename[127] = 0;
265
-
266
-	if ((font_id = mTexture.loadTGA(filename)) > -1)
267
-	{
268
-		++numTextures;
269
-        printf("Loaded TGA Font into %d\n", font_id);
270
-	}
271
-
272 263
 	// Werid that it isn't linear, must be some storage deal in Texture
273 264
 	// I forgot about Id allocation
274 265
 	*nextId = font_id;

+ 0
- 1
test/mtk_tga.cpp Vedi File

@@ -11,7 +11,6 @@
11 11
 
12 12
 //! \todo generate list?
13 13
 const char *testFiles[] = {
14
-    "data/font-0.tga",
15 14
     "data/particle.tga",
16 15
     "data/snow.tga",
17 16
     "data/snow2.tga",

Loading…
Annulla
Salva