Merge branch 'assimp'

1 files changed, 31 insertions, 9 deletions

diff --git a/gfx/models/texture.h b/gfx/models/texture.h
index ffc9a4a..86e76a0 100644
--- a/gfx/models/texture.h
+++ b/gfx/models/texture.h
@@ -9,13 +9,23 @@
 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 {

 public:

+	virtual ~Texture() = default;

+	DEFAULT_MOVE_NO_COPY(Texture);

+

 	explicit Texture(const std::filesystem::path & fileName, TextureOptions = {});

 	explicit Texture(const Image & image, TextureOptions = {});

 	explicit Texture(GLsizei width, GLsizei height, TextureOptions = {});

@@ -23,17 +33,29 @@ public:
 

 	static Cache<Texture, std::filesystem::path> cachedTexture;

 

-	void bind(GLenum unit = GL_TEXTURE0) const;

+	virtual void bind(GLenum unit = GL_TEXTURE0) const;

 

-	void save(const glm::ivec2 & size, const char * path) const;

-	static void save(const glTexture &, const glm::ivec2 & size, const char * path);

-	static void saveDepth(const glTexture &, const glm::ivec2 & size, const char * path);

-	static void saveNormal(const glTexture &, const glm::ivec2 & size, const char * path);

+	void save(const char * path) const;

+	static void save(const glTexture &, const char * path);

+	static void saveDepth(const glTexture &, const char * path);

+	static void saveNormal(const glTexture &, const char * path);

 

-private:

-	static void save(const glTexture &, GLenum, GLenum, const glm::ivec2 & size, unsigned short channels,

-			const char * path, short tgaFormat);

+protected:

+	static void save(const glTexture &, GLenum, GLenum, uint8_t channels, const char * path, uint8_t tgaFormat);

+	static glm::ivec2 getSize(const glTexture &);

 

 	glTexture m_texture;

 	GLenum type;

 };

+

+class TextureAtlas : public Texture {

+public:

+	TextureAtlas(GLsizei width, GLsizei height, GLuint count);

+

+	void bind(GLenum unit = GL_TEXTURE0) const override;

+	GLuint add(glm::ivec2 position, glm::ivec2 size, void * data, TextureOptions = {});

+

+private:

+	glTexture m_atlas;

+	GLuint used {};

+};