memory refactor Texture and ImageData

2024-06-30 21:24:46 +03:00
parent ce9c5b97c7
commit c0dca31e98
14 changed files with 191 additions and 160 deletions
@@ -1,83 +1,6 @@
 #include "Texture.hpp"
-#include "gl_util.hpp"
-
-#include <GL/glew.h>
-#include <stdexcept>
-#include <memory>
-
-uint Texture::MAX_RESOLUTION = 1024; // Window.initialize overrides it
-
-Texture::Texture(uint id, uint width, uint height) 
-    : id(id), width(width), height(height) {
-}
-
-Texture::Texture(ubyte* data, uint width, uint height, ImageFormat imageFormat) 
-    : width(width), height(height) {
-    glGenTextures(1, &id);
-    glBindTexture(GL_TEXTURE_2D, id);
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
-    GLenum format = gl::to_glenum(imageFormat);
-    glTexImage2D(
-        GL_TEXTURE_2D, 0, format, width, height, 0,
-        format, GL_UNSIGNED_BYTE, (GLvoid *) data
-    );
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glGenerateMipmap(GL_TEXTURE_2D);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 1);
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-Texture::~Texture() {
-    glDeleteTextures(1, &id);
-}
-
-void Texture::bind(){
-    glBindTexture(GL_TEXTURE_2D, id);
-}
-
-void Texture::unbind() {
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-void Texture::reload(ubyte* data){
-    glBindTexture(GL_TEXTURE_2D, id);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
-        GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid *) data);
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-std::unique_ptr<ImageData> Texture::readData() {
-    std::unique_ptr<ubyte[]> data (new ubyte[width * height * 4]);
-    glBindTexture(GL_TEXTURE_2D, id);
-    glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, data.get());
-    glBindTexture(GL_TEXTURE_2D, 0);
-    return std::make_unique<ImageData>(ImageFormat::rgba8888, width, height, data.release());
-}
-
-void Texture::setNearestFilter() {
-    bind();
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
+#include "GLTexture.hpp"

 std::unique_ptr<Texture> Texture::from(const ImageData* image) {
-    uint width = image->getWidth();
-    uint height = image->getHeight();
-    const void* data = image->getData();
-    return std::make_unique<Texture>((ubyte*)data, width, height, image->getFormat());
-}
-
-uint Texture::getWidth() const {
-    return width;
-}
-
-uint Texture::getHeight() const {
-    return height;
-}
-
-uint Texture::getId() const {
-    return id;
+    return GLTexture::from(image);
 }