Project

General

Profile

« Previous | Next » 

Revision 23afe4c4

Added by Leszek Koltunski over 2 years ago

Move the Movement to its own package; abstract out some stuff.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectControl.java
33 33 
import org.distorted.objectlib.helpers.BlockController;
34 34 
import org.distorted.objectlib.helpers.MovesFinished;
35 35 
import org.distorted.objectlib.helpers.ObjectLibInterface;
36 
import org.distorted.objectlib.movement.Movement;
36 37 

  		




  37
  38
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  38
  39
  
    

  		




  ......




  219
  220
  
    
        Static4D rotatedTouchPoint= QuatHelper.rotateVectorByInvertedQuat(touchPoint, mQuat);


  		




  220
  221
  
    
        Static4D rotatedCamera= QuatHelper.rotateVectorByInvertedQuat(CAMERA_POINT, mQuat);


  		




  221
  222
  
    

  		




  222
  
  
    
        if( object!=null && mMovement!=null && mMovement.faceTouched(rotatedTouchPoint,rotatedCamera,object.getObjectRatio() ) )


  		




  
  223
  
    
        if( object!=null && mMovement!=null && mMovement.faceTouched(rotatedTouchPoint,rotatedCamera) )


  		




  223
  224
  
    
          {


  		




  224
  225
  
    
          mDragging           = false;


  		




  225
  226
  
    
          mContinuingRotation = false;


  		




  ......




  338
  339
  
    

  		




  339
  340
  
    
      Static4D touchPoint = new Static4D(x, y, 0, 0);


  		




  340
  341
  
    
      Static4D rotatedTouchPoint= QuatHelper.rotateVectorByInvertedQuat(touchPoint, mQuat);


  		




  341
  
  
    
      Static2D res = mMovement.newRotation(rotatedTouchPoint,object.getObjectRatio());


  		




  
  342
  
    
      Static2D res = mMovement.newRotation(rotatedTouchPoint);


  		




  342
  343
  
    

  		




  343
  344
  
    
      mCurrentAxis = (int)res.get0();


  		




  344
  345
  
    
      mCurrentRow  = (int)res.get1();


  		












Also available in:  Unified diff