From b4ede2fd89d0effb44ebae15862427de9a147476 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 16:34:56 +0100
Subject: Define our own enum for texture mapmode

---
 gfx/models/texture.cpp | 19 +++++++++++++++++--
 gfx/models/texture.h   |  9 ++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'gfx')

diff --git a/gfx/models/texture.cpp b/gfx/models/texture.cpp
index 6319eb8..e29fd6c 100644
--- a/gfx/models/texture.cpp
+++ b/gfx/models/texture.cpp
@@ -13,6 +13,21 @@
 
 Cache<Texture, std::filesystem::path> Texture::cachedTexture;
 
+GLint
+TextureOptions::glMapMode(TextureOptions::MapMode mm)
+{
+	switch (mm) {
+		case MapMode::Repeat:
+			return GL_REPEAT;
+		case MapMode::Clamp:
+			return GL_CLAMP_TO_EDGE;
+		case MapMode::Mirror:
+			return GL_MIRRORED_REPEAT;
+		default:
+			throw std::domain_error("Invalid MapMode value");
+	}
+}
+
 Texture::Texture(const std::filesystem::path & fileName, TextureOptions to) :
 	Texture {Image {Resource::mapPath(fileName).c_str(), STBI_rgb_alpha}, to}
 {
@@ -30,8 +45,8 @@ Texture::Texture(GLsizei width, GLsizei height, const void * data, TextureOption
 	glBindTexture(type, m_texture);
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
-	glTexParameteri(type, GL_TEXTURE_WRAP_S, to.wrap);
-	glTexParameteri(type, GL_TEXTURE_WRAP_T, to.wrap);
+	glTexParameteri(type, GL_TEXTURE_WRAP_S, TextureOptions::glMapMode(to.wrapU));
+	glTexParameteri(type, GL_TEXTURE_WRAP_T, TextureOptions::glMapMode(to.wrapV));
 
 	glTexParameteri(type, GL_TEXTURE_MIN_FILTER, to.minFilter);
 	glTexParameteri(type, GL_TEXTURE_MAG_FILTER, to.magFilter);
diff --git a/gfx/models/texture.h b/gfx/models/texture.h
index 68ec649..86e76a0 100644
--- a/gfx/models/texture.h
+++ b/gfx/models/texture.h
@@ -9,9 +9,16 @@
 class Image;
 
 struct TextureOptions {
-	GLint wrap {GL_REPEAT};
+	enum class MapMode {
+		Repeat,
+		Clamp,
+		Mirror,
+		Decal,
+	};
+	MapMode wrapU {MapMode::Repeat}, wrapV {MapMode::Repeat};
 	GLint minFilter {GL_LINEAR}, magFilter {GL_LINEAR};
 	GLenum type {GL_TEXTURE_2D};
+	static GLint glMapMode(MapMode);
 };
 
 class Texture {
-- 
cgit v1.2.3