Revision e8c81a8e
Added by Leszek Koltunski almost 8 years ago
| src/main/java/org/distorted/library/EffectQueueMatrix.java | ||
|---|---|---|
| 111 | 111 |
EffectMessageSender.newMessage( mListeners.elementAt(j), |
| 112 | 112 |
EffectMessage.EFFECT_FINISHED, |
| 113 | 113 |
(mID[i]<<EffectTypes.LENGTH)+EffectTypes.MATRIX.type, |
| 114 |
mType[i],
|
|
| 114 |
mName[i],
|
|
| 115 | 115 |
mBitmapID, |
| 116 | 116 |
null); |
| 117 | 117 |
|
| 118 |
if( EffectNames.isUnity(mType[i], mUniforms, NUM_UNIFORMS*i) )
|
|
| 118 |
if( EffectNames.isUnity(mName[i], mUniforms, NUM_UNIFORMS*i) )
|
|
| 119 | 119 |
{
|
| 120 | 120 |
remove(i); |
| 121 | 121 |
i--; |
| 122 | 122 |
continue; |
| 123 | 123 |
} |
| 124 |
else mInter[0][i] = null; |
|
| 124 | 125 |
} |
| 125 | 126 |
|
| 126 | 127 |
if( mInter[1][i]!=null ) |
| ... | ... | |
| 159 | 160 |
|
| 160 | 161 |
for(int i=0; i<mNumEffects; i++) |
| 161 | 162 |
{
|
| 162 |
if (mType[i] == EffectNames.ROTATE.ordinal() )
|
|
| 163 |
if (mName[i] == EffectNames.ROTATE.ordinal() )
|
|
| 163 | 164 |
{
|
| 164 | 165 |
x = mUniforms[NUM_UNIFORMS*i+4]; |
| 165 | 166 |
y = mUniforms[NUM_UNIFORMS*i+5]; |
| ... | ... | |
| 169 | 170 |
Matrix.rotateM( viewMatrix, 0, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); |
| 170 | 171 |
Matrix.translateM(viewMatrix, 0,-x, y,-z); |
| 171 | 172 |
} |
| 172 |
else if(mType[i] == EffectNames.QUATERNION.ordinal() )
|
|
| 173 |
else if(mName[i] == EffectNames.QUATERNION.ordinal() )
|
|
| 173 | 174 |
{
|
| 174 | 175 |
x = mUniforms[NUM_UNIFORMS*i+4]; |
| 175 | 176 |
y = mUniforms[NUM_UNIFORMS*i+5]; |
| ... | ... | |
| 179 | 180 |
multiplyByQuat(viewMatrix, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); |
| 180 | 181 |
Matrix.translateM(viewMatrix, 0,-x, y,-z); |
| 181 | 182 |
} |
| 182 |
else if(mType[i] == EffectNames.MOVE.ordinal() )
|
|
| 183 |
else if(mName[i] == EffectNames.MOVE.ordinal() )
|
|
| 183 | 184 |
{
|
| 184 | 185 |
sx = mUniforms[NUM_UNIFORMS*i ]; |
| 185 | 186 |
sy = mUniforms[NUM_UNIFORMS*i+1]; |
| ... | ... | |
| 187 | 188 |
|
| 188 | 189 |
Matrix.translateM(viewMatrix, 0, sx,-sy, sz); |
| 189 | 190 |
} |
| 190 |
else if(mType[i] == EffectNames.SCALE.ordinal() )
|
|
| 191 |
else if(mName[i] == EffectNames.SCALE.ordinal() )
|
|
| 191 | 192 |
{
|
| 192 | 193 |
sx = mUniforms[NUM_UNIFORMS*i ]; |
| 193 | 194 |
sy = mUniforms[NUM_UNIFORMS*i+1]; |
| ... | ... | |
| 195 | 196 |
|
| 196 | 197 |
Matrix.scaleM(viewMatrix, 0, sx, sy, sz); |
| 197 | 198 |
} |
| 198 |
else if(mType[i] == EffectNames.SHEAR.ordinal() )
|
|
| 199 |
else if(mName[i] == EffectNames.SHEAR.ordinal() )
|
|
| 199 | 200 |
{
|
| 200 | 201 |
sx = mUniforms[NUM_UNIFORMS*i ]; |
| 201 | 202 |
sy = mUniforms[NUM_UNIFORMS*i+1]; |
Also available in: Unified diff
Cleanup, consistent variable names, minor details.