commit 1a9405484904b2c4ffd4f9c6656718afb4c9cb0f Author: Leszek Koltunski Date: Fri Dec 2 12:24:09 2016 +0000 Minor stuff diff --git a/src/main/java/org/distorted/library/DistortedObject.java b/src/main/java/org/distorted/library/DistortedObject.java index 0e25faf..9624276 100644 --- a/src/main/java/org/distorted/library/DistortedObject.java +++ b/src/main/java/org/distorted/library/DistortedObject.java @@ -38,8 +38,6 @@ import org.distorted.library.type.Static3D; */ public abstract class DistortedObject { - private static float[] mViewMatrix = new float[16]; - private EffectQueueMatrix mM; private EffectQueueFragment mF; private EffectQueueVertex mV; @@ -166,7 +164,7 @@ public abstract class DistortedObject GLES20.glViewport(0, 0, dp.width, dp.height); mM.compute(currTime); - mM.send(mViewMatrix, dp); + mM.send(dp); mV.compute(currTime); mV.send(); diff --git a/src/main/java/org/distorted/library/EffectQueueMatrix.java b/src/main/java/org/distorted/library/EffectQueueMatrix.java index bbe1328..9df4ee3 100644 --- a/src/main/java/org/distorted/library/EffectQueueMatrix.java +++ b/src/main/java/org/distorted/library/EffectQueueMatrix.java @@ -40,9 +40,11 @@ class EffectQueueMatrix extends EffectQueue { private static final int NUM_UNIFORMS = 7; private static final int INDEX = EffectTypes.MATRIX.ordinal(); - private static float[] mMVPMatrix= new float[16]; - private static float[] mTmpMatrix= new float[16]; - + + private static float[] mMVPMatrix = new float[16]; + private static float[] mTmpMatrix = new float[16]; + private static float[] mViewMatrix= new float[16]; + private static int mObjDH; // This is a handle to half a Object dimensions private static int mDepthH; // Handle to the max Depth, i.e (farplane-nearplane)/2 private static int mMVPMatrixH; // pass in the transformation matrix @@ -151,10 +153,10 @@ class EffectQueueMatrix extends EffectQueue /////////////////////////////////////////////////////////////////////////////////////////////////// // here construct the ModelView Matrix - synchronized void send(float[] viewMatrix, DistortedProjection dp) + synchronized void send(DistortedProjection dp) { - Matrix.setIdentityM(viewMatrix, 0); - Matrix.translateM(viewMatrix, 0, -dp.width/2, dp.height/2, -dp.distance); + Matrix.setIdentityM(mViewMatrix, 0); + Matrix.translateM(mViewMatrix, 0, -dp.width/2, dp.height/2, -dp.distance); float x,y,z, sx,sy,sz; @@ -166,9 +168,9 @@ class EffectQueueMatrix extends EffectQueue y = mUniforms[NUM_UNIFORMS*i+5]; z = mUniforms[NUM_UNIFORMS*i+6]; - Matrix.translateM(viewMatrix, 0, x,-y, z); - Matrix.rotateM( viewMatrix, 0, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); - Matrix.translateM(viewMatrix, 0,-x, y,-z); + Matrix.translateM(mViewMatrix, 0, x,-y, z); + Matrix.rotateM( mViewMatrix, 0, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); + Matrix.translateM(mViewMatrix, 0,-x, y,-z); } else if(mName[i] == EffectNames.QUATERNION.ordinal() ) { @@ -176,9 +178,9 @@ class EffectQueueMatrix extends EffectQueue y = mUniforms[NUM_UNIFORMS*i+5]; z = mUniforms[NUM_UNIFORMS*i+6]; - Matrix.translateM(viewMatrix, 0, x,-y, z); - multiplyByQuat(viewMatrix, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); - Matrix.translateM(viewMatrix, 0,-x, y,-z); + Matrix.translateM(mViewMatrix, 0, x,-y, z); + multiplyByQuat(mViewMatrix, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); + Matrix.translateM(mViewMatrix, 0,-x, y,-z); } else if(mName[i] == EffectNames.MOVE.ordinal() ) { @@ -186,7 +188,7 @@ class EffectQueueMatrix extends EffectQueue sy = mUniforms[NUM_UNIFORMS*i+1]; sz = mUniforms[NUM_UNIFORMS*i+2]; - Matrix.translateM(viewMatrix, 0, sx,-sy, sz); + Matrix.translateM(mViewMatrix, 0, sx,-sy, sz); } else if(mName[i] == EffectNames.SCALE.ordinal() ) { @@ -194,7 +196,7 @@ class EffectQueueMatrix extends EffectQueue sy = mUniforms[NUM_UNIFORMS*i+1]; sz = mUniforms[NUM_UNIFORMS*i+2]; - Matrix.scaleM(viewMatrix, 0, sx, sy, sz); + Matrix.scaleM(mViewMatrix, 0, sx, sy, sz); } else if(mName[i] == EffectNames.SHEAR.ordinal() ) { @@ -206,34 +208,34 @@ class EffectQueueMatrix extends EffectQueue y = mUniforms[NUM_UNIFORMS*i+5]; z = mUniforms[NUM_UNIFORMS*i+6]; - Matrix.translateM(viewMatrix, 0, x,-y, z); + Matrix.translateM(mViewMatrix, 0, x,-y, z); - viewMatrix[4] += sx*viewMatrix[0]; // Multiply viewMatrix by 1 x 0 0 , i.e. X-shear. - viewMatrix[5] += sx*viewMatrix[1]; // 0 1 0 0 - viewMatrix[6] += sx*viewMatrix[2]; // 0 0 1 0 - viewMatrix[7] += sx*viewMatrix[3]; // 0 0 0 1 + mViewMatrix[4] += sx*mViewMatrix[0]; // Multiply viewMatrix by 1 x 0 0 , i.e. X-shear. + mViewMatrix[5] += sx*mViewMatrix[1]; // 0 1 0 0 + mViewMatrix[6] += sx*mViewMatrix[2]; // 0 0 1 0 + mViewMatrix[7] += sx*mViewMatrix[3]; // 0 0 0 1 - viewMatrix[0] += sy*viewMatrix[4]; // Multiply viewMatrix by 1 0 0 0 , i.e. Y-shear. - viewMatrix[1] += sy*viewMatrix[5]; // y 1 0 0 - viewMatrix[2] += sy*viewMatrix[6]; // 0 0 1 0 - viewMatrix[3] += sy*viewMatrix[7]; // 0 0 0 1 + mViewMatrix[0] += sy*mViewMatrix[4]; // Multiply viewMatrix by 1 0 0 0 , i.e. Y-shear. + mViewMatrix[1] += sy*mViewMatrix[5]; // y 1 0 0 + mViewMatrix[2] += sy*mViewMatrix[6]; // 0 0 1 0 + mViewMatrix[3] += sy*mViewMatrix[7]; // 0 0 0 1 - viewMatrix[4] += sz*viewMatrix[8]; // Multiply viewMatrix by 1 0 0 0 , i.e. Z-shear. - viewMatrix[5] += sz*viewMatrix[9]; // 0 1 0 0 - viewMatrix[6] += sz*viewMatrix[10];// 0 z 1 0 - viewMatrix[7] += sz*viewMatrix[11];// 0 0 0 1 + mViewMatrix[4] += sz*mViewMatrix[8]; // Multiply viewMatrix by 1 0 0 0 , i.e. Z-shear. + mViewMatrix[5] += sz*mViewMatrix[9]; // 0 1 0 0 + mViewMatrix[6] += sz*mViewMatrix[10];// 0 z 1 0 + mViewMatrix[7] += sz*mViewMatrix[11];// 0 0 0 1 - Matrix.translateM(viewMatrix, 0,-x, y, -z); + Matrix.translateM(mViewMatrix, 0,-x, y, -z); } } - Matrix.translateM(viewMatrix, 0, mObjHalfX,-mObjHalfY, 0); - Matrix.multiplyMM(mMVPMatrix, 0, dp.projectionMatrix, 0, viewMatrix, 0); + Matrix.translateM(mViewMatrix, 0, mObjHalfX,-mObjHalfY, 0); + Matrix.multiplyMM(mMVPMatrix, 0, dp.projectionMatrix, 0, mViewMatrix, 0); GLES20.glUniform3f( mObjDH , mObjHalfX, mObjHalfY, mObjHalfZ); GLES20.glUniform1f( mDepthH, dp.depth); - GLES20.glUniformMatrix4fv(mMVMatrixH , 1, false, viewMatrix, 0); - GLES20.glUniformMatrix4fv(mMVPMatrixH, 1, false, mMVPMatrix, 0); + GLES20.glUniformMatrix4fv(mMVMatrixH , 1, false, mViewMatrix, 0); + GLES20.glUniformMatrix4fv(mMVPMatrixH, 1, false, mMVPMatrix , 0); } ///////////////////////////////////////////////////////////////////////////////////////////////////