Project

General

Profile

« Previous | Next » 

Revision c7b00dfb

Added by Leszek Koltunski almost 4 years ago

Introduce two-fingered object resize.

View differences:

src/main/java/org/distorted/objects/RubikObjectMovement.java
247 247 

  		




  248
  248
  
    
  public boolean faceTouched(Static4D rotatedTouchPoint, Static4D rotatedCamera)


  		




  249
  249
  
    
    {


  		




  250
  
  
    
    mPoint[0]  = rotatedTouchPoint.get0()/RubikObject.OBJECT_SCREEN_RATIO;


  		




  251
  
  
    
    mPoint[1]  = rotatedTouchPoint.get1()/RubikObject.OBJECT_SCREEN_RATIO;


  		




  252
  
  
    
    mPoint[2]  = rotatedTouchPoint.get2()/RubikObject.OBJECT_SCREEN_RATIO;


  		




  
  250
  
    
    float objectRatio = RubikObject.getObjectRatio();


  		




  253
  251
  
    

  		




  254
  
  
    
    mCamera[0] = rotatedCamera.get0()/RubikObject.OBJECT_SCREEN_RATIO;


  		




  255
  
  
    
    mCamera[1] = rotatedCamera.get1()/RubikObject.OBJECT_SCREEN_RATIO;


  		




  256
  
  
    
    mCamera[2] = rotatedCamera.get2()/RubikObject.OBJECT_SCREEN_RATIO;


  		




  
  252
  
    
    mPoint[0]  = rotatedTouchPoint.get0()/objectRatio;


  		




  
  253
  
    
    mPoint[1]  = rotatedTouchPoint.get1()/objectRatio;


  		




  
  254
  
    
    mPoint[2]  = rotatedTouchPoint.get2()/objectRatio;


  		




  
  255
  
    

  		




  
  256
  
    
    mCamera[0] = rotatedCamera.get0()/objectRatio;


  		




  
  257
  
    
    mCamera[1] = rotatedCamera.get1()/objectRatio;


  		




  
  258
  
    
    mCamera[2] = rotatedCamera.get2()/objectRatio;


  		




  257
  259
  
    

  		




  258
  260
  
    
    for( mLastTouchedAxis=0; mLastTouchedAxis<mNumAxis; mLastTouchedAxis++)


  		




  259
  261
  
    
      {


  		




  ......




  276
  278
  
    

  		




  277
  279
  
    
  public Static2D newRotation(Static4D rotatedTouchPoint)


  		




  278
  280
  
    
    {


  		




  279
  
  
    
    mPoint[0] = rotatedTouchPoint.get0()/RubikObject.OBJECT_SCREEN_RATIO;


  		




  280
  
  
    
    mPoint[1] = rotatedTouchPoint.get1()/RubikObject.OBJECT_SCREEN_RATIO;


  		




  281
  
  
    
    mPoint[2] = rotatedTouchPoint.get2()/RubikObject.OBJECT_SCREEN_RATIO;


  		




  
  281
  
    
    float objectRatio = RubikObject.getObjectRatio();


  		




  
  282
  
    

  		




  
  283
  
    
    mPoint[0] = rotatedTouchPoint.get0()/objectRatio;


  		




  
  284
  
    
    mPoint[1] = rotatedTouchPoint.get1()/objectRatio;


  		




  
  285
  
    
    mPoint[2] = rotatedTouchPoint.get2()/objectRatio;


  		




  282
  286
  
    

  		




  283
  287
  
    
    castTouchPointOntoFace(mAxis[mLastTouchedAxis], mLastTouchedLR, mTouch);


  		




  284
  288
  
    
    convertTo2Dcoords(mTouch, mAxis[mLastTouchedAxis], mLastTouchedLR, mMove2D);


  		












Also available in:  Unified diff