Project

General

Profile

« Previous | Next » 

Revision e0a16874

Added by Leszek Koltunski almost 8 years ago

cleanup in DistortedObject's methods.

View differences:

src/main/java/org/distorted/library/EffectQueueFragment.java
179 179
  
180 180
///////////////////////////////////////////////////////////////////////////////////////////////////
181 181

  
182
  synchronized long add(EffectNames eln, Interpolator inter, Float4D region, float x, float y)
182
  synchronized long add(EffectNames eln, Interpolator inter, Float4D region, Float2D point)
183 183
    {
184 184
    if( mMax[INDEX]>mNumEffects )
185 185
      {
186 186
      EffectNames.fillWithUnities(eln.ordinal(), mUniforms, NUM_UNIFORMS*mNumEffects);    
187 187
      mInterI[mNumEffects] = inter;
188 188
      mInterP[mNumEffects] = null;
189
      mBuf[4*mNumEffects  ] = x;
190
      mBuf[4*mNumEffects+1] = y;
189
      mBuf[4*mNumEffects  ] = point.x;
190
      mBuf[4*mNumEffects+1] = point.y;
191 191
      mBuf[4*mNumEffects+2] = (region==null || region.z<=0.0f) ? 1000*mObjHalfX : region.z;
192 192
      mBuf[4*mNumEffects+3] = (region==null || region.w<=0.0f) ? 1000*mObjHalfY : region.w;
193 193
   
......
220 220
  
221 221
///////////////////////////////////////////////////////////////////////////////////////////////////
222 222

  
223
  synchronized long add(EffectNames eln, Interpolator1D inter, Float3D c, Float4D region, float x, float y)
223
  synchronized long add(EffectNames eln, Interpolator1D inter, Float3D c, Float4D region, Float2D point)
224 224
    {
225 225
    if( mMax[INDEX]>mNumEffects )
226 226
      {
227 227
      mInterI[mNumEffects] = inter;
228 228
      mInterP[mNumEffects] = null;
229
      mBuf[4*mNumEffects  ] = x;
230
      mBuf[4*mNumEffects+1] = y;
229
      mBuf[4*mNumEffects  ] = point.x;
230
      mBuf[4*mNumEffects+1] = point.y;
231 231
      mBuf[4*mNumEffects+2] = (region==null || region.z<=0.0f) ? 1000*mObjHalfX : region.z;
232 232
      mBuf[4*mNumEffects+3] = (region==null || region.w<=0.0f) ? 1000*mObjHalfY : region.w;
233 233
      
......
265 265
  
266 266
///////////////////////////////////////////////////////////////////////////////////////////////////
267 267

  
268
  synchronized long add(EffectNames eln, float t, Float3D c, Float4D region, float x, float y)
268
  synchronized long add(EffectNames eln, float t, Float3D c, Float4D region, Float2D point)
269 269
    {
270 270
    if( mMax[INDEX]>mNumEffects )
271 271
      {
272 272
      mInterI[mNumEffects] = null;
273 273
      mInterP[mNumEffects] = null;
274
      mBuf[4*mNumEffects  ] = x;
275
      mBuf[4*mNumEffects+1] = y;
274
      mBuf[4*mNumEffects  ] = point.x;
275
      mBuf[4*mNumEffects+1] = point.y;
276 276
      mBuf[4*mNumEffects+2] = (region==null || region.z<=0.0f) ? 1000*mObjHalfX : region.z;
277 277
      mBuf[4*mNumEffects+3] = (region==null || region.w<=0.0f) ? 1000*mObjHalfY : region.w;
278 278
      

Also available in: Unified diff