Revision 1dec66e0
Added by Leszek Koltunski 12 months ago
src/main/java/org/distorted/library/effect/MatrixEffectQuaternion.java | ||
---|---|---|
20 | 20 |
|
21 | 21 |
package org.distorted.library.effect; |
22 | 22 |
|
23 |
import android.opengl.Matrix; |
|
24 |
|
|
23 |
import org.distorted.library.helpers.MatrixHelper; |
|
25 | 24 |
import org.distorted.library.type.Data3D; |
26 | 25 |
import org.distorted.library.type.Data4D; |
27 | 26 |
|
... | ... | |
66 | 65 |
float y = uniforms[NUM_FLOAT_UNIFORMS*index+CENTER_OFFSET+1]; |
67 | 66 |
float z = uniforms[NUM_FLOAT_UNIFORMS*index+CENTER_OFFSET+2]; |
68 | 67 |
|
69 |
Matrix.translateM(matrixP, 0, x, y, z);
|
|
70 |
multiplyByQuat (matrixP, qX, qY, qZ, qW);
|
|
71 |
Matrix.translateM(matrixP, 0,-x,-y,-z);
|
|
68 |
MatrixHelper.translate(matrixP, x, y, z);
|
|
69 |
multiplyByQuat(matrixP, qX, qY, qZ, qW); |
|
70 |
MatrixHelper.translate(matrixP,-x,-y,-z);
|
|
72 | 71 |
|
73 |
Matrix.translateM(matrixV, 0, x, y, z);
|
|
74 |
multiplyByQuat (matrixV, qX, qY, qZ, qW);
|
|
75 |
Matrix.translateM(matrixV, 0,-x,-y,-z);
|
|
72 |
MatrixHelper.translate(matrixV, x, y, z);
|
|
73 |
multiplyByQuat(matrixV, qX, qY, qZ, qW); |
|
74 |
MatrixHelper.translate(matrixV,-x,-y,-z);
|
|
76 | 75 |
} |
77 | 76 |
|
78 | 77 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
101 | 100 |
mTmpMatrix1[3] = mTmpMatrix1[7] = mTmpMatrix1[11] = mTmpMatrix1[12] = mTmpMatrix1[13] = mTmpMatrix1[14] = 0; |
102 | 101 |
mTmpMatrix1[15] = 1; |
103 | 102 |
|
104 |
Matrix.multiplyMM(mTmpMatrix2, 0, matrix, 0, mTmpMatrix1, 0);
|
|
103 |
MatrixHelper.multiply(mTmpMatrix2, matrix, mTmpMatrix1);
|
|
105 | 104 |
|
106 | 105 |
matrix[ 0] = mTmpMatrix2[ 0]; |
107 | 106 |
matrix[ 1] = mTmpMatrix2[ 1]; |
Also available in: Unified diff
Implement the android.opengl.Matrix functions ourselves.