Revision eada161a
Added by Leszek Koltunski over 7 years ago
| src/main/java/org/distorted/library/EffectQueueVertex.java | ||
|---|---|---|
| 109 | 109 |
|
| 110 | 110 |
if( mInter[2][i]!=null ) // center |
| 111 | 111 |
{
|
| 112 |
mInter[2][i].interpolateMain(mUniforms, NUM_UNIFORMS*i+6, mCurrentDuration[i], step);
|
|
| 112 |
mInter[2][i].interpolateMain(mUniforms, NUM_UNIFORMS*i+5, mCurrentDuration[i], step);
|
|
| 113 | 113 |
|
| 114 |
mUniforms[NUM_UNIFORMS*i+6] = mUniforms[NUM_UNIFORMS*i+6]-mObjHalfX; |
|
| 115 |
mUniforms[NUM_UNIFORMS*i+7] =-mUniforms[NUM_UNIFORMS*i+7]+mObjHalfY; |
|
| 114 |
mUniforms[NUM_UNIFORMS*i+5] = mUniforms[NUM_UNIFORMS*i+5]-mObjHalfX; |
|
| 115 |
mUniforms[NUM_UNIFORMS*i+6] =-mUniforms[NUM_UNIFORMS*i+6]+mObjHalfY; |
|
| 116 |
mUniforms[NUM_UNIFORMS*i+7] = mUniforms[NUM_UNIFORMS*i+7]-mObjHalfZ; |
|
| 116 | 117 |
} |
| 117 | 118 |
|
| 118 | 119 |
mCurrentDuration[i] += step; |
| ... | ... | |
| 187 | 188 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 188 | 189 |
// wave |
| 189 | 190 |
|
| 190 |
synchronized long add(EffectNames eln, Data5D data, Data2D center, Data4D region)
|
|
| 191 |
synchronized long add(EffectNames eln, Data5D data, Data3D center, Data4D region)
|
|
| 191 | 192 |
{
|
| 192 | 193 |
if( mMax[INDEX]>mNumEffects ) |
| 193 | 194 |
{
|
| ... | ... | |
| 218 | 219 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 219 | 220 |
// deform,distort |
| 220 | 221 |
|
| 221 |
synchronized long add(EffectNames eln, Data3D data, Data2D center, Data4D region)
|
|
| 222 |
synchronized long add(EffectNames eln, Data3D data, Data3D center, Data4D region)
|
|
| 222 | 223 |
{
|
| 223 | 224 |
if( mMax[INDEX]>mNumEffects ) |
| 224 | 225 |
{
|
| ... | ... | |
| 247 | 248 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 248 | 249 |
// sink, swirl |
| 249 | 250 |
|
| 250 |
synchronized long add(EffectNames eln, Data1D data, Data2D center, Data4D region)
|
|
| 251 |
synchronized long add(EffectNames eln, Data1D data, Data3D center, Data4D region)
|
|
| 251 | 252 |
{
|
| 252 | 253 |
if( mMax[INDEX]>mNumEffects ) |
| 253 | 254 |
{
|
| ... | ... | |
| 272 | 273 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 273 | 274 |
// sink, swirl |
| 274 | 275 |
|
| 275 |
synchronized long add(EffectNames eln, Data1D data, Data2D center)
|
|
| 276 |
synchronized long add(EffectNames eln, Data1D data, Data3D center)
|
|
| 276 | 277 |
{
|
| 277 | 278 |
if( mMax[INDEX]>mNumEffects ) |
| 278 | 279 |
{
|
| ... | ... | |
| 296 | 297 |
|
| 297 | 298 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 298 | 299 |
|
| 299 |
private long addPriv(EffectNames eln, Data2D center, Data4D region)
|
|
| 300 |
private long addPriv(EffectNames eln, Data3D center, Data4D region)
|
|
| 300 | 301 |
{
|
| 301 | 302 |
if( region!=null ) |
| 302 | 303 |
{
|
| ... | ... | |
| 327 | 328 |
mInter[1][mNumEffects] = null; |
| 328 | 329 |
} |
| 329 | 330 |
|
| 330 |
if( center instanceof Dynamic2D)
|
|
| 331 |
if( center instanceof Dynamic3D)
|
|
| 331 | 332 |
{
|
| 332 |
mInter[2][mNumEffects] = (Dynamic2D)center;
|
|
| 333 |
mInter[2][mNumEffects] = (Dynamic3D)center;
|
|
| 333 | 334 |
} |
| 334 |
else if( center instanceof Static2D)
|
|
| 335 |
else if( center instanceof Static3D)
|
|
| 335 | 336 |
{
|
| 336 | 337 |
mInter[2][mNumEffects] = null; |
| 337 |
mUniforms[NUM_UNIFORMS*mNumEffects+6] = ((Static2D)center).getX()-mObjHalfX; |
|
| 338 |
mUniforms[NUM_UNIFORMS*mNumEffects+7] =-((Static2D)center).getY()+mObjHalfY; |
|
| 338 |
mUniforms[NUM_UNIFORMS*mNumEffects+5] = ((Static3D)center).getX()-mObjHalfX; |
|
| 339 |
mUniforms[NUM_UNIFORMS*mNumEffects+6] =-((Static3D)center).getY()+mObjHalfY; |
|
| 340 |
mUniforms[NUM_UNIFORMS*mNumEffects+7] = ((Static3D)center).getZ()-mObjHalfZ; |
|
| 339 | 341 |
} |
| 340 | 342 |
|
| 341 | 343 |
long ret= addBase(eln); |
Also available in: Unified diff
Make the effect Center be always 3D.