removed getElapsedTime() and getLastFrameDuration(), made elapsedTime…

… and lastFrameDuration protected
integeruser · Oct 18, 2015 · 71d93c6 · 71d93c6
1 parent e99f3e0
commit 71d93c6
Show file tree

Hide file tree

Showing 34 changed files with 238 additions and 252 deletions.
diff --git a/src/main/java/jgltut/LWJGLWindow.java b/src/main/java/jgltut/LWJGLWindow.java
@@ -37,8 +37,8 @@ public abstract class LWJGLWindow {
     private GLFWFramebufferSizeCallback framebufferSizeCallback;
 
     // Measured in seconds
-    private float elapsedTime;
-    private float lastFrameDuration;
+    protected float elapsedTime;
+    protected float lastFrameDuration;
 
     private double lastFrameTimestamp;
 
@@ -163,15 +163,6 @@ private void printInfo() {
     protected abstract void update();
 
     ////////////////////////////////
-    protected final float getElapsedTime() {
-        return elapsedTime;
-    }
-
-    protected final float getLastFrameDuration() {
-        return lastFrameDuration;
-    }
-
-
     protected final boolean isKeyPressed(int key) {
         return glfwGetKey(window, key) == 1;
     }

diff --git a/src/main/java/jgltut/tut03/CpuPositionOffset.java b/src/main/java/jgltut/tut03/CpuPositionOffset.java
@@ -110,7 +110,6 @@ private void initializeVertexBuffer() {
     private void computePositionOffsets() {
         final float loopDuration = 5.0f;
         final float scale = 3.14159f * 2.0f / loopDuration;
-        final float elapsedTime = getElapsedTime();
         final float currTimeThroughLoop = elapsedTime % loopDuration;
         xOffset = (float) (Math.cos(currTimeThroughLoop * scale) * 0.5f);
         yOffset = (float) (Math.sin(currTimeThroughLoop * scale) * 0.5f);

diff --git a/src/main/java/jgltut/tut03/FragChangeColor.java b/src/main/java/jgltut/tut03/FragChangeColor.java
@@ -46,7 +46,7 @@ protected void display() {
 
         glUseProgram(theProgram);
 
-        glUniform1f(elapsedTimeUniform, getElapsedTime());
+        glUniform1f(elapsedTimeUniform, elapsedTime);
 
         glBindBuffer(GL_ARRAY_BUFFER, positionBufferObject);
         glEnableVertexAttribArray(0);

diff --git a/src/main/java/jgltut/tut03/VertCalcOffset.java b/src/main/java/jgltut/tut03/VertCalcOffset.java
@@ -46,7 +46,7 @@ protected void display() {
 
         glUseProgram(theProgram);
 
-        glUniform1f(elapsedTimeUniform, getElapsedTime());
+        glUniform1f(elapsedTimeUniform, elapsedTime);
 
         glBindBuffer(GL_ARRAY_BUFFER, positionBufferObject);
         glEnableVertexAttribArray(0);

diff --git a/src/main/java/jgltut/tut03/VertPositionOffset.java b/src/main/java/jgltut/tut03/VertPositionOffset.java
@@ -114,7 +114,6 @@ private void initializeVertexBuffer() {
     private void computePositionOffsets() {
         final float loopDuration = 5.0f;
         final float scale = 3.14159f * 2.0f / loopDuration;
-        final float elapsedTime = getElapsedTime();
         final float currTimeThroughLoop = elapsedTime % loopDuration;
         xOffset = (float) (Math.cos(currTimeThroughLoop * scale) * 0.5f);
         yOffset = (float) (Math.sin(currTimeThroughLoop * scale) * 0.5f);

diff --git a/src/main/java/jgltut/tut06/Hierarchy.java b/src/main/java/jgltut/tut06/Hierarchy.java
@@ -583,38 +583,38 @@ void drawFingers(MatrixStack modelToCameraStack) {
 
 
         void adjBase(boolean increment) {
-            float lastFrameDuration = getLastFrameDuration() * 5;
-            angBase += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration : -STANDARD_ANGLE_INCREMENT * lastFrameDuration;
+            final float scale = 5;
+            angBase += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale : -STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale;
             angBase = angBase % 360.0f;
         }
 
         void adjUpperArm(boolean increment) {
-            float lastFrameDuration = getLastFrameDuration() * 5 ;
-            angUpperArm += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration : -STANDARD_ANGLE_INCREMENT * lastFrameDuration;
+            final float scale = 5;
+            angUpperArm += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale : -STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale;
             angUpperArm = clamp(angUpperArm, -90.0f, 0.0f);
         }
 
         void adjLowerArm(boolean increment) {
-            float lastFrameDuration = getLastFrameDuration() * 5;
-            angLowerArm += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration : -STANDARD_ANGLE_INCREMENT * lastFrameDuration;
+            final float scale = 5;
+            angLowerArm += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale : -STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale;
             angLowerArm = clamp(angLowerArm, 0.0f, 146.25f);
         }
 
         void adjWristPitch(boolean increment) {
-            float lastFrameDuration = getLastFrameDuration() * 5;
-            angWristPitch += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration : -STANDARD_ANGLE_INCREMENT * lastFrameDuration;
+            final float scale = 5;
+            angWristPitch += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale : -STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale;
             angWristPitch = clamp(angWristPitch, 0.0f, 90.0f);
         }
 
         void adjWristRoll(boolean increment) {
-            float lastFrameDuration = getLastFrameDuration() * 5;
-            angWristRoll += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration : -STANDARD_ANGLE_INCREMENT * lastFrameDuration;
+            final float scale = 5;
+            angWristRoll += increment ? STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale : -STANDARD_ANGLE_INCREMENT * lastFrameDuration * scale;
             angWristRoll = angWristRoll % 360.0f;
         }
 
         void adjFingerOpen(boolean increment) {
-            float lastFrameDuration = getLastFrameDuration() * 5;
-            angFingerOpen += increment ? SMALL_ANGLE_INCREMENT * lastFrameDuration : -SMALL_ANGLE_INCREMENT * lastFrameDuration;
+            final float scale = 5;
+            angFingerOpen += increment ? SMALL_ANGLE_INCREMENT * lastFrameDuration * scale : -SMALL_ANGLE_INCREMENT * lastFrameDuration * scale;
             angFingerOpen = clamp(angFingerOpen, 9.0f, 90.0f);
         }
 

diff --git a/src/main/java/jgltut/tut06/Rotation.java b/src/main/java/jgltut/tut06/Rotation.java
@@ -71,7 +71,6 @@ protected void display() {
 
         glBindVertexArray(vao);
 
-        float elapsedTime = getElapsedTime();
         for (Instance currInst : instanceList) {
             final Mat4 transformMatrix = currInst.constructMatrix(elapsedTime);
             glUniformMatrix4fv(modelToCameraMatrixUnif, false, transformMatrix.fillAndFlipBuffer(mat4Buffer));

diff --git a/src/main/java/jgltut/tut06/Scale.java b/src/main/java/jgltut/tut06/Scale.java
@@ -74,7 +74,6 @@ protected void display() {
 
         glBindVertexArray(vao);
 
-        float elapsedTime = getElapsedTime();
         for (Instance currInst : instanceList) {
             final Mat4 transformMatrix = currInst.constructMatrix(elapsedTime);
             glUniformMatrix4fv(modelToCameraMatrixUnif, false, transformMatrix.fillAndFlipBuffer(mat4Buffer));

diff --git a/src/main/java/jgltut/tut06/Translation.java b/src/main/java/jgltut/tut06/Translation.java
@@ -73,7 +73,6 @@ protected void display() {
 
         glBindVertexArray(vao);
 
-        float elapsedTime = getElapsedTime();
         for (Instance currInst : instanceList) {
             final Mat4 transformMatrix = currInst.constructMatrix(elapsedTime);
             glUniformMatrix4fv(modelToCameraMatrixUnif, false, transformMatrix.fillAndFlipBuffer(mat4Buffer));

diff --git a/src/main/java/jgltut/tut07/WorldScene.java b/src/main/java/jgltut/tut07/WorldScene.java
@@ -186,90 +186,90 @@ protected void reshape(int w, int h) {
 
     @Override
     protected void update() {
-        float lastFrameDuration = getLastFrameDuration() * 5;
+        final float scale = 5;
 
         if (isKeyPressed(GLFW_KEY_W)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.z = camTarget.z - 0.4f * lastFrameDuration;
+                camTarget.z = camTarget.z - 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.z = camTarget.z - 4.0f * lastFrameDuration;
+                camTarget.z = camTarget.z - 4.0f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_S)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.z = camTarget.z + 0.4f * lastFrameDuration;
+                camTarget.z = camTarget.z + 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.z = camTarget.z + 4.0f * lastFrameDuration;
+                camTarget.z = camTarget.z + 4.0f * lastFrameDuration * scale;
             }
         }
 
         if (isKeyPressed(GLFW_KEY_D)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.x = camTarget.x + 0.4f * lastFrameDuration;
+                camTarget.x = camTarget.x + 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.x = camTarget.x + 4.0f * lastFrameDuration;
+                camTarget.x = camTarget.x + 4.0f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_A)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.x = camTarget.x - 0.4f * lastFrameDuration;
+                camTarget.x = camTarget.x - 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.x = camTarget.x - 4.0f * lastFrameDuration;
+                camTarget.x = camTarget.x - 4.0f * lastFrameDuration * scale;
             }
         }
 
         if (isKeyPressed(GLFW_KEY_E)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.y = camTarget.y - 0.4f * lastFrameDuration;
+                camTarget.y = camTarget.y - 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.y = camTarget.y - 4.0f * lastFrameDuration;
+                camTarget.y = camTarget.y - 4.0f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_Q)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.y = camTarget.y + 0.4f * lastFrameDuration;
+                camTarget.y = camTarget.y + 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.y = camTarget.y + 4.0f * lastFrameDuration;
+                camTarget.y = camTarget.y + 4.0f * lastFrameDuration * scale;
             }
         }
 
 
         if (isKeyPressed(GLFW_KEY_I)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.y = sphereCamRelPos.y - 1.125f * lastFrameDuration;
+                sphereCamRelPos.y = sphereCamRelPos.y - 1.125f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.y = sphereCamRelPos.y - 11.25f * lastFrameDuration;
+                sphereCamRelPos.y = sphereCamRelPos.y - 11.25f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_K)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.y = sphereCamRelPos.y + 1.125f * lastFrameDuration;
+                sphereCamRelPos.y = sphereCamRelPos.y + 1.125f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.y = sphereCamRelPos.y + 11.25f * lastFrameDuration;
+                sphereCamRelPos.y = sphereCamRelPos.y + 11.25f * lastFrameDuration * scale;
             }
         }
 
         if (isKeyPressed(GLFW_KEY_J)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.x = sphereCamRelPos.x - 1.125f * lastFrameDuration;
+                sphereCamRelPos.x = sphereCamRelPos.x - 1.125f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.x = sphereCamRelPos.x - 11.25f * lastFrameDuration;
+                sphereCamRelPos.x = sphereCamRelPos.x - 11.25f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_L)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.x = sphereCamRelPos.x + 1.125f * lastFrameDuration;
+                sphereCamRelPos.x = sphereCamRelPos.x + 1.125f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.x = sphereCamRelPos.x + 11.25f * lastFrameDuration;
+                sphereCamRelPos.x = sphereCamRelPos.x + 11.25f * lastFrameDuration * scale;
             }
         }
 
         if (isKeyPressed(GLFW_KEY_O)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.z = sphereCamRelPos.z - 0.5f * lastFrameDuration;
+                sphereCamRelPos.z = sphereCamRelPos.z - 0.5f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.z = sphereCamRelPos.z - 5.0f * lastFrameDuration;
+                sphereCamRelPos.z = sphereCamRelPos.z - 5.0f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_U)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.z = sphereCamRelPos.z + 0.5f * lastFrameDuration;
+                sphereCamRelPos.z = sphereCamRelPos.z + 0.5f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.z = sphereCamRelPos.z + 5.0f * lastFrameDuration;
+                sphereCamRelPos.z = sphereCamRelPos.z + 5.0f * lastFrameDuration * scale;
             }
         }
 

diff --git a/src/main/java/jgltut/tut07/WorldWithUBO.java b/src/main/java/jgltut/tut07/WorldWithUBO.java
@@ -175,90 +175,90 @@ protected void reshape(int w, int h) {
 
     @Override
     protected void update() {
-        float lastFrameDuration = getLastFrameDuration() * 5;
+        final float scale = 5;
 
         if (isKeyPressed(GLFW_KEY_W)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.z = camTarget.z - 0.4f * lastFrameDuration;
+                camTarget.z = camTarget.z - 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.z = camTarget.z - 4.0f * lastFrameDuration;
+                camTarget.z = camTarget.z - 4.0f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_S)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.z = camTarget.z + 0.4f * lastFrameDuration;
+                camTarget.z = camTarget.z + 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.z = camTarget.z + 4.0f * lastFrameDuration;
+                camTarget.z = camTarget.z + 4.0f * lastFrameDuration * scale;
             }
         }
 
         if (isKeyPressed(GLFW_KEY_D)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.x = camTarget.x + 0.4f * lastFrameDuration;
+                camTarget.x = camTarget.x + 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.x = camTarget.x + 4.0f * lastFrameDuration;
+                camTarget.x = camTarget.x + 4.0f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_A)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.x = camTarget.x - 0.4f * lastFrameDuration;
+                camTarget.x = camTarget.x - 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.x = camTarget.x - 4.0f * lastFrameDuration;
+                camTarget.x = camTarget.x - 4.0f * lastFrameDuration * scale;
             }
         }
 
         if (isKeyPressed(GLFW_KEY_E)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.y = camTarget.y - 0.4f * lastFrameDuration;
+                camTarget.y = camTarget.y - 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.y = camTarget.y - 4.0f * lastFrameDuration;
+                camTarget.y = camTarget.y - 4.0f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_Q)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                camTarget.y = camTarget.y + 0.4f * lastFrameDuration;
+                camTarget.y = camTarget.y + 0.4f * lastFrameDuration * scale;
             } else {
-                camTarget.y = camTarget.y + 4.0f * lastFrameDuration;
+                camTarget.y = camTarget.y + 4.0f * lastFrameDuration * scale;
             }
         }
 
 
         if (isKeyPressed(GLFW_KEY_I)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.y = sphereCamRelPos.y - 1.125f * lastFrameDuration;
+                sphereCamRelPos.y = sphereCamRelPos.y - 1.125f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.y = sphereCamRelPos.y - 11.25f * lastFrameDuration;
+                sphereCamRelPos.y = sphereCamRelPos.y - 11.25f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_K)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.y = sphereCamRelPos.y + 1.125f * lastFrameDuration;
+                sphereCamRelPos.y = sphereCamRelPos.y + 1.125f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.y = sphereCamRelPos.y + 11.25f * lastFrameDuration;
+                sphereCamRelPos.y = sphereCamRelPos.y + 11.25f * lastFrameDuration * scale;
             }
         }
 
         if (isKeyPressed(GLFW_KEY_J)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.x = sphereCamRelPos.x - 1.125f * lastFrameDuration;
+                sphereCamRelPos.x = sphereCamRelPos.x - 1.125f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.x = sphereCamRelPos.x - 11.25f * lastFrameDuration;
+                sphereCamRelPos.x = sphereCamRelPos.x - 11.25f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_L)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.x = sphereCamRelPos.x + 1.125f * lastFrameDuration;
+                sphereCamRelPos.x = sphereCamRelPos.x + 1.125f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.x = sphereCamRelPos.x + 11.25f * lastFrameDuration;
+                sphereCamRelPos.x = sphereCamRelPos.x + 11.25f * lastFrameDuration * scale;
             }
         }
 
         if (isKeyPressed(GLFW_KEY_O)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.z = sphereCamRelPos.z - 0.5f * lastFrameDuration;
+                sphereCamRelPos.z = sphereCamRelPos.z - 0.5f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.z = sphereCamRelPos.z - 5.0f * lastFrameDuration;
+                sphereCamRelPos.z = sphereCamRelPos.z - 5.0f * lastFrameDuration * scale;
             }
         } else if (isKeyPressed(GLFW_KEY_U)) {
             if (isKeyPressed(GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW_KEY_RIGHT_SHIFT)) {
-                sphereCamRelPos.z = sphereCamRelPos.z + 0.5f * lastFrameDuration;
+                sphereCamRelPos.z = sphereCamRelPos.z + 0.5f * lastFrameDuration * scale;
             } else {
-                sphereCamRelPos.z = sphereCamRelPos.z + 5.0f * lastFrameDuration;
+                sphereCamRelPos.z = sphereCamRelPos.z + 5.0f * lastFrameDuration * scale;
             }
         }