Merge pull request #16 from skyfe79/06-3.ViewTransformation

refactoring update method

Author: skyfe79

06-3.ViewTransformation/app/src/main/java/kr/pe/burt/android/viewtransformation/Model.java

@@ -113,13 +113,8 @@ public void setCamera(Matrix4f mat) {
         camera.load(mat);
     }
 
-    public void updateWithDelta(long dt) {
-    }
-
     public void draw(long dt) {
 
-        updateWithDelta(dt);
-
         shader.begin();
 
         camera.multiply(modelMatrix());

06-3.ViewTransformation/app/src/main/java/kr/pe/burt/android/viewtransformation/OGLRenderer.java

@@ -4,6 +4,7 @@
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
 import android.renderscript.Float3;
+import android.renderscript.Matrix4f;
 
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
@@ -17,6 +18,8 @@
  */
 public class OGLRenderer implements GLSurfaceView.Renderer {
 
+    private static final float ONE_SEC = 1000.0f; // 1 second
+
     private Context context;
     private Square square;
     private long lastTimeMillis = 0L;
@@ -48,8 +51,23 @@ public void onDrawFrame(GL10 gl10) {
         GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
 
         long currentTimeMillis = System.currentTimeMillis();
-        square.draw(currentTimeMillis - lastTimeMillis);
+        updateWithDelta(currentTimeMillis - lastTimeMillis);
         lastTimeMillis = currentTimeMillis;
     }
 
+
+    public void updateWithDelta(long dt) {
+
+        final float secsPerMove = 2.0f * ONE_SEC;
+        float movement = (float)(Math.sin(System.currentTimeMillis() * 2 * Math.PI / secsPerMove));
+
+        Matrix4f camera = new Matrix4f();
+        camera.translate(0.0f, -1.0f * movement, 0.0f);
+        camera.rotate(360.0f * movement, 0.0f, 0.0f, 1.0f);
+        camera.scale(movement, movement, movement);
+        square.setCamera(camera);
+
+
+        square.draw(dt);
+    }
 }

06-3.ViewTransformation/app/src/main/java/kr/pe/burt/android/viewtransformation/Square.java

@@ -13,7 +13,7 @@
  */
 public class Square extends Model {
 
-    private static final float ONE_SEC = 1000.0f; // 1 second
+
 
 
     static final float squareCoords[] = {
@@ -32,21 +32,5 @@ public Square(ShaderProgram shader) {
         super("square", shader, squareCoords, indices);
     }
 
-    @Override
-    public void updateWithDelta(long dt) {
-        final float secsPerMove = 2.0f * ONE_SEC;
-        float movement = (float)(Math.sin(System.currentTimeMillis() * 2 * Math.PI / secsPerMove));
-
-        Matrix4f camera = new Matrix4f();
-        camera.translate(0.0f, -1.0f * movement, 0.0f);
-        camera.rotate(360.0f * movement, 0.0f, 0.0f, 1.0f);
-        camera.scale(movement, movement, movement);
-        setCamera(camera);
-
-        setPosition(new Float3(
-                position.x,
-                position.y,
-                position.z)
-        );
-    }
+
 }