Mipmapping

diff --git a/Makefile b/Makefile
index 91abc4f6fd2de66127fec73718c28f684a1530fd..97ea9231c689ebadf09bed4cbd9e325b08fdf817 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 all: bin/main
 
-CXX_FLAGS := -g --std=c++17 -march=native -Wall -DDEBUG_NODES -DCOWEDBOY_IK
+CXX_FLAGS := -g --std=c++17 -march=native -Wall -DDEBUG_NODES
 
 bin/main: model.o material.o image.o skybox.o program.o ik.o main.o util.o
        clang++ $(CXX_FLAGS) $^ \

diff --git a/main.cpp b/main.cpp
index e4cc81a2d79846c9a8e3028cfb85a2b2b42899ab..b7781ac2e0400a8b9d5e646c6344a8f5b0fa1989 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -232,7 +232,7 @@ void init() {
        pbrProg = new Program("pbrvert.glsl", "pbrfrag.glsl");
        glUseProgram(pbrProg->progId);
 
-       const std::string scenePath = "models/cowedboy.glb";
+       const std::string scenePath = "models/mipmapping.glb";
        const aiScene *scene = importer.ReadFile(scenePath, aiProcess_Triangulate | aiProcess_CalcTangentSpace | aiProcess_GenNormals | aiProcess_FlipUVs);
        if (!scene) {
                std::cerr << importer.GetErrorString() << std::endl;
@@ -290,7 +290,7 @@ void keyboardUp(unsigned char key, int x, int y) {
        keyStates[key] = false;
 }
 
-/* #define ENABLE_MOVEMENT */
+#define ENABLE_MOVEMENT
 
 void timer(int _) {
 #ifdef ENABLE_MOVEMENT

diff --git a/material.cpp b/material.cpp
index 85ff7d7ce803f4ebe9ecff8f10c6ae33775acadc..a1d44beb6d07929865ee5309b6916f4ab109d951 100644 (file)
--- a/material.cpp
+++ b/material.cpp
@@ -49,6 +49,15 @@ Material::Texture::Texture(const aiString fileName, const aiScene &scene) {
                glTexImage2D(GL_TEXTURE_2D, 0, img.internalFormat(), img.width(), img.height(), 0, img.format(), img.type(), img.data());
        }
 
+       // magnifying - no bigger mipmap available, so use linear filtering
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+       // minifying - use a linear blend of two mipmaps
+       // which are themselves filtered linearly
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    
        glGenerateMipmap(GL_TEXTURE_2D);
 }
 

diff --git a/models/mipmapping.blend b/models/mipmapping.blend
new file mode 100644 (file)
index 0000000..13d8885
Binary files /dev/null and b/models/mipmapping.blend differ

diff --git a/models/mipmapping.glb b/models/mipmapping.glb
new file mode 100644 (file)
index 0000000..a12ce21
Binary files /dev/null and b/models/mipmapping.glb differ