Revision 638b5b5c
Added by Leszek Koltunski about 7 years ago
| src/main/java/org/distorted/library/EffectQueueMatrix.java | ||
|---|---|---|
| 114 | 114 |
float x,y,z, sx,sy,sz; |
| 115 | 115 |
float mipmap = projection.mMipmap; |
| 116 | 116 |
|
| 117 |
if( mipmap!=1 ) Matrix.scaleM(mViewMatrix, 0, mipmap, mipmap, mipmap); |
|
| 118 |
|
|
| 117 | 119 |
for(int i=0; i<mNumEffects; i++) |
| 118 | 120 |
{
|
| 119 | 121 |
if (mName[i] == EffectNames.ROTATE.ordinal() ) |
| 120 | 122 |
{
|
| 121 |
x = mUniforms[NUM_UNIFORMS*i+4]*mipmap;
|
|
| 122 |
y = mUniforms[NUM_UNIFORMS*i+5]*mipmap;
|
|
| 123 |
z = mUniforms[NUM_UNIFORMS*i+6]*mipmap;
|
|
| 123 |
x = mUniforms[NUM_UNIFORMS*i+4]; |
|
| 124 |
y = mUniforms[NUM_UNIFORMS*i+5]; |
|
| 125 |
z = mUniforms[NUM_UNIFORMS*i+6]; |
|
| 124 | 126 |
|
| 125 | 127 |
Matrix.translateM(mViewMatrix, 0, x,-y, z); |
| 126 | 128 |
Matrix.rotateM( mViewMatrix, 0, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); |
| ... | ... | |
| 128 | 130 |
} |
| 129 | 131 |
else if(mName[i] == EffectNames.QUATERNION.ordinal() ) |
| 130 | 132 |
{
|
| 131 |
x = mUniforms[NUM_UNIFORMS*i+4]*mipmap;
|
|
| 132 |
y = mUniforms[NUM_UNIFORMS*i+5]*mipmap;
|
|
| 133 |
z = mUniforms[NUM_UNIFORMS*i+6]*mipmap;
|
|
| 133 |
x = mUniforms[NUM_UNIFORMS*i+4]; |
|
| 134 |
y = mUniforms[NUM_UNIFORMS*i+5]; |
|
| 135 |
z = mUniforms[NUM_UNIFORMS*i+6]; |
|
| 134 | 136 |
|
| 135 | 137 |
Matrix.translateM(mViewMatrix, 0, x,-y, z); |
| 136 | 138 |
multiplyByQuat(mViewMatrix, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); |
| ... | ... | |
| 138 | 140 |
} |
| 139 | 141 |
else if(mName[i] == EffectNames.MOVE.ordinal() ) |
| 140 | 142 |
{
|
| 141 |
sx = mUniforms[NUM_UNIFORMS*i ]*mipmap;
|
|
| 142 |
sy = mUniforms[NUM_UNIFORMS*i+1]*mipmap;
|
|
| 143 |
sz = mUniforms[NUM_UNIFORMS*i+2]*mipmap;
|
|
| 143 |
sx = mUniforms[NUM_UNIFORMS*i ]; |
|
| 144 |
sy = mUniforms[NUM_UNIFORMS*i+1]; |
|
| 145 |
sz = mUniforms[NUM_UNIFORMS*i+2]; |
|
| 144 | 146 |
|
| 145 | 147 |
Matrix.translateM(mViewMatrix, 0, sx,-sy, sz); |
| 146 | 148 |
} |
| 147 | 149 |
else if(mName[i] == EffectNames.SCALE.ordinal() ) |
| 148 | 150 |
{
|
| 149 |
sx = mUniforms[NUM_UNIFORMS*i ]*mipmap;
|
|
| 150 |
sy = mUniforms[NUM_UNIFORMS*i+1]*mipmap;
|
|
| 151 |
sz = mUniforms[NUM_UNIFORMS*i+2]*mipmap;
|
|
| 151 |
sx = mUniforms[NUM_UNIFORMS*i ]; |
|
| 152 |
sy = mUniforms[NUM_UNIFORMS*i+1]; |
|
| 153 |
sz = mUniforms[NUM_UNIFORMS*i+2]; |
|
| 152 | 154 |
|
| 153 | 155 |
Matrix.scaleM(mViewMatrix, 0, sx, sy, sz); |
| 154 | 156 |
} |
| ... | ... | |
| 158 | 160 |
sy = mUniforms[NUM_UNIFORMS*i+1]; |
| 159 | 161 |
sz = mUniforms[NUM_UNIFORMS*i+2]; |
| 160 | 162 |
|
| 161 |
x = mUniforms[NUM_UNIFORMS*i+4]*mipmap;
|
|
| 162 |
y = mUniforms[NUM_UNIFORMS*i+5]*mipmap;
|
|
| 163 |
z = mUniforms[NUM_UNIFORMS*i+6]*mipmap;
|
|
| 163 |
x = mUniforms[NUM_UNIFORMS*i+4]; |
|
| 164 |
y = mUniforms[NUM_UNIFORMS*i+5]; |
|
| 165 |
z = mUniforms[NUM_UNIFORMS*i+6]; |
|
| 164 | 166 |
|
| 165 | 167 |
Matrix.translateM(mViewMatrix, 0, x,-y, z); |
| 166 | 168 |
|
Also available in: Unified diff
More MIPMAP work.