Revision fc286c71
Added by Leszek Koltunski about 4 years ago
src/main/java/org/distorted/examples/generic/GenericEffect.java | ||
---|---|---|
352 | 352 |
float y = (mInterCenter[1]*0.012f - 0.6f)*act.getHeight(); |
353 | 353 |
float z = (mInterCenter[2]*0.012f - 0.6f)*act.getDepth(); |
354 | 354 |
|
355 |
if( mName.getType() == EffectType.MATRIX ) |
|
356 |
{ |
|
357 |
float factor = act.getScaleFactor(); |
|
358 |
x *= factor; |
|
359 |
y *= factor; |
|
360 |
z *= factor; |
|
361 |
} |
|
362 |
|
|
355 | 363 |
mCenterSta.set(x,y,z); |
356 | 364 |
} |
357 | 365 |
|
... | ... | |
430 | 438 |
} |
431 | 439 |
} |
432 | 440 |
|
441 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
442 |
|
|
443 |
private void setCenter(GenericActivity2 act) |
|
444 |
{ |
|
445 |
float factor = ( mName.getType() == EffectType.MATRIX ? act.getScaleFactor() : 1.0f); |
|
446 |
act.setCenter( mCenterSta.get0()/factor, mCenterSta.get1()/factor, mCenterSta.get2()/factor ); |
|
447 |
} |
|
448 |
|
|
433 | 449 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
434 | 450 |
|
435 | 451 |
void setBackground(int pos) |
... | ... | |
707 | 723 |
seek[i].setProgress( mInterCenter[i] ); |
708 | 724 |
} |
709 | 725 |
|
710 |
act.setCenter(mCenterSta);
|
|
726 |
setCenter(act);
|
|
711 | 727 |
|
712 | 728 |
return mCenter; |
713 | 729 |
} |
... | ... | |
768 | 784 |
if( fromUser ) |
769 | 785 |
{ |
770 | 786 |
GenericActivity2 act = mAct.get(); |
771 |
act.setCenter(mCenterSta);
|
|
787 |
setCenter(act);
|
|
772 | 788 |
act.setRegion(mRegion4Sta); |
773 | 789 |
} |
774 | 790 |
} |
Also available in: Unified diff
fix for centers of Matrix effects.