From a6e0668d84a3e1dc2b02d944c81446cd986256f3 Mon Sep 17 00:00:00 2001 From: flowtron Date: Fri, 30 Jul 2010 19:34:24 +0000 Subject: [PATCH] removing dependency on TTF libraries git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5487 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/Makefile | 6 ++++-- source/src/main.cpp | 5 +++-- source/src/platform.h | 2 +- source/src/rendertext.cpp | 44 ++++++++++++++++++++++----------------- 4 files changed, 33 insertions(+), 24 deletions(-) diff --git a/source/src/Makefile b/source/src/Makefile index 166c8503..3fe92cb3 100644 --- a/source/src/Makefile +++ b/source/src/Makefile @@ -19,12 +19,14 @@ MV=mv ifneq (,$(findstring MINGW,$(PLATFORM))) WINDRES= windres CLIENT_INCLUDES= $(INCLUDES) -I../include -CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lSDL_ttf -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -ljpeg -llibintl -lws2_32 -lwinmm +# -lSDL_ttf +CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -ljpeg -llibintl -lws2_32 -lwinmm else USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi) override CXXFLAGS+= -rdynamic CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include -CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs` -lSDL_image -lSDL_ttf -lz -lGL -lopenal -lvorbisfile -ljpeg +# -lSDL_ttf +CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -ljpeg endif CLIENT_OBJS= \ diff --git a/source/src/main.cpp b/source/src/main.cpp index fb90558e..662ea545 100644 --- a/source/src/main.cpp +++ b/source/src/main.cpp @@ -886,8 +886,9 @@ int main(int argc, char **argv) int usedcolorbits = 0, useddepthbits = 0, usedfsaa = 0; setupscreen(usedcolorbits, useddepthbits, usedfsaa); - initlog("font"); - initfont(); + // no more TTF ATM. + //initlog("font"); + //initfont(); initlog("video: misc"); SDL_WM_SetCaption("AssaultCube", NULL); diff --git a/source/src/platform.h b/source/src/platform.h index e5cbee36..e4d8d635 100644 --- a/source/src/platform.h +++ b/source/src/platform.h @@ -45,7 +45,7 @@ #ifndef STANDALONE #include #include - #include + //#include #include diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp index 21ea3b6e..46042166 100644 --- a/source/src/rendertext.cpp +++ b/source/src/rendertext.cpp @@ -112,7 +112,7 @@ extern int shdsize, outline, win32msg; #define BMASK 0x00ff0000 #define AMASK 0xff000000 #endif - +/* // ringbuf for utf8 character storage struct charringbuf : ringbuf { @@ -129,6 +129,7 @@ struct charringbuf : ringbuf } }; + TTF_Font *ttffont = NULL; font utf8font; charringbuf utf8chars; @@ -237,7 +238,7 @@ font::charinfo *loadchar(int code) idx = utf8chars.findbycharcode(code); return &utf8chars[idx]; } - +*/ int draw_char(font &f, font::charinfo &info, int charcode, int x, int y) { // fixme @@ -259,6 +260,7 @@ int draw_char(font &f, font::charinfo &info, int charcode, int x, int y) return info.w; } +/* // fixme font::charinfo &getcharinfo(int c) { @@ -267,12 +269,12 @@ font::charinfo &getcharinfo(int c) font::charinfo &info = curfont->chars[c-curfont->skip]; return info; } - else - { - font::charinfo &info = *loadchar(c); - return info; - } + //else { font::charinfo &info = *loadchar(c); return info; } + //return NULL; + font::charinfo &info = curfont->chars[0]; // 0 || (FONTCHARS-1) + return info; } +*/ static int draw_char(int c, int x, int y) { @@ -282,6 +284,7 @@ static int draw_char(int c, int x, int y) return draw_char(*curfont, info, c, x, y); } + /* else { // fixme @@ -291,6 +294,8 @@ static int draw_char(int c, int x, int y) return draw_char(utf8font, info, c, x, y); } + */ + return 0; } @@ -327,30 +332,30 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a case 'D':color = bvec( 0xF8, 0x98, 0x4E); break; // case 'E':color = bvec( 0xFF, 0xFF, 0xB7); break; // yellow set - case 'F':color = bvec( 0xCC, 0xCC, 0x33); break; // + case 'F':color = bvec( 0xCC, 0xCC, 0x33); break; // case 'G':color = bvec( 0x66, 0x66, 0x33); break; // case 'H':color = bvec( 0xCC, 0xFC, 0x58); break; // - + case 'I':color = bvec( 0xB7, 0xFF, 0xB7); break; // green set case 'J':color = bvec( 0x33, 0xCC, 0x33); break; // case 'K':color = bvec( 0x33, 0x66, 0x33); break; // case 'L':color = bvec( 0x3F, 0xFF, 0x98); break; // - + case 'M':color = bvec( 0xB7, 0xFF, 0xFF); break; // cyan set case 'N':color = bvec( 0x33, 0xCC, 0xCC); break; // case 'O':color = bvec( 0x33, 0x66, 0x66); break; // case 'P':color = bvec( 0x4F, 0xCC, 0xF8); break; // - + case 'Q':color = bvec( 0xB7, 0xB7, 0xFF); break; // blue set - case 'R':color = bvec( 0x33, 0x33, 0xCC); break; // + case 'R':color = bvec( 0x33, 0x33, 0xCC); break; // case 'S':color = bvec( 0x33, 0x33, 0x66); break; // case 'T':color = bvec( 0xA0, 0x49, 0xFF); break; // - + case 'U':color = bvec( 0xFF, 0xB7, 0xFF); break; // magenta set case 'V':color = bvec( 0xCC, 0x33, 0xCC); break; // case 'W':color = bvec( 0x66, 0x33, 0x66); break; // case 'X':color = bvec( 0xFF, 0x01, 0xD5); break; // - + case 'Y':color = bvec( 0xC7, 0xD1, 0xE2); break; // lt gray case 'Z':color = bvec( 0x32, 0x32, 0x32); break; // dark gray // white (provided color): everything else @@ -512,12 +517,12 @@ void text_bounds(const char *str, int &width, int &height, int maxwidth) /** This is the 1.0.4 function It will substituted by draw_text_wip I am putting this temporarily here because it is impossible to test without colours : Brahma */ -void draw_text(const char *str, int left, int top, int r, int g, int b, int a, int cursor, int maxwidth) +void draw_text(const char *str, int left, int top, int r, int g, int b, int a, int cursor, int maxwidth) { #define TEXTINDEX(idx) if(idx == cursor) { cx = x; cy = y; cc = str[idx]; } #define TEXTTAB(idx) TEXTGETCOLUMN #define TEXTWHITE(idx) -#define TEXTLINE(idx) +#define TEXTLINE(idx) #define TEXTCOLOR(idx) text_color(str[idx], colorstack, sizeof(colorstack), colorpos, color, a); #define TEXTCHAR(idx) x += draw_char(c, left+x, top+y)+1; #define TEXTWORD TEXTWORDSKELETON @@ -547,7 +552,8 @@ void draw_text(const char *str, int left, int top, int r, int g, int b, int a, i #undef TEXTWORD } -/** WIP ALERT */ +/* WIP ALERT */ +/* void draw_text_wip(const char *str, int left, int top, int r, int g, int b, int a, int cursor, int maxwidth) { char colorstack[10]; @@ -705,10 +711,10 @@ void draw_text_wip(const char *str, int left, int top, int r, int g, int b, int rendercursor(left+cx, top+cy, cw); } } - +*/ void reloadfonts() { - createutf8charset(); + //createutf8charset(); enumerate(fonts, font, f, if(!reloadtexture(*f.tex)) fatal("failed to reload font texture");