Revision a4835695
Added by Leszek Koltunski almost 8 years ago
| src/main/java/org/distorted/library/EffectQueueMatrix.java | ||
|---|---|---|
| 22 | 22 |
import android.opengl.GLES20; |
| 23 | 23 |
import android.opengl.Matrix; |
| 24 | 24 |
|
| 25 |
import org.distorted.library.type.Float3D; |
|
| 26 |
import org.distorted.library.type.Interpolator; |
|
| 27 |
import org.distorted.library.type.Interpolator1D; |
|
| 28 |
import org.distorted.library.type.Interpolator3D; |
|
| 29 |
|
|
| 25 | 30 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 26 | 31 |
|
| 27 | 32 |
class EffectQueueMatrix extends EffectQueue |
| ... | ... | |
| 276 | 281 |
mInterP[mNumEffects] = null; |
| 277 | 282 |
mInterI[mNumEffects] = i; |
| 278 | 283 |
|
| 279 |
mUniforms[NUM_UNIFORMS*mNumEffects ] = p.x;
|
|
| 280 |
mUniforms[NUM_UNIFORMS*mNumEffects+1] = p.y;
|
|
| 281 |
mUniforms[NUM_UNIFORMS*mNumEffects+2] = p.z;
|
|
| 284 |
mUniforms[NUM_UNIFORMS*mNumEffects ] = p.getX();
|
|
| 285 |
mUniforms[NUM_UNIFORMS*mNumEffects+1] = p.getY();
|
|
| 286 |
mUniforms[NUM_UNIFORMS*mNumEffects+2] = p.getZ();
|
|
| 282 | 287 |
|
| 283 | 288 |
return addBase(eln); |
| 284 | 289 |
} |
| ... | ... | |
| 295 | 300 |
mInterP[mNumEffects] = null; |
| 296 | 301 |
mInterI[mNumEffects] = i; |
| 297 | 302 |
|
| 298 |
mUniforms[NUM_UNIFORMS*mNumEffects ] = p.x;
|
|
| 299 |
mUniforms[NUM_UNIFORMS*mNumEffects+1] = p.y;
|
|
| 300 |
mUniforms[NUM_UNIFORMS*mNumEffects+2] = p.z;
|
|
| 303 |
mUniforms[NUM_UNIFORMS*mNumEffects ] = p.getX();
|
|
| 304 |
mUniforms[NUM_UNIFORMS*mNumEffects+1] = p.getY();
|
|
| 305 |
mUniforms[NUM_UNIFORMS*mNumEffects+2] = p.getZ();
|
|
| 301 | 306 |
|
| 302 | 307 |
mUniforms[NUM_UNIFORMS*mNumEffects+4] = aX; |
| 303 | 308 |
mUniforms[NUM_UNIFORMS*mNumEffects+5] = aY; |
| ... | ... | |
| 337 | 342 |
mInterP[mNumEffects] = null; |
| 338 | 343 |
mInterI[mNumEffects] = null; |
| 339 | 344 |
|
| 340 |
mUniforms[NUM_UNIFORMS*mNumEffects ] = p.x;
|
|
| 341 |
mUniforms[NUM_UNIFORMS*mNumEffects+1] = p.y;
|
|
| 342 |
mUniforms[NUM_UNIFORMS*mNumEffects+2] = p.z;
|
|
| 345 |
mUniforms[NUM_UNIFORMS*mNumEffects ] = p.getX();
|
|
| 346 |
mUniforms[NUM_UNIFORMS*mNumEffects+1] = p.getY();
|
|
| 347 |
mUniforms[NUM_UNIFORMS*mNumEffects+2] = p.getZ();
|
|
| 343 | 348 |
mUniforms[NUM_UNIFORMS*mNumEffects+3] = aA; |
| 344 | 349 |
mUniforms[NUM_UNIFORMS*mNumEffects+4] = aX; |
| 345 | 350 |
mUniforms[NUM_UNIFORMS*mNumEffects+5] = aY; |
Also available in: Unified diff
move data types, like FlatND and InterpolatorND, to a separate package.