Project

General

Profile

« Previous | Next » 

Revision e3eab072

Added by Leszek Koltunski almost 7 years ago

Simplify Statics.

View differences:

src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java
249 249

  
250 250
    if( mSta1 !=null )
251 251
      {
252
      float f1 = ((int)(mSta1.getX()*100))/100.0f;
252
      float f1 = ((int)(mSta1.get1()*100))/100.0f;
253 253
      text += " "+f1;
254 254
      }
255 255

  
256 256
    if( mSta2 !=null )
257 257
      {
258
      float f1 = ((int)(mSta2.getX()*100))/100.0f;
259
      float f2 = ((int)(mSta2.getY()*100))/100.0f;
258
      float f1 = ((int)(mSta2.get1()*100))/100.0f;
259
      float f2 = ((int)(mSta2.get2()*100))/100.0f;
260 260
      text += " ("+f1+","+f2+")";
261 261
      }
262 262

  
263 263
    if( mSta3 !=null )
264 264
      {
265
      float f1 = ((int)(mSta3.getX()*100))/100.0f;
266
      float f2 = ((int)(mSta3.getY()*100))/100.0f;
267
      float f3 = ((int)(mSta3.getZ()*100))/100.0f;
265
      float f1 = ((int)(mSta3.get1()*100))/100.0f;
266
      float f2 = ((int)(mSta3.get2()*100))/100.0f;
267
      float f3 = ((int)(mSta3.get3()*100))/100.0f;
268 268
      text += " ("+f1+","+f2+","+f3+")";
269 269
      }
270 270

  
271 271
    if( mSta4 !=null )
272 272
      {
273
      float f1 = ((int)(mSta4.getX()*100))/100.0f;
274
      float f2 = ((int)(mSta4.getY()*100))/100.0f;
275
      float f3 = ((int)(mSta4.getZ()*100))/100.0f;
276
      float f4 = ((int)(mSta4.getW()*100))/100.0f;
273
      float f1 = ((int)(mSta4.get1()*100))/100.0f;
274
      float f2 = ((int)(mSta4.get2()*100))/100.0f;
275
      float f3 = ((int)(mSta4.get3()*100))/100.0f;
276
      float f4 = ((int)(mSta4.get4()*100))/100.0f;
277 277
      text += " ("+f1+","+f2+","+f3+","+f4+")";
278 278
      }
279 279

  
280 280
    if( mSta5 !=null )
281 281
      {
282
      float f1 = ((int)(mSta5.getX()*100))/100.0f;
283
      float f2 = ((int)(mSta5.getY()*100))/100.0f;
284
      float f3 = ((int)(mSta5.getZ()*100))/100.0f;
285
      float f4 = ((int)(mSta5.getW()*100))/100.0f;
286
      float f5 = ((int)(mSta5.getV()*100))/100.0f;
282
      float f1 = ((int)(mSta5.get1()*100))/100.0f;
283
      float f2 = ((int)(mSta5.get2()*100))/100.0f;
284
      float f3 = ((int)(mSta5.get3()*100))/100.0f;
285
      float f4 = ((int)(mSta5.get4()*100))/100.0f;
286
      float f5 = ((int)(mSta5.get5()*100))/100.0f;
287 287
      text += " ("+f1+","+f2+","+f3+","+f4+","+f5+")";
288 288
      }
289 289

  
......
316 316

  
317 317
  private void setCenterText()
318 318
    {
319
    int f0 = (int)mCenterSta.getX();
320
    int f1 = (int)mCenterSta.getY();
321
    int f2 = (int)mCenterSta.getZ();
319
    int f0 = (int)mCenterSta.get1();
320
    int f1 = (int)mCenterSta.get2();
321
    int f2 = (int)mCenterSta.get3();
322 322

  
323 323
    mTextCenter.setText("center ("+f0+","+f1+","+f2+")");
324 324
    }
......
356 356

  
357 357
  private void setRegionText()
358 358
    {
359
    int f0 = (int)mRegionSta.getX();
360
    int f1 = (int)mRegionSta.getY();
361
    int f2 = (int)mRegionSta.getZ();
362
    int f3 = (int)mRegionSta.getW();
359
    int f0 = (int)mRegionSta.get1();
360
    int f1 = (int)mRegionSta.get2();
361
    int f2 = (int)mRegionSta.get3();
362
    int f3 = (int)mRegionSta.get4();
363 363

  
364 364
    mTextRegion.setText("region ("+f0+","+f1+","+f2+","+f3+")");
365 365
    }
......
550 550
      seek[i].setProgress( mInterRegion[i] );
551 551
      }
552 552

  
553
    act.setRegion(mRegionSta.getX(),mRegionSta.getY(),mRegionSta.getZ());
553
    act.setRegion(mRegionSta.get1(),mRegionSta.get2(),mRegionSta.get3());
554 554

  
555 555
    return mRegion;
556 556
    }
......
583 583
      seek[i].setProgress( mInterCenter[i] );
584 584
      }
585 585

  
586
    act.setCenter(mCenterSta.getX(),mCenterSta.getY(),mCenterSta.getZ());
586
    act.setCenter(mCenterSta.get1(),mCenterSta.get2(),mCenterSta.get3());
587 587

  
588 588
    return mCenter;
589 589
    }
......
674 674

  
675 675
      Matrix3DActivity act = mAct.get();
676 676

  
677
      act.setCenter(mCenterSta.getX(),mCenterSta.getY(),mCenterSta.getZ());
678
      act.setRegion(mRegionSta.getX(),mRegionSta.getY(),mRegionSta.getZ());
677
      act.setCenter(mCenterSta.get1(),mCenterSta.get2(),mCenterSta.get3());
678
      act.setRegion(mRegionSta.get1(),mRegionSta.get2(),mRegionSta.get3());
679 679
      }
680 680
    }
681 681

  

Also available in: Unified diff