Revision a4835695
Added by Leszek Koltunski almost 8 years ago
| src/main/java/org/distorted/library/EffectQueueVertex.java | ||
|---|---|---|
| 21 | 21 |
|
| 22 | 22 |
import android.opengl.GLES20; |
| 23 | 23 |
|
| 24 |
import org.distorted.library.type.Float2D; |
|
| 25 |
import org.distorted.library.type.Float4D; |
|
| 26 |
import org.distorted.library.type.Interpolator; |
|
| 27 |
import org.distorted.library.type.Interpolator2D; |
|
| 28 |
|
|
| 24 | 29 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 25 | 30 |
|
| 26 | 31 |
class EffectQueueVertex extends EffectQueue |
| ... | ... | |
| 173 | 178 |
|
| 174 | 179 |
mInterI[mNumEffects] = inter; |
| 175 | 180 |
mInterP[mNumEffects] = null; |
| 176 |
mUniforms[NUM_UNIFORMS*mNumEffects+7] = point.x-mObjHalfX;
|
|
| 177 |
mUniforms[NUM_UNIFORMS*mNumEffects+8] =-point.y+mObjHalfY;
|
|
| 181 |
mUniforms[NUM_UNIFORMS*mNumEffects+7] = point.getX()-mObjHalfX;
|
|
| 182 |
mUniforms[NUM_UNIFORMS*mNumEffects+8] =-point.getY()+mObjHalfY;
|
|
| 178 | 183 |
|
| 179 | 184 |
return addPriv(eln,region); |
| 180 | 185 |
} |
| ... | ... | |
| 195 | 200 |
|
| 196 | 201 |
mInterI[mNumEffects] = null; |
| 197 | 202 |
mInterP[mNumEffects] = null; |
| 198 |
mUniforms[NUM_UNIFORMS*mNumEffects+7] = point.x-mObjHalfX;
|
|
| 199 |
mUniforms[NUM_UNIFORMS*mNumEffects+8] =-point.y+mObjHalfY;
|
|
| 203 |
mUniforms[NUM_UNIFORMS*mNumEffects+7] = point.getX()-mObjHalfX;
|
|
| 204 |
mUniforms[NUM_UNIFORMS*mNumEffects+8] =-point.getY()+mObjHalfY;
|
|
| 200 | 205 |
|
| 201 | 206 |
return addPriv(eln,region); |
| 202 | 207 |
} |
| ... | ... | |
| 210 | 215 |
{
|
| 211 | 216 |
if( region!=null ) |
| 212 | 217 |
{
|
| 213 |
mUniforms[NUM_UNIFORMS*mNumEffects+3] = region.x; |
|
| 214 |
mUniforms[NUM_UNIFORMS*mNumEffects+4] =-region.y; // invert y already |
|
| 215 |
mUniforms[NUM_UNIFORMS*mNumEffects+5] = region.z<=0.0f ? 1000*mObjHalfX : region.z; |
|
| 216 |
mUniforms[NUM_UNIFORMS*mNumEffects+6] = region.w; |
|
| 218 |
float z = region.getZ(); |
|
| 219 |
|
|
| 220 |
mUniforms[NUM_UNIFORMS*mNumEffects+3] = region.getX(); |
|
| 221 |
mUniforms[NUM_UNIFORMS*mNumEffects+4] =-region.getY(); // invert y already |
|
| 222 |
mUniforms[NUM_UNIFORMS*mNumEffects+5] = z<=0.0f ? 1000*mObjHalfX : z; |
|
| 223 |
mUniforms[NUM_UNIFORMS*mNumEffects+6] = region.getW(); |
|
| 217 | 224 |
} |
| 218 | 225 |
else |
| 219 | 226 |
{
|
Also available in: Unified diff
move data types, like FlatND and InterpolatorND, to a separate package.