X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=main.cpp;fp=main.cpp;h=b7781ac2e0400a8b9d5e646c6344a8f5b0fa1989;hp=e4cc81a2d79846c9a8e3028cfb85a2b2b42899ab;hb=45e43c5d0b6a1415185211128d82190fd19c3fe9;hpb=552379e4a7bc443158d3f6d080cc28d59608e09a diff --git a/main.cpp b/main.cpp index e4cc81a..b7781ac 100644 --- 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