Remove getTexture() filterLinear arg

Author: morganchristiansson

CGame_Init.cpp

@@ -173,7 +173,7 @@ bool CGame::Init()
         auto& archiv = global::typedArchives[ArchiveID::SETUP997];
         auto* bmp = dynamic_cast<const libsiedler2::baseArchivItem_Bitmap*>(archiv.get(0));
         if(bmp)
-            splashBg_.load(*bmp, true);
+            splashBg_.load(*bmp);
     }
 
     // std::cout << "\nShow loading screen...";

CSurface.cpp

@@ -510,7 +510,7 @@ static const AnimFrames* getAnimFrames(const TerrainDesc& td, MapType mapType)
         libsiedler2::ArchivItem_Bitmap_Raw tmpBmp;
         tmpBmp.create(texSize.x, texSize.y, bgraBuf.getPixelPtr(), texSize.x, texSize.y,
                       libsiedler2::TextureFormat::BGRA, nullptr);
-        tex.load(tmpBmp, false);
+        tex.load(tmpBmp);
         result.frames.push_back(std::move(tex));
 
         curPal = std::move(pal);

Texture.cpp

@@ -47,17 +47,17 @@ void Texture::load(const uint8_t* bgraPixels, Extent size)
 
     glGenTextures(1, &texture_);
     glBindTexture(GL_TEXTURE_2D, texture_);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filterLinear ? GL_LINEAR : GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filterLinear ? GL_LINEAR : GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size.x, size.y, 0, GL_BGRA, GL_UNSIGNED_BYTE, bgraPixels);
     size_ = size;
 }
 
-void Texture::createEmpty(Extent size, bool filterLinear)
+void Texture::createEmpty(Extent size)
 {
-    load(nullptr, size, filterLinear);
+    load(nullptr, size);
 }
 
 void Texture::upload(const void* bgraPixels)
@@ -68,7 +68,7 @@ void Texture::upload(const void* bgraPixels)
     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, size_.x, size_.y, GL_BGRA, GL_UNSIGNED_BYTE, bgraPixels);
 }
 
-bool Texture::load(const libsiedler2::baseArchivItem_Bitmap& bitmap, bool filterLinear)
+bool Texture::load(const libsiedler2::baseArchivItem_Bitmap& bitmap)
 {
     const auto w = bitmap.getWidth();
     const auto h = bitmap.getHeight();
@@ -103,7 +103,7 @@ bool Texture::load(const libsiedler2::baseArchivItem_Bitmap& bitmap, bool filter
             return false;
     }
 
-    load(bgra.data(), Extent(w, h), filterLinear);
+    load(bgra.data(), Extent(w, h));
     return true;
 }
 
@@ -224,9 +224,9 @@ void drawRect(const Rect& rect, unsigned color)
     glColor4f(1, 1, 1, 1);
 }
 
-Texture& getTexture(ArchiveID archive, int index, bool filterLinear)
+Texture& getTexture(ArchiveID archive, int index)
 {
-    return Texture::getTexture(archive, index, filterLinear);
+    return Texture::getTexture(archive, index);
 }
 
 void drawButtonBox(const Rect& area, bool pressed, unsigned baseTex, unsigned faceTex)
@@ -256,7 +256,7 @@ void drawButtonBox(const Rect& area, bool pressed, unsigned baseTex, unsigned fa
 // Cache for typed-archive textures: (archive, index) → Texture
 static std::map<std::pair<ArchiveID, int>, std::unique_ptr<Texture>> s_typedTexCache;
 
-Texture& Texture::getTexture(ArchiveID archive, int index, bool filterLinear)
+Texture& Texture::getTexture(ArchiveID archive, int index)
 {
     auto& archiv = global::typedArchives[archive];
     if(index < 0 || static_cast<unsigned>(index) >= archiv.size())
@@ -272,7 +272,7 @@ Texture& Texture::getTexture(ArchiveID archive, int index, bool filterLinear)
         const auto* bmp = dynamic_cast<const libsiedler2::baseArchivItem_Bitmap*>(archiv.get(index));
         if(bmp)
         {
-            tex->load(*bmp, filterLinear);
+            tex->load(*bmp);
             tex->anchor_ = {bmp->getNx(), bmp->getNy()};
         }
         it = s_typedTexCache.emplace(key, std::move(tex)).first;

Texture.h

@@ -31,13 +31,13 @@ class Texture
     Texture& operator=(const Texture&) = delete;
 
     /// Load from a libsiedler2 bitmap (paletted or BGRA).
-    bool load(const libsiedler2::baseArchivItem_Bitmap& bitmap, bool filterLinear = false);
+    bool load(const libsiedler2::baseArchivItem_Bitmap& bitmap);
 
     /// Load raw BGRA pixel data directly.
     void load(const uint8_t* bgraPixels, Extent size);
 
     /// Create an empty texture of the given size (for use as a render-target).
-    void createEmpty(Extent size, bool filterLinear = false);
+    void createEmpty(Extent size);
 
     /// Upload new pixel data to an existing texture (glTexSubImage2D).
     void upload(const void* bgraPixels);
@@ -72,13 +72,12 @@ class Texture
     // Static bitmap-texture cache
 
     /// Return (or create on first use) a cached GL texture from a typed archive.
-    static Texture& getTexture(ArchiveID archive, int index, bool filterLinear = false);
+    static Texture& getTexture(ArchiveID archive, int index);
 
 private:
     GLuint texture_ = 0;
     Extent size_;
     Position anchor_ = {0, 0}; // sprite anchor offset, set by getTexture
-
 };
 
 /// Draw a filled rectangle with a 32-bit ARGB colour.
@@ -89,4 +88,4 @@ void drawRect(const Rect& rect, unsigned color);
 void drawButtonBox(const Rect& area, bool pressed, unsigned baseTex, unsigned faceTex);
 
 /// Get or create the cached OpenGL texture from a typed archive.
-Texture& getTexture(ArchiveID archive, int index, bool filterLinear = false);
+Texture& getTexture(ArchiveID archive, int index);