replace SDL_DrawText with FC_FontCache

Author: Jeffrey Clark

fonts/default.ttf

@@ -56,8 +56,8 @@ EXE = ../$(EXE_BASE)$(EXE_EXT)
 
 # ...  by RDG2010
 ifeq ($(BUILD_SINGE),1)
-LIBS += $(shell ${PKG_CONFIG} --libs lua SDL2_mixer SDL2_image SDL2_ttf)
-PFLAGS += -DBUILD_SINGE $(shell ${PKG_CONFIG} --cflags SDL2_mixer SDL2_image SDL2_ttf)
+LIBS += $(shell ${PKG_CONFIG} --libs lua SDL2_mixer SDL2_image)
+PFLAGS += -DBUILD_SINGE $(shell ${PKG_CONFIG} --cflags SDL2_mixer SDL2_image)
 OBJS += game/singe/*.o
 endif
 
@@ -67,7 +67,7 @@ LIBS += $(shell ${PKG_CONFIG} --libs libmpeg2 libmpeg2convert)
 
 # Platform specific cflags defined in the Makefile.vars file
 export CFLAGS = $(shell ${SDL_CONFIG} --cflags) ${PFLAGS} -Werror
-LIBS += $(shell ${SDL_CONFIG} --libs)
+LIBS += $(shell ${SDL_CONFIG} --libs) $(shell ${PKG_CONFIG} --libs SDL2_ttf)
 
 OBJS += ldp-out/*.o cpu/*.o game/*.o io/*.o timer/*.o ldp-in/*.o video/*.o \
 	sound/*.o daphne.o cpu/x86/*.o scoreboard/*.o ${VLDP_OBJS}
@@ -110,7 +110,7 @@ clean:	clean_deps
 testvldp: CFLAGS += -DVLDP_BENCHMARK
 testvldp: vldp testvldp.c
 	$(CC_MSG)
-	$(SILENT)${CC} ${CFLAGS} -DSHOW_FRAMES testvldp.c ${VLDP_OBJS} ${LIBS} -o ../testvldp$(EXE_EXT)
+	$(SILENT)${CC} ${CFLAGS} -DSHOW_FRAMES testvldp.c video/SDL_FontCache.c ${VLDP_OBJS} ${LIBS} -o ../testvldp$(EXE_EXT)
 
 %.d : %.cpp
 	$(GEN_MSG)

src/Makefile

@@ -1,8 +1,7 @@
 #include <SDL.h>
 
+#include "video/SDL_FontCache.h"
 #include "vldp/vldp.h"     // VLDP stuff
-#include "io/dll.h"        // for DLL stuff
-#include "video/yuv2rgb.h" // to bypass SDL's yuv overlay and do it ourselves ...
 
 #ifndef WIN32
 #include <unistd.h> // for chdir
@@ -39,6 +38,7 @@ unsigned int g_uQuitFlag = 0;
 SDL_Window *g_window     = NULL;
 SDL_Renderer *g_renderer = NULL;
 SDL_Texture *g_texture   = NULL;
+FC_Font     *g_font      = NULL;
 SDL_RendererInfo g_rendererinfo;
 
 void printerror(const char *cpszErrMsg) { puts(cpszErrMsg); }
@@ -61,6 +61,7 @@ void display_frame_callback()
 #ifdef SHOW_FRAMES
     SDL_RenderClear(g_renderer);
     SDL_RenderCopy(g_renderer, g_texture, NULL, NULL);
+    FC_Draw(g_font, g_renderer, 0, 0, "%d", g_uFrameCount);
     SDL_RenderPresent(g_renderer); // display it!
 #endif                             // SHOW_FRAMES
 }
@@ -140,8 +141,6 @@ void set_cur_dir(const char *exe_loc)
 
 int main(int argc, char **argv)
 {
-    //	DLL_INSTANCE dll_instance = NULL;
-
     set_cur_dir(argv[0]);
 #ifdef SHOW_FRAMES
     SDL_Init(SDL_INIT_VIDEO);
@@ -156,6 +155,10 @@ int main(int argc, char **argv)
 
     SDL_GetRendererInfo(g_renderer, &g_rendererinfo);
     printf("Using %s rendering\n", g_rendererinfo.name);
+
+    g_font = FC_CreateFont();
+    if (FC_LoadFont(g_font, g_renderer, "fonts/default.ttf", 18, FC_MakeColor(255,255,0,255), TTF_STYLE_NORMAL) == 0)
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "%s", SDL_GetError());
 #endif
 
     pvldp_init = (initproc)&vldp_init;

src/testvldp.c

@@ -6,7 +6,7 @@
 		| sed 's^\($*\)\.o[ :]*^\1.o $@ : ^g' > $@; \
 		[ -s $@ ] || rm -f $@
 
-OBJS = video.o tms9128nl.o SDL_DrawText.o \
+OBJS = video.o tms9128nl.o SDL_FontCache.o \
 	led.o palette.o rgb2yuv.o blend.o
 
 .SUFFIXES:	.cpp