Revision e8c81a8e
Added by Leszek Koltunski almost 8 years ago
| src/main/java/org/distorted/library/EffectQueueVertex.java | ||
|---|---|---|
| 77 | 77 |
EffectMessageSender.newMessage( mListeners.elementAt(j), |
| 78 | 78 |
EffectMessage.EFFECT_FINISHED, |
| 79 | 79 |
(mID[i]<<EffectTypes.LENGTH)+EffectTypes.VERTEX.type, |
| 80 |
mType[i],
|
|
| 80 |
mName[i],
|
|
| 81 | 81 |
mBitmapID, |
| 82 | 82 |
null); |
| 83 | 83 |
|
| 84 |
if( EffectNames.isUnity(mType[i], mUniforms, NUM_UNIFORMS*i) )
|
|
| 84 |
if( EffectNames.isUnity(mName[i], mUniforms, NUM_UNIFORMS*i) )
|
|
| 85 | 85 |
{
|
| 86 | 86 |
remove(i); |
| 87 | 87 |
i--; |
| 88 | 88 |
continue; |
| 89 | 89 |
} |
| 90 |
else mInter[0][i] = null; |
|
| 90 | 91 |
} |
| 91 | 92 |
|
| 92 | 93 |
if( mInter[1][i]!=null ) |
| ... | ... | |
| 100 | 101 |
|
| 101 | 102 |
mUniforms[NUM_UNIFORMS*i+7] = mUniforms[NUM_UNIFORMS*i+7]-mObjHalfX; |
| 102 | 103 |
mUniforms[NUM_UNIFORMS*i+8] =-mUniforms[NUM_UNIFORMS*i+8]+mObjHalfY; |
| 103 |
|
|
| 104 |
//android.util.Log.e("queue", "computing dynamic center, x="+(mUniforms[NUM_UNIFORMS*i+7]));
|
|
| 105 | 104 |
} |
| 106 | 105 |
|
| 107 | 106 |
mCurrentDuration[i] += step; |
| ... | ... | |
| 133 | 132 |
|
| 134 | 133 |
if( mNumEffects>0 ) |
| 135 | 134 |
{
|
| 136 |
GLES20.glUniform1iv( mTypeH , mNumEffects, mType ,0);
|
|
| 135 |
GLES20.glUniform1iv( mTypeH , mNumEffects, mName,0);
|
|
| 137 | 136 |
GLES20.glUniform3fv( mUniformsH,3*mNumEffects, mUniforms,0); |
| 138 | 137 |
} |
| 139 | 138 |
} |
| ... | ... | |
| 156 | 155 |
|
| 157 | 156 |
for(int i=0; i<mNumEffects; i++) |
| 158 | 157 |
{
|
| 159 |
if( mType[i]==EffectNames.SWIRL.ordinal() )
|
|
| 158 |
if( mName[i]==EffectNames.SWIRL.ordinal() )
|
|
| 160 | 159 |
{
|
| 161 | 160 |
d = Math.PI*mUniforms[NUM_UNIFORMS*i]/180; |
| 162 | 161 |
mUniforms[NUM_UNIFORMS*i+1] = (float)Math.sin(d); |
Also available in: Unified diff
Cleanup, consistent variable names, minor details.