Basic model loading

2020-09-04 21:39:12 +02:00
parent 0f786f0216
commit 0c930a9892
11 changed files with 198 additions and 22 deletions
--- a/Texture.cpp
+++ b/Texture.cpp
@@ -41,7 +41,7 @@ Texture::Texture(const char* texturePath, uint8_t textureType) {
 }

 Texture::~Texture() {
-    glDeleteTextures(1, &textureId);
+    //glDeleteTextures(1, &textureId);
 }

 void Texture::bind(uint8_t textureUnit, ShaderProgram* shaderProgram, uint8_t textureTypeNum) {
@@ -63,6 +63,9 @@ void Texture::bind(uint8_t textureUnit, ShaderProgram* shaderProgram, uint8_t te
            break;
    }

+    // Add material. as we store textures in a struct
+    uniformName = "material." + uniformName;
+
    shaderProgram->setUniform(uniformName.c_str(), textureTypeNum);

    glActiveTexture(GL_TEXTURE0 + textureUnit);