Draw terrain using OpenGL

Author: morganchristiansson

CGame.h

@@ -49,7 +49,6 @@ class CGame
     Texture cursor_;
     Texture cursorClicked_;
     Texture cross_;
-    Texture mapTex_; ///< Texture for the map/terrain (Surf_Map may be 8-bit)
 
     // structure for mouse cursor
     struct

CGame_Render.cpp

@@ -55,28 +55,44 @@ void CGame::Render()
     // render the map if active
     if(MapObj && MapObj->isActive())
     {
-        if(auto* mapSurf = MapObj->getSurface())
-        {
-            std::array<char, 100> textBuffer;
-            std::snprintf(textBuffer.data(), textBuffer.size(), "%d    %d", MapObj->getVertexX(), MapObj->getVertexY());
-            CFont::writeText(mapSurf, textBuffer.data(), 20, 20);
-            std::snprintf(textBuffer.data(), textBuffer.size(),
-                          "min. height: %#04x/0x3C  max. height: %#04x/0x3C  NormalNull: 0x0A",
-                          MapObj->getMinReduceHeight(), MapObj->getMaxRaiseHeight());
-            CFont::writeText(mapSurf, textBuffer.data(), 100, 20);
-            if(MapObj->isHorizontalMovementLocked() && MapObj->isVerticalMovementLocked())
-                CFont::writeText(mapSurf, "Movement locked (F9 or F10 to unlock)", 20, 40, FontSize::Large,
-                                 FontColor::Orange);
-            else if(MapObj->isHorizontalMovementLocked())
-                CFont::writeText(mapSurf, "Horizontal movement locked (F9 to unlock)", 20, 40, FontSize::Large,
-                                 FontColor::Orange);
-            else if(MapObj->isVerticalMovementLocked())
-                CFont::writeText(mapSurf, "Vertical movement locked (F10 to unlock)", 20, 40, FontSize::Large,
-                                 FontColor::Orange);
-
-            mapTex_.load(mapSurf);
-            mapTex_.draw(Rect(0, 0, GameResolution.x, GameResolution.y));
-        }
+        // Set up map-space projection: (displayRect.left, top) maps to (0,0) screen
+        auto viewRect = MapObj->getDisplayRect();
+        glMatrixMode(GL_PROJECTION);
+        glPushMatrix();
+        glLoadIdentity();
+        glOrtho(static_cast<GLdouble>(viewRect.left), static_cast<GLdouble>(viewRect.left + GameResolution.x),
+                static_cast<GLdouble>(viewRect.top + GameResolution.y), static_cast<GLdouble>(viewRect.top), -1, 1);
+        glMatrixMode(GL_MODELVIEW);
+        glPushMatrix();
+        glLoadIdentity();
+
+        MapObj->render();
+
+        // Restore screen-space projection
+        glMatrixMode(GL_PROJECTION);
+        glPopMatrix();
+        glMatrixMode(GL_MODELVIEW);
+        glPopMatrix();
+
+        // HUD text overlays drawn directly via OpenGL
+        std::array<char, 100> textBuffer;
+        // text for x and y of vertex (shown in upper left corner)
+        std::snprintf(textBuffer.data(), textBuffer.size(), "%d    %d", MapObj->getVertexX(), MapObj->getVertexY());
+        CFont::draw(textBuffer.data(), Position(20, 20), FontSize::Medium);
+        // text for MinReduceHeight and MaxRaiseHeight
+        std::snprintf(textBuffer.data(), textBuffer.size(),
+                      "min. height: %#04x/0x3C  max. height: %#04x/0x3C  NormalNull: 0x0A",
+                      MapObj->getMinReduceHeight(), MapObj->getMaxRaiseHeight());
+        CFont::draw(textBuffer.data(), Position(100, 20), FontSize::Medium);
+        // text for MovementLocked
+        if(MapObj->isHorizontalMovementLocked() && MapObj->isVerticalMovementLocked())
+            CFont::draw("Movement locked (F9 or F10 to unlock)", Position(20, 40), FontSize::Large, FontColor::Orange);
+        else if(MapObj->isHorizontalMovementLocked())
+            CFont::draw("Horizontal movement locked (F9 to unlock)", Position(20, 40), FontSize::Large,
+                        FontColor::Orange);
+        else if(MapObj->isVerticalMovementLocked())
+            CFont::draw("Vertical movement locked (F10 to unlock)", Position(20, 40), FontSize::Large,
+                        FontColor::Orange);
     }
 
     // render active menus

CIO/CFile.cpp

@@ -470,20 +470,10 @@ bool CFile::read_lbm(FILE* fp, const boost::filesystem::path& filepath)
     } else
         return false;
 
-    // if this is a texture file, we need a secondary 32-bit surface for SGE and we set a color key at both surfaces
+    // if this is a texture file, set a color key for transparency
     if(filepath.filename() == "TEX5.LBM" || filepath.filename() == "TEX6.LBM" || filepath.filename() == "TEX7.LBM"
        || filepath.filename() == "TEXTUR_0.LBM" || filepath.filename() == "TEXTUR_3.LBM")
-    {
-        SDL_SetColorKey(bmpArray->surface.get(), SDL_TRUE, SDL_MapRGB(bmpArray->surface->format, 0, 0, 0));
-
-        bmpArray++;
-        if((bmpArray->surface = makeRGBSurface((bmpArray - 1)->w, (bmpArray - 1)->h)))
-        {
-            SDL_SetColorKey(bmpArray->surface.get(), SDL_TRUE, SDL_MapRGB(bmpArray->surface->format, 0, 0, 0));
-            CSurface::Draw(bmpArray->surface, (bmpArray - 1)->surface);
-        } else
-            bmpArray--;
-    }
+        SDL_SetColorKey(bmpArray->surface.get(), SDL_TRUE, 0);
 
     // we are finished, the surface is filled
     // increment bmpArray for the next picture
@@ -1013,7 +1003,7 @@ bool CFile::read_bob02(FILE* fp)
     // now we are ready to read the picture lines and fill the surface, so lets create one
     if((bmpArray->surface = makePalSurface(bmpArray->w, bmpArray->h, palActual->colors)) == nullptr)
         return false;
-    SDL_SetColorKey(bmpArray->surface.get(), SDL_TRUE, SDL_MapRGB(bmpArray->surface->format, 0, 0, 0));
+    SDL_SetColorKey(bmpArray->surface.get(), SDL_TRUE, 0);
     // SDL_SetAlpha(bmpArray->surface, SDL_SRCALPHA, 128);
 
     // main loop for reading picture lines
@@ -1174,7 +1164,7 @@ bool CFile::read_bob04(FILE* fp, int player_color)
     if((bmpArray->surface = makePalSurface(bmpArray->w, bmpArray->h, palActual->colors)) == nullptr)
         return false;
 
-    SDL_SetColorKey(bmpArray->surface.get(), SDL_TRUE, SDL_MapRGB(bmpArray->surface->format, 0, 0, 0));
+    SDL_SetColorKey(bmpArray->surface.get(), SDL_TRUE, 0);
 
     // main loop for reading picture lines
     for(Position pos{0, 0}; pos.y < bmpArray->h; pos.y++)

CIO/CFont.cpp

@@ -190,13 +190,6 @@ unsigned getCharWidth(uint8_t c, FontSize fontsize, FontColor color)
 }
 } // namespace
 
-void CFont::draw(Position parentOrigin) const
-{
-    if(string_.empty())
-        return;
-    draw(string_, parentOrigin + pos_, fontsize_, color_, FontAlign::Left);
-}
-
 void CFont::draw(const std::string& string, Position pos, FontSize fontsize, FontColor color, FontAlign align)
 {
     if(string.empty())
@@ -301,7 +294,10 @@ unsigned CFont::getTextWidth(const std::string& string, FontSize fontsize)
 {
     unsigned w = 0;
     for(unsigned char c : string)
+    {
+        if(c == '\n')
+            break;
         w += getCharWidth(c, fontsize, FontColor::Yellow); // width is same for all colors
-
+    }
     return w;
 }

CIO/CFont.h

@@ -48,7 +48,7 @@ class CFont
     void setMouseData(SDL_MouseButtonEvent button);
 
     /// Draw this font's text at the given absolute position
-    void draw(Position parentOrigin) const;
+    void draw(Position parentOrigin) const { draw(string_, parentOrigin + pos_, fontsize_, color_, FontAlign::Left); }
 
     /// Draw text directly
     /// @param pos  Absolute position (top-left of the text, adjusted for alignment).

CMakeLists.txt

@@ -8,8 +8,9 @@ cmake_minimum_required(VERSION 3.16..3.20)
 project(s25edit)
 
 find_package(Boost 1.64 REQUIRED)
+find_package(SDL2 REQUIRED)
+
 
-add_subdirectory(SGE)
 
 option(RTTR_EDITOR_ADMINMODE "In admin mode there are some key combos to open debugger, resource viewer and so on" OFF)
 if(RTTR_EDITOR_ADMINMODE)
@@ -38,7 +39,7 @@ ELSE()
 ENDIF()
 
 add_executable(s25edit ${MAIN_SOURCES} ${CIO_SOURCES} ${icon_RC})
-target_link_libraries(s25edit PRIVATE SGE rttrConfig s25Common gamedata siedler2 endian::static glad Boost::nowide PUBLIC Boost::disable_autolinking Boost::program_options)
+target_link_libraries(s25edit PRIVATE rttrConfig s25Common gamedata siedler2 endian::static glad Boost::nowide SDL2::SDL2 PUBLIC Boost::disable_autolinking Boost::program_options)
 target_include_directories(s25edit PRIVATE include)
 target_compile_features(s25edit PRIVATE cxx_std_17)