Revision d425545a
Added by Leszek Koltunski almost 8 years ago
| src/main/java/org/distorted/library/EffectQueueMatrix.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.library.type.DynamicQuat; |
| 33 | 33 |
import org.distorted.library.type.Static1D; |
| 34 | 34 |
import org.distorted.library.type.Static3D; |
| 35 |
import org.distorted.library.type.Dynamic; |
|
| 36 | 35 |
import org.distorted.library.type.Static4D; |
| 37 | 36 |
|
| 38 | 37 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 106 | 105 |
|
| 107 | 106 |
for(int i=0; i<mNumEffects; i++) |
| 108 | 107 |
{
|
| 109 |
if( mInterI[i]==null ) continue;
|
|
| 108 |
if( mInter[0][i]==null ) continue;
|
|
| 110 | 109 |
|
| 111 |
if( mInterP[i]!=null )
|
|
| 110 |
if( mInter[1][i]!=null )
|
|
| 112 | 111 |
{
|
| 113 |
mInterP[i].interpolateMain(mUniforms, NUM_UNIFORMS*i, mCurrentDuration[i]);
|
|
| 112 |
mInter[1][i].interpolateMain(mUniforms, NUM_UNIFORMS*i, mCurrentDuration[i]);
|
|
| 114 | 113 |
} |
| 115 | 114 |
|
| 116 |
if( mInterI[i].interpolateMain(mUniforms ,NUM_UNIFORMS*i+3, mCurrentDuration[i], step) )
|
|
| 115 |
if( mInter[0][i].interpolateMain(mUniforms ,NUM_UNIFORMS*i+3, mCurrentDuration[i], step) )
|
|
| 117 | 116 |
{
|
| 118 | 117 |
for(int j=0; j<mNumListeners; j++) |
| 119 | 118 |
EffectMessageSender.newMessage( mListeners.elementAt(j), |
| ... | ... | |
| 257 | 256 |
{
|
| 258 | 257 |
if( mMax[INDEX]>mNumEffects ) |
| 259 | 258 |
{
|
| 260 |
mInterP[mNumEffects] = null;
|
|
| 259 |
mInter[1][mNumEffects] = null;
|
|
| 261 | 260 |
|
| 262 |
if( vector instanceof Dynamic3D) mInterI[mNumEffects] = (Dynamic3D)vector;
|
|
| 261 |
if( vector instanceof Dynamic3D) mInter[0][mNumEffects] = (Dynamic3D)vector;
|
|
| 263 | 262 |
else if( vector instanceof Static3D ) |
| 264 | 263 |
{
|
| 265 |
mInterI[mNumEffects] = null;
|
|
| 264 |
mInter[0][mNumEffects] = null;
|
|
| 266 | 265 |
mUniforms[NUM_UNIFORMS*mNumEffects+3] = ((Static3D)vector).getX(); |
| 267 | 266 |
mUniforms[NUM_UNIFORMS*mNumEffects+4] = ((Static3D)vector).getY(); |
| 268 | 267 |
mUniforms[NUM_UNIFORMS*mNumEffects+5] = ((Static3D)vector).getZ(); |
| ... | ... | |
| 282 | 281 |
{
|
| 283 | 282 |
if( mMax[INDEX]>mNumEffects ) |
| 284 | 283 |
{
|
| 285 |
if( center instanceof Dynamic3D) mInterP[mNumEffects] = (Dynamic3D)center;
|
|
| 284 |
if( center instanceof Dynamic3D) mInter[1][mNumEffects] = (Dynamic3D)center;
|
|
| 286 | 285 |
else if( center instanceof Static3D ) |
| 287 | 286 |
{
|
| 288 |
mInterP[mNumEffects] = null;
|
|
| 287 |
mInter[1][mNumEffects] = null;
|
|
| 289 | 288 |
mUniforms[NUM_UNIFORMS*mNumEffects ] = ((Static3D)center).getX(); |
| 290 | 289 |
mUniforms[NUM_UNIFORMS*mNumEffects+1] = ((Static3D)center).getY(); |
| 291 | 290 |
mUniforms[NUM_UNIFORMS*mNumEffects+2] = ((Static3D)center).getZ(); |
| 292 | 291 |
} |
| 293 | 292 |
else return -1; |
| 294 | 293 |
|
| 295 |
if( angle instanceof Dynamic1D) mInterI[mNumEffects] = (Dynamic1D)angle;
|
|
| 294 |
if( angle instanceof Dynamic1D) mInter[0][mNumEffects] = (Dynamic1D)angle;
|
|
| 296 | 295 |
else if( angle instanceof Static1D) |
| 297 | 296 |
{
|
| 298 |
mInterI[mNumEffects] = null;
|
|
| 297 |
mInter[0][mNumEffects] = null;
|
|
| 299 | 298 |
mUniforms[NUM_UNIFORMS*mNumEffects+3] = ((Static1D)angle).getX(); |
| 300 | 299 |
} |
| 301 | 300 |
else return -1; |
| ... | ... | |
| 317 | 316 |
{
|
| 318 | 317 |
if( mMax[INDEX]>mNumEffects ) |
| 319 | 318 |
{
|
| 320 |
if( center instanceof Dynamic3D) mInterP[mNumEffects] = (Dynamic3D)center;
|
|
| 319 |
if( center instanceof Dynamic3D) mInter[1][mNumEffects] = (Dynamic3D)center;
|
|
| 321 | 320 |
else if( center instanceof Static3D ) |
| 322 | 321 |
{
|
| 323 |
mInterP[mNumEffects] = null;
|
|
| 322 |
mInter[1][mNumEffects] = null;
|
|
| 324 | 323 |
mUniforms[NUM_UNIFORMS*mNumEffects ] = ((Static3D)center).getX(); |
| 325 | 324 |
mUniforms[NUM_UNIFORMS*mNumEffects+1] = ((Static3D)center).getY(); |
| 326 | 325 |
mUniforms[NUM_UNIFORMS*mNumEffects+2] = ((Static3D)center).getZ(); |
| 327 | 326 |
} |
| 328 | 327 |
else return -1; |
| 329 | 328 |
|
| 330 |
if( data instanceof Dynamic4D ) mInterI[mNumEffects] = (Dynamic4D)data;
|
|
| 331 |
else if( data instanceof DynamicQuat) mInterI[mNumEffects] = (DynamicQuat)data;
|
|
| 329 |
if( data instanceof Dynamic4D ) mInter[0][mNumEffects] = (Dynamic4D)data;
|
|
| 330 |
else if( data instanceof DynamicQuat) mInter[0][mNumEffects] = (DynamicQuat)data;
|
|
| 332 | 331 |
else if( data instanceof Static4D ) |
| 333 | 332 |
{
|
| 334 |
mInterI[mNumEffects] = null;
|
|
| 333 |
mInter[0][mNumEffects] = null;
|
|
| 335 | 334 |
mUniforms[NUM_UNIFORMS*mNumEffects+3] = ((Static4D)data).getX(); |
| 336 | 335 |
mUniforms[NUM_UNIFORMS*mNumEffects+4] = ((Static4D)data).getY(); |
| 337 | 336 |
mUniforms[NUM_UNIFORMS*mNumEffects+5] = ((Static4D)data).getZ(); |
| ... | ... | |
| 352 | 351 |
{
|
| 353 | 352 |
if( mMax[INDEX]>mNumEffects ) |
| 354 | 353 |
{
|
| 355 |
if( center instanceof Dynamic3D) mInterP[mNumEffects] = (Dynamic3D)center;
|
|
| 354 |
if( center instanceof Dynamic3D) mInter[1][mNumEffects] = (Dynamic3D)center;
|
|
| 356 | 355 |
else if( center instanceof Static3D ) |
| 357 | 356 |
{
|
| 358 |
mInterP[mNumEffects] = null;
|
|
| 357 |
mInter[1][mNumEffects] = null;
|
|
| 359 | 358 |
mUniforms[NUM_UNIFORMS*mNumEffects ] = ((Static3D)center).getX(); |
| 360 | 359 |
mUniforms[NUM_UNIFORMS*mNumEffects+1] = ((Static3D)center).getY(); |
| 361 | 360 |
mUniforms[NUM_UNIFORMS*mNumEffects+2] = ((Static3D)center).getZ(); |
| 362 | 361 |
} |
| 363 | 362 |
else return -1; |
| 364 | 363 |
|
| 365 |
if( shear instanceof Dynamic3D) mInterI[mNumEffects] = (Dynamic3D)shear;
|
|
| 364 |
if( shear instanceof Dynamic3D) mInter[0][mNumEffects] = (Dynamic3D)shear;
|
|
| 366 | 365 |
else if( shear instanceof Static3D ) |
| 367 | 366 |
{
|
| 368 |
mInterI[mNumEffects] = null;
|
|
| 367 |
mInter[0][mNumEffects] = null;
|
|
| 369 | 368 |
mUniforms[NUM_UNIFORMS*mNumEffects+3] = ((Static3D)shear).getX(); |
| 370 | 369 |
mUniforms[NUM_UNIFORMS*mNumEffects+4] = ((Static3D)shear).getY(); |
| 371 | 370 |
mUniforms[NUM_UNIFORMS*mNumEffects+5] = ((Static3D)shear).getZ(); |
Also available in: Unified diff
Some more progress with porting apps to new VERTEX API.