Browse Source

Removed TGA font

Thomas Buck 11 years ago
parent
commit
ac446b1050
4 changed files with 4 additions and 12 deletions
  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 View File

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

BIN
data/font-0.tga View File


+ 2
- 11
src/Render.cpp View File

252
 	}
252
 	}
253
 
253
 
254
 	extern char *gFontFilename;
254
 	extern char *gFontFilename;
255
-	if (mTexture.loadFontTTF(gFontFilename,
255
+	if ((font_id = mTexture.loadFontTTF(gFontFilename,
256
 									  //0x303f, 0x3093-0x303f)) // Hiragana
256
 									  //0x303f, 0x3093-0x303f)) // Hiragana
257
-									  32, 126 - 32)  // ASCII
257
+									  32, 126 - 32))  // ASCII
258
 		 > -1)
258
 		 > -1)
259
 	{
259
 	{
260
 		++numTextures;
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
 	// Werid that it isn't linear, must be some storage deal in Texture
263
 	// Werid that it isn't linear, must be some storage deal in Texture
273
 	// I forgot about Id allocation
264
 	// I forgot about Id allocation
274
 	*nextId = font_id;
265
 	*nextId = font_id;

+ 0
- 1
test/mtk_tga.cpp View File

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

Loading…
Cancel
Save