diff --git a/models/arm.blend b/models/arm.blend deleted file mode 100644 index 0f25ee9..0000000 Binary files a/models/arm.blend and /dev/null differ diff --git a/models/arm.fbx b/models/arm.fbx deleted file mode 100644 index b10ff53..0000000 Binary files a/models/arm.fbx and /dev/null differ diff --git a/shaders/shader_parallax.frag b/shaders/shader_parallax.frag index 64840f9..7011719 100644 --- a/shaders/shader_parallax.frag +++ b/shaders/shader_parallax.frag @@ -36,7 +36,7 @@ vec2 ParallaxMapping(vec2 texCoords, vec3 viewDir) // depth of current layer float currentLayerDepth = 0.0; // the amount to shift the texture coordinates per layer (from vector P) - vec2 P = viewDir.xy / viewDir.z * 0.1; + vec2 P = viewDir.xy / viewDir.z * 0.0001; vec2 deltaTexCoords = P / numLayers; // get initial values diff --git a/src/main.cpp b/src/main.cpp index 032d5a2..b0093ca 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1043,7 +1043,7 @@ void initObjects() glm::vec3(0, 2, 2), glm::vec3(1.5f, 1.0f, 1.0f), glm::vec3(0.3f), 0, false, true); objects.push_back(moon); - Object crewmateObj = Object("Space Humster", crewmate, programTex, glm::vec3(1.0f), + Object crewmateObj = Object("Space Humster", crewmate, programParallax, glm::vec3(1.0f), glm::vec3(-5, 0, 0), glm::vec3(1, 0, 1), glm::vec3(0.1), 0, true, false); objects.push_back(crewmateObj);