Rename to GlTexture

Author: Morgan Christiansson

CGame.h

@@ -7,7 +7,7 @@
 
 #include "CIO/CFont.h"
 #include "SdlSurface.h"
-#include "glArchivItem_BitmapBase.h"
+#include "GlTexture.h"
 #include <boost/filesystem/path.hpp>
 #include <Point.h>
 #include <memory>
@@ -46,13 +46,13 @@ class CGame
     Uint32 lastFrameTime = 0;
     unsigned suppressResizeEvents_ = 0;
 
-    // GL textures for backgrounds and cursor (s25client pattern)
-    glArchivItem_BitmapBase splashBg_;
-    glArchivItem_BitmapBase menuBgMain_;
-    glArchivItem_BitmapBase menuBgSub_;
-    glArchivItem_BitmapBase cursor_;
-    glArchivItem_BitmapBase cursorClicked_;
-    glArchivItem_BitmapBase cross_;
+    // GL textures for backgrounds and cursor
+    GlTexture splashBg_;
+    GlTexture menuBgMain_;
+    GlTexture menuBgSub_;
+    GlTexture cursor_;
+    GlTexture cursorClicked_;
+    GlTexture cross_;
 
     // structure for mouse cursor
     struct

glArchivItem_BitmapBase.cpp GlTexture.cppglArchivItem_BitmapBase.cpp renamed to GlTexture.cpp

@@ -3,25 +3,25 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "glArchivItem_BitmapBase.h"
+#include "GlTexture.h"
 #include <glad/glad.h>
 #include <vector>
 
-glArchivItem_BitmapBase::~glArchivItem_BitmapBase()
+GlTexture::~GlTexture()
 {
     if(texture_)
         glDeleteTextures(1, &texture_);
 }
 
-glArchivItem_BitmapBase::glArchivItem_BitmapBase(glArchivItem_BitmapBase&& other) noexcept
+GlTexture::GlTexture(GlTexture&& other) noexcept
     : texture_(other.texture_), width_(other.width_), height_(other.height_)
 {
     other.texture_ = 0;
     other.width_ = 0;
     other.height_ = 0;
 }
 
-glArchivItem_BitmapBase& glArchivItem_BitmapBase::operator=(glArchivItem_BitmapBase&& other) noexcept
+GlTexture& GlTexture::operator=(GlTexture&& other) noexcept
 {
     if(this != &other)
     {
@@ -37,7 +37,7 @@ glArchivItem_BitmapBase& glArchivItem_BitmapBase::operator=(glArchivItem_BitmapB
     return *this;
 }
 
-void glArchivItem_BitmapBase::createTexture(const void* bgraPixels, int w, int h, bool linear)
+void GlTexture::createTexture(const void* bgraPixels, int w, int h, bool linear)
 {
     if(texture_)
         glDeleteTextures(1, &texture_);
@@ -55,7 +55,7 @@ void glArchivItem_BitmapBase::createTexture(const void* bgraPixels, int w, int h
     height_ = h;
 }
 
-bool glArchivItem_BitmapBase::load(SDL_Surface* surface, bool linear)
+bool GlTexture::load(SDL_Surface* surface, bool linear)
 {
     if(!surface)
         return false;
@@ -114,7 +114,7 @@ bool glArchivItem_BitmapBase::load(SDL_Surface* surface, bool linear)
     return true;
 }
 
-void glArchivItem_BitmapBase::DrawFull(const Rect& destRect) const
+void GlTexture::DrawFull(const Rect& destRect) const
 {
     if(!texture_)
         return;
@@ -132,7 +132,7 @@ void glArchivItem_BitmapBase::DrawFull(const Rect& destRect) const
     glEnd();
 }
 
-void glArchivItem_BitmapBase::Draw(int x, int y) const
+void GlTexture::Draw(int x, int y) const
 {
     if(!texture_)
         return;

glArchivItem_BitmapBase.h GlTexture.hglArchivItem_BitmapBase.h renamed to GlTexture.h

@@ -8,20 +8,19 @@
 #include "Rect.h"
 #include <SDL.h>
 
-/// Mirrors s25client's glArchivItem_BitmapBase pattern.
 /// Wraps a GL texture with RAII and provides draw methods.
-class glArchivItem_BitmapBase
+class GlTexture
 {
 public:
-    glArchivItem_BitmapBase() = default;
-    ~glArchivItem_BitmapBase();
+    GlTexture() = default;
+    ~GlTexture();
 
-    glArchivItem_BitmapBase(glArchivItem_BitmapBase&&) noexcept;
-    glArchivItem_BitmapBase& operator=(glArchivItem_BitmapBase&&) noexcept;
+    GlTexture(GlTexture&&) noexcept;
+    GlTexture& operator=(GlTexture&&) noexcept;
 
     // No copy
-    glArchivItem_BitmapBase(const glArchivItem_BitmapBase&) = delete;
-    glArchivItem_BitmapBase& operator=(const glArchivItem_BitmapBase&) = delete;
+    GlTexture(const GlTexture&) = delete;
+    GlTexture& operator=(const GlTexture&) = delete;
 
     /// Load from a 32-bit or 8-bit paletted SDL surface.
     /// For 8-bit surfaces, optional colorkey is respected (keyed pixels become transparent).