Revision fa6c352d
Added by Leszek Koltunski over 7 years ago
| src/main/java/org/distorted/library/EffectQueueVertex.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
import org.distorted.library.message.EffectMessage; |
| 25 | 25 |
import org.distorted.library.type.Data1D; |
| 26 |
import org.distorted.library.type.Data2D; |
|
| 27 | 26 |
import org.distorted.library.type.Data3D; |
| 28 | 27 |
import org.distorted.library.type.Data4D; |
| 29 | 28 |
import org.distorted.library.type.Data5D; |
| 30 | 29 |
import org.distorted.library.type.Dynamic1D; |
| 31 |
import org.distorted.library.type.Dynamic2D; |
|
| 32 | 30 |
import org.distorted.library.type.Dynamic3D; |
| 33 | 31 |
import org.distorted.library.type.Dynamic4D; |
| 34 | 32 |
import org.distorted.library.type.Dynamic5D; |
| 35 | 33 |
import org.distorted.library.type.Static1D; |
| 36 |
import org.distorted.library.type.Static2D; |
|
| 37 | 34 |
import org.distorted.library.type.Static3D; |
| 38 | 35 |
import org.distorted.library.type.Static4D; |
| 39 | 36 |
import org.distorted.library.type.Static5D; |
| ... | ... | |
| 109 | 106 |
|
| 110 | 107 |
if( mInter[2][i]!=null ) // center |
| 111 | 108 |
{
|
| 112 |
mInter[2][i].interpolateMain(mUniforms, NUM_UNIFORMS*i+6, mCurrentDuration[i], step);
|
|
| 109 |
mInter[2][i].interpolateMain(mUniforms, NUM_UNIFORMS*i+5, mCurrentDuration[i], step);
|
|
| 113 | 110 |
|
| 114 |
mUniforms[NUM_UNIFORMS*i+6] = mUniforms[NUM_UNIFORMS*i+6]-mObjHalfX; |
|
| 115 |
mUniforms[NUM_UNIFORMS*i+7] =-mUniforms[NUM_UNIFORMS*i+7]+mObjHalfY; |
|
| 111 |
mUniforms[NUM_UNIFORMS*i+5] = mUniforms[NUM_UNIFORMS*i+5]-mObjHalfX; |
|
| 112 |
mUniforms[NUM_UNIFORMS*i+6] =-mUniforms[NUM_UNIFORMS*i+6]+mObjHalfY; |
|
| 113 |
mUniforms[NUM_UNIFORMS*i+7] = mUniforms[NUM_UNIFORMS*i+7]-mObjHalfZ; |
|
| 116 | 114 |
} |
| 117 | 115 |
|
| 118 | 116 |
mCurrentDuration[i] += step; |
| ... | ... | |
| 187 | 185 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 188 | 186 |
// wave |
| 189 | 187 |
|
| 190 |
synchronized long add(EffectNames eln, Data5D data, Data2D center, Data4D region)
|
|
| 188 |
synchronized long add(EffectNames eln, Data5D data, Data3D center, Data4D region)
|
|
| 191 | 189 |
{
|
| 192 | 190 |
if( mMax[INDEX]>mNumEffects ) |
| 193 | 191 |
{
|
| ... | ... | |
| 218 | 216 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 219 | 217 |
// deform,distort |
| 220 | 218 |
|
| 221 |
synchronized long add(EffectNames eln, Data3D data, Data2D center, Data4D region)
|
|
| 219 |
synchronized long add(EffectNames eln, Data3D data, Data3D center, Data4D region)
|
|
| 222 | 220 |
{
|
| 223 | 221 |
if( mMax[INDEX]>mNumEffects ) |
| 224 | 222 |
{
|
| ... | ... | |
| 247 | 245 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 248 | 246 |
// sink, swirl |
| 249 | 247 |
|
| 250 |
synchronized long add(EffectNames eln, Data1D data, Data2D center, Data4D region)
|
|
| 248 |
synchronized long add(EffectNames eln, Data1D data, Data3D center, Data4D region)
|
|
| 251 | 249 |
{
|
| 252 | 250 |
if( mMax[INDEX]>mNumEffects ) |
| 253 | 251 |
{
|
| ... | ... | |
| 272 | 270 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 273 | 271 |
// sink, swirl |
| 274 | 272 |
|
| 275 |
synchronized long add(EffectNames eln, Data1D data, Data2D center)
|
|
| 273 |
synchronized long add(EffectNames eln, Data1D data, Data3D center)
|
|
| 276 | 274 |
{
|
| 277 | 275 |
if( mMax[INDEX]>mNumEffects ) |
| 278 | 276 |
{
|
| ... | ... | |
| 296 | 294 |
|
| 297 | 295 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 298 | 296 |
|
| 299 |
private long addPriv(EffectNames eln, Data2D center, Data4D region)
|
|
| 297 |
private long addPriv(EffectNames eln, Data3D center, Data4D region)
|
|
| 300 | 298 |
{
|
| 301 | 299 |
if( region!=null ) |
| 302 | 300 |
{
|
| ... | ... | |
| 327 | 325 |
mInter[1][mNumEffects] = null; |
| 328 | 326 |
} |
| 329 | 327 |
|
| 330 |
if( center instanceof Dynamic2D)
|
|
| 328 |
if( center instanceof Dynamic3D)
|
|
| 331 | 329 |
{
|
| 332 |
mInter[2][mNumEffects] = (Dynamic2D)center;
|
|
| 330 |
mInter[2][mNumEffects] = (Dynamic3D)center;
|
|
| 333 | 331 |
} |
| 334 |
else if( center instanceof Static2D)
|
|
| 332 |
else if( center instanceof Static3D)
|
|
| 335 | 333 |
{
|
| 336 | 334 |
mInter[2][mNumEffects] = null; |
| 337 |
mUniforms[NUM_UNIFORMS*mNumEffects+6] = ((Static2D)center).getX()-mObjHalfX; |
|
| 338 |
mUniforms[NUM_UNIFORMS*mNumEffects+7] =-((Static2D)center).getY()+mObjHalfY; |
|
| 335 |
mUniforms[NUM_UNIFORMS*mNumEffects+5] = ((Static3D)center).getX()-mObjHalfX; |
|
| 336 |
mUniforms[NUM_UNIFORMS*mNumEffects+6] =-((Static3D)center).getY()+mObjHalfY; |
|
| 337 |
mUniforms[NUM_UNIFORMS*mNumEffects+7] = ((Static3D)center).getZ()-mObjHalfZ; |
|
| 339 | 338 |
} |
| 340 | 339 |
|
| 341 | 340 |
long ret= addBase(eln); |
Also available in: Unified diff
Complete moving center to 3D.