Revision 34f52b8a
Added by Leszek Koltunski over 7 years ago
| src/main/java/org/distorted/library/EffectQueueMatrix.java | ||
|---|---|---|
| 120 | 120 |
{
|
| 121 | 121 |
x = mUniforms[NUM_UNIFORMS*i+4]*projection.mWidth; |
| 122 | 122 |
y = mUniforms[NUM_UNIFORMS*i+5]*projection.mHeight; |
| 123 |
z = mUniforms[NUM_UNIFORMS*i+6]*projection.mWidth;
|
|
| 123 |
z = mUniforms[NUM_UNIFORMS*i+6]*projection.mDistance;
|
|
| 124 | 124 |
|
| 125 | 125 |
Matrix.translateM(mViewMatrix, 0, x,-y, z); |
| 126 | 126 |
Matrix.rotateM( mViewMatrix, 0, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); |
| ... | ... | |
| 130 | 130 |
{
|
| 131 | 131 |
x = mUniforms[NUM_UNIFORMS*i+4]*projection.mWidth; |
| 132 | 132 |
y = mUniforms[NUM_UNIFORMS*i+5]*projection.mHeight; |
| 133 |
z = mUniforms[NUM_UNIFORMS*i+6]*projection.mWidth;
|
|
| 133 |
z = mUniforms[NUM_UNIFORMS*i+6]*projection.mDistance;
|
|
| 134 | 134 |
|
| 135 | 135 |
Matrix.translateM(mViewMatrix, 0, x,-y, z); |
| 136 | 136 |
multiplyByQuat(mViewMatrix, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); |
| ... | ... | |
| 140 | 140 |
{
|
| 141 | 141 |
sx = mUniforms[NUM_UNIFORMS*i ]*projection.mWidth; |
| 142 | 142 |
sy = mUniforms[NUM_UNIFORMS*i+1]*projection.mHeight; |
| 143 |
sz = mUniforms[NUM_UNIFORMS*i+2]*projection.mWidth;
|
|
| 143 |
sz = mUniforms[NUM_UNIFORMS*i+2]*projection.mDistance;
|
|
| 144 | 144 |
|
| 145 | 145 |
Matrix.translateM(mViewMatrix, 0, sx,-sy, sz); |
| 146 | 146 |
} |
| ... | ... | |
| 160 | 160 |
|
| 161 | 161 |
x = mUniforms[NUM_UNIFORMS*i+4]*projection.mWidth; |
| 162 | 162 |
y = mUniforms[NUM_UNIFORMS*i+5]*projection.mHeight; |
| 163 |
z = mUniforms[NUM_UNIFORMS*i+6]*projection.mWidth;
|
|
| 163 |
z = mUniforms[NUM_UNIFORMS*i+6]*projection.mDistance;
|
|
| 164 | 164 |
|
| 165 | 165 |
Matrix.translateM(mViewMatrix, 0, x,-y, z); |
| 166 | 166 |
|
| ... | ... | |
| 183 | 183 |
} |
| 184 | 184 |
} |
| 185 | 185 |
|
| 186 |
Matrix.scaleM(mViewMatrix, 0, projection.mWidth/(2*halfX), projection.mHeight/(2*halfY), projection.mWidth/(2*halfX) );
|
|
| 186 |
Matrix.scaleM(mViewMatrix, 0, projection.mWidth/(2*halfX), projection.mHeight/(2*halfY), 1);
|
|
| 187 | 187 |
Matrix.multiplyMM(mMVPMatrix, 0, projection.mProjectionMatrix, 0, mViewMatrix, 0); |
| 188 | 188 |
} |
| 189 | 189 |
|
Also available in: Unified diff
Revert "Convert next 4 APPs to the new Matrix effects."
This reverts commit d28acefad49451b502424dae12ec8a985007de86.
revert the recent Marix Effects work.