2 files changed, 20 insertions, 12 deletions
diff --git a/gfx/models/texture.cpp b/gfx/models/texture.cpp
index ef6d7e7..87b73e7 100644
--- a/gfx/models/texture.cpp
+++ b/gfx/models/texture.cpp
@@ -12,26 +12,28 @@
 
 Cache<Texture, std::filesystem::path> Texture::cachedTexture;
 
-Texture::Texture(const std::filesystem::path & fileName) :
-	Texture {Image {Resource::mapPath(fileName).c_str(), STBI_rgb_alpha}}
+Texture::Texture(const std::filesystem::path & fileName, TextureOptions to) :
+	Texture {Image {Resource::mapPath(fileName).c_str(), STBI_rgb_alpha}, to}
 {
 }
 
-Texture::Texture(const Image & tex) :
-	Texture {static_cast<GLsizei>(tex.width), static_cast<GLsizei>(tex.height), tex.data.data()}
+Texture::Texture(const Image & tex, TextureOptions to) :
+	Texture {static_cast<GLsizei>(tex.width), static_cast<GLsizei>(tex.height), tex.data.data(), to}
 {
 }
 
-Texture::Texture(GLsizei width, GLsizei height, const void * data)
+Texture::Texture(GLsizei width, GLsizei height, TextureOptions to) : Texture {width, height, nullptr, to} { }
+
+Texture::Texture(GLsizei width, GLsizei height, const void * data, TextureOptions to)
 {
 	glBindTexture(GL_TEXTURE_2D, m_texture);
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, to.wrap);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, to.wrap);
 
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, to.minFilter);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, to.magFilter);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
 }
 
diff --git a/gfx/models/texture.h b/gfx/models/texture.h
index 1aad1e0..31ffaa5 100644
--- a/gfx/models/texture.h
+++ b/gfx/models/texture.h
@@ -8,11 +8,17 @@
 // IWYU pragma: no_forward_declare Cache
 class Image;
 
+struct TextureOptions {
+	GLint wrap {GL_REPEAT};
+	GLint minFilter {GL_LINEAR}, magFilter {GL_LINEAR};
+};
+
 class Texture {
 public:
-	explicit Texture(const std::filesystem::path & fileName);
-	explicit Texture(const Image & image);
-	explicit Texture(GLsizei width, GLsizei height, const void * data);
+	explicit Texture(const std::filesystem::path & fileName, TextureOptions = {});
+	explicit Texture(const Image & image, TextureOptions = {});
+	explicit Texture(GLsizei width, GLsizei height, TextureOptions = {});
+	explicit Texture(GLsizei width, GLsizei height, const void * data, TextureOptions = {});
 
 	static Cache<Texture, std::filesystem::path> cachedTexture;