Project

General

Profile

« Previous | Next » 

Revision 1dec66e0

Added by Leszek Koltunski 12 months ago

Implement the android.opengl.Matrix functions ourselves.

View differences:

src/main/java/org/distorted/library/effect/MatrixEffectRotate.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.Data1D;
26 25
import org.distorted.library.type.Data3D;
27 26

  
......
64 63
    float y = uniforms[NUM_FLOAT_UNIFORMS*index+CENTER_OFFSET+1];
65 64
    float z = uniforms[NUM_FLOAT_UNIFORMS*index+CENTER_OFFSET+2];
66 65

  
67
    Matrix.translateM(matrixP, 0, x, y, z);
68
    Matrix.rotateM   (matrixP, 0, angle, axisX, axisY, axisZ);
69
    Matrix.translateM(matrixP, 0,-x,-y,-z);
66
    MatrixHelper.translate(matrixP, x, y, z);
67
    MatrixHelper.rotate(matrixP, angle, axisX, axisY, axisZ);
68
    MatrixHelper.translate(matrixP,-x,-y,-z);
70 69

  
71
    Matrix.translateM(matrixV, 0, x, y, z);
72
    Matrix.rotateM   (matrixV, 0, angle, axisX, axisY, axisZ);
73
    Matrix.translateM(matrixV, 0,-x,-y,-z);
70
    MatrixHelper.translate(matrixV, x, y, z);
71
    MatrixHelper.rotate(matrixV, angle, axisX, axisY, axisZ);
72
    MatrixHelper.translate(matrixV,-x,-y,-z);
74 73
    }
75 74

  
76 75
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff