Begin work to use SDL_ttf

nedink · Jul 8, 2022 · f1bff6a · f1bff6a
1 parent 0631474
commit f1bff6a
Show file tree

Hide file tree

Showing 6 changed files with 390 additions and 137 deletions.
diff --git a/src/blupi.cxx b/src/blupi.cxx
@@ -52,6 +52,7 @@
 #include "platform.h"
 #include "progress.h"
 #include "sound.h"
+#include "text.h"
 
 // Global variables
 
@@ -807,6 +808,8 @@ DoInit (int argc, char * argv[], bool & exit)
     return EXIT_FAILURE;
   }
 
+  FontsInit();
+
   if (!(g_settingsOverload & SETTING_LEGACY))
     Display::getDisplay ().readDisplaySize ();
 

diff --git a/src/event.h b/src/event.h
@@ -159,6 +159,8 @@ class CEvent
 
   static void PushUserEvent (Sint32 code, void * data = nullptr);
 
+  Language GetLanguage ();
+
 protected:
   void DrawTextCenter (const char * text, Sint32 x, Sint32 y, Sint32 font = 0);
   bool CreateButtons (Sint32 phase);
@@ -170,7 +172,6 @@ class CEvent
   bool PlayUp (Point pos);
 
   Language GetStartLanguage ();
-  Language GetLanguage ();
   void     SetLanguage (Language lang = Language::undef);
   void     SetWindowSize (double prevScale, double newScale);
 

diff --git a/src/pixmap.cxx b/src/pixmap.cxx
@@ -123,6 +123,50 @@ CPixmap::CreateMainTexture ()
   SDL_SetHint (SDL_HINT_RENDER_SCALE_QUALITY, "nearest");
 }
 
+Sint32
+CPixmap::Blit (
+  Sint32 dstCh, SDL_Texture * src, const SDL_Rect & dstRect, double angle, SDL_RendererFlip flip)
+{
+  Sint32 res;
+  auto target = SDL_GetRenderTarget (g_renderer);
+
+  if (dstCh < 0)
+  {
+    if (!this->mainTexture && g_bFullScreen && g_zoom == 1)
+    {
+      SDL_SetHint (
+        SDL_HINT_RENDER_SCALE_QUALITY, g_renderQuality ? "best" : "nearest");
+      this->mainTexture = SDL_CreateTexture (
+        g_renderer, SDL_PIXELFORMAT_RGBA32, SDL_TEXTUREACCESS_TARGET,
+        LXIMAGE (), LYIMAGE ());
+      SDL_SetHint (SDL_HINT_RENDER_SCALE_QUALITY, "nearest");
+    }
+    else if (this->mainTexture && !(g_bFullScreen && g_zoom == 1))
+    {
+      SDL_DestroyTexture (this->mainTexture);
+      this->mainTexture = nullptr;
+    }
+
+    if (this->mainTexture)
+      SDL_SetRenderTarget (g_renderer, target ? target : this->mainTexture);
+    res = SDL_RenderCopyEx (
+      g_renderer, src, nullptr, &dstRect, angle,
+      nullptr, flip);
+    if (this->mainTexture)
+      SDL_SetRenderTarget (g_renderer, target);
+  }
+  else
+  {
+    SDL_SetRenderTarget (g_renderer, m_SDLTextureInfo[dstCh].texture);
+    res = SDL_RenderCopyEx (
+      g_renderer, src, nullptr, &dstRect, angle,
+      nullptr, flip);
+    SDL_SetRenderTarget (g_renderer, target);
+  }
+
+  return res;
+}
+
 Sint32
 CPixmap::BltFast (
   Sint32 dstCh, size_t srcCh, Rect dstR, Rect srcR, SDL_RendererFlip flip)

diff --git a/src/pixmap.h b/src/pixmap.h
@@ -105,6 +105,8 @@ class CPixmap
   void   FromDisplayToGame (Sint32 & x, Sint32 & y, double prevScale = 1);
   void   FromGameToDisplay (Sint32 & x, Sint32 & y);
 
+  Sint32 Blit (
+    Sint32 dstCh, SDL_Texture * src, const SDL_Rect & dstRect, double angle, SDL_RendererFlip flip);
 protected:
   Sint32 BltFast (
     Sint32 dstCh, size_t srcCh, Rect dstR, Rect srcR,
@@ -134,6 +136,8 @@ class CPixmap
   SDL_Cursor *                            m_lpCurrentCursor;
   SDL_Cursor *                            m_lpSDLCursors[MAXCURSORS];
   SDL_Surface *                           m_lpSDLBlupi;
+public:
   SDL_Texture *                           mainTexture;
+protected:
   std::unordered_map<size_t, TextureInfo> m_SDLTextureInfo;
 };