|
@@ -196,10 +196,10 @@ void glPrint2d(float x, float y, float scale, char *string)
|
196
|
196
|
glTranslatef(x, y, 0);
|
197
|
197
|
glScalef(scale, scale, 1);
|
198
|
198
|
|
199
|
|
- /* FIXME:
|
|
199
|
+ /*! \fixme
|
200
|
200
|
* Add utf-8 dencoding of char* string
|
201
|
201
|
*
|
202
|
|
- * Also this string must be preprocessed to have glyph offsets
|
|
202
|
+ * Also this string must be preprocessed to have glyph offsets
|
203
|
203
|
* instead of ASCII text in it and support counts over 256 */
|
204
|
204
|
glListBase(font->drawListBase - font->utf8Offset);
|
205
|
205
|
glCallLists(strlen(string), GL_BYTE, string);
|
|
@@ -264,7 +264,7 @@ int Texture::loadFontTTF(char *filename,
|
264
|
264
|
if (texture)
|
265
|
265
|
{
|
266
|
266
|
#ifdef DUMP_TTF_TGA
|
267
|
|
- FILE *f = fopen("/tmp/font.tga", "wb");
|
|
267
|
+ FILE *f = fopen("font.tga", "wb");
|
268
|
268
|
if (f)
|
269
|
269
|
{
|
270
|
270
|
mtk_image__tga_save(f, texture->texture, 256, 256, 4);
|
|
@@ -272,7 +272,7 @@ int Texture::loadFontTTF(char *filename,
|
272
|
272
|
}
|
273
|
273
|
else
|
274
|
274
|
{
|
275
|
|
- perror("/tmp/ttf_font.tga");
|
|
275
|
+ perror("ttf_font.tga");
|
276
|
276
|
}
|
277
|
277
|
#endif
|
278
|
278
|
|
|
@@ -308,7 +308,7 @@ gl_font_t *Texture::generateFont(ttf_texture_t *texture)
|
308
|
308
|
if (!texture)
|
309
|
309
|
return NULL;
|
310
|
310
|
|
311
|
|
- printf("@ Generating gl font from texture...\n");
|
|
311
|
+ printf("Generating gl font from texture...\n");
|
312
|
312
|
|
313
|
313
|
font = new gl_font_t;
|
314
|
314
|
font->utf8Offset = texture->utf8Offset;
|
|
@@ -439,7 +439,7 @@ ttf_texture_t *Texture::generateFontTexture(char *filename, int pointSize,
|
439
|
439
|
TTF_SetFontStyle(font, renderStyle);
|
440
|
440
|
|
441
|
441
|
/* Allocate a new TTF font texture */
|
442
|
|
- printf("@ Creating font texture from '%s'...\n", filename);
|
|
442
|
+ printf("Creating font texture from '%s'...\n", filename);
|
443
|
443
|
texture = new ttf_texture_t;
|
444
|
444
|
texture->width = textureWidth;
|
445
|
445
|
texture->utf8Offset = utf8Offset;
|
|
@@ -557,7 +557,7 @@ void Texture::initSDL_TTF()
|
557
|
557
|
{
|
558
|
558
|
mFlags |= fUseSDL_TTF;
|
559
|
559
|
|
560
|
|
- printf("@ Started SDL_TTF subsystem...\n");
|
|
560
|
+ printf("Started SDL_TTF subsystem!\n");
|
561
|
561
|
atexit(TTF_Quit);
|
562
|
562
|
}
|
563
|
563
|
#endif
|
|
@@ -1035,9 +1035,6 @@ int Texture::loadPNG(char *filename)
|
1035
|
1035
|
(type == 4) ? RGBA : RGB,
|
1036
|
1036
|
(type == 4) ? 32 : 24);
|
1037
|
1037
|
|
1038
|
|
- printf("%c", (id == -1) ? 'x' : 'o');
|
1039
|
|
- fflush(stdout);
|
1040
|
|
-
|
1041
|
1038
|
delete [] image;
|
1042
|
1039
|
}
|
1043
|
1040
|
|
|
@@ -1097,9 +1094,6 @@ int Texture::loadTGA(char *filename)
|
1097
|
1094
|
(type == 4) ? RGBA : RGB,
|
1098
|
1095
|
(type == 4) ? 32 : 24);
|
1099
|
1096
|
|
1100
|
|
- printf("%c", (id == -1) ? 'x' : 'o');
|
1101
|
|
- fflush(stdout);
|
1102
|
|
-
|
1103
|
1097
|
delete [] image;
|
1104
|
1098
|
}
|
1105
|
1099
|
|