Project

General

Profile

« Previous | Next » 

Revision 9c2f0c91

Added by Leszek Koltunski over 3 years ago

Rename some classes.

View differences:

src/main/java/org/distorted/main/RubikSurfaceView.java
32 32

  
33 33
import org.distorted.library.type.Static2D;
34 34
import org.distorted.library.type.Static4D;
35
import org.distorted.objects.RubikObject;
35
import org.distorted.objects.TwistyObject;
36 36
import org.distorted.objects.Movement;
37 37
import org.distorted.solvers.SolverMain;
38 38
import org.distorted.states.RubikState;
......
328 328
              mLastCubitFace = mMovement.getTouchedFace();
329 329
              float[] point = mMovement.getTouchedPoint3D();
330 330
              int color = solver.getCurrentColor();
331
              RubikObject object = mPreRender.getObject();
331
              TwistyObject object = mPreRender.getObject();
332 332
              mLastCubit = object.getCubit(point);
333 333
              mPreRender.setTextureMap( mLastCubit, mLastCubitFace, color );
334 334
              mLastCubitColor = SolverMain.cubitIsLocked(object.getObjectList(), object.getSize(), mLastCubit);
......
389 389
        float distQuot = mInitDistance<0 ? 1.0f : distNow/ mInitDistance;
390 390
        mInitDistance = distNow;
391 391

  
392
        RubikObject object = mPreRender.getObject();
392
        TwistyObject object = mPreRender.getObject();
393 393
        if( object!=null ) object.setObjectRatio(distQuot);
394 394
        }
395 395
      else
......
463 463
      Static4D rotatedTouchPoint2= rotateVectorByInvertedQuat(touchPoint2, mQuat);
464 464

  
465 465
      Static2D res = mMovement.newRotation(rotatedTouchPoint2);
466
      RubikObject object = mPreRender.getObject();
466
      TwistyObject object = mPreRender.getObject();
467 467

  
468 468
      mCurrentAxis = (int)res.get0();
469 469
      float offset = res.get1();

Also available in: Unified diff