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/TwistyObject.java
51 51 
import org.distorted.objectlib.helpers.ObjectSticker;
52 52 
import org.distorted.objectlib.helpers.ScrambleState;
53 53 
import org.distorted.objectlib.json.JsonReader;
54 
import org.distorted.objectlib.movement.Movement;
55 
import org.distorted.objectlib.movement.MovementCuboids;
56 
import org.distorted.objectlib.movement.MovementDodecahedron;
57 
import org.distorted.objectlib.movement.MovementHexahedron;
58 
import org.distorted.objectlib.movement.MovementOctahedron;
59 
import org.distorted.objectlib.movement.MovementTetrahedron;
54 60 

  		




  55
  61
  
    
import java.io.DataInputStream;


  		




  56
  62
  
    
import java.io.IOException;


  		




  57
  63
  
    
import java.io.InputStream;


  		




  58
  64
  
    
import java.util.Random;


  		




  59
  65
  
    

  		




  60
  
  
    
import static org.distorted.objectlib.main.Movement.MOVEMENT_TETRAHEDRON;


  		




  61
  
  
    
import static org.distorted.objectlib.main.Movement.MOVEMENT_HEXAHEDRON;


  		




  62
  
  
    
import static org.distorted.objectlib.main.Movement.MOVEMENT_OCTAHEDRON;


  		




  63
  
  
    
import static org.distorted.objectlib.main.Movement.MOVEMENT_DODECAHEDRON;


  		




  64
  
  
    
import static org.distorted.objectlib.main.Movement.MOVEMENT_SHAPECHANGE;


  		




  
  66
  
    
import static org.distorted.objectlib.movement.Movement.MOVEMENT_TETRAHEDRON;


  		




  
  67
  
    
import static org.distorted.objectlib.movement.Movement.MOVEMENT_HEXAHEDRON;


  		




  
  68
  
    
import static org.distorted.objectlib.movement.Movement.MOVEMENT_OCTAHEDRON;


  		




  
  69
  
    
import static org.distorted.objectlib.movement.Movement.MOVEMENT_DODECAHEDRON;


  		




  
  70
  
    
import static org.distorted.objectlib.movement.Movement.MOVEMENT_SHAPECHANGE;


  		




  65
  71
  
    

  		




  66
  72
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  67
  73
  
    

  		




  ......




  1129
  1135
  
    
    mObjectScreenRatio = sc;


  		




  1130
  1136
  
    
    float scale = mObjectScreenRatio*mInitScreenRatio*nodeSize/mSize;


  		




  1131
  1137
  
    
    mObjectScale.set(scale,scale,scale);


  		




  
  1138
  
    

  		




  
  1139
  
    
    if( mMovement==null ) mMovement = getMovement();


  		




  
  1140
  
    
    mMovement.setObjectRatio(mObjectScreenRatio*mInitScreenRatio);


  		




  1132
  1141
  
    
    }


  		




  1133
  1142
  
    

  		




  1134
  1143
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  ......




  1150
  1159
  
    
    setObjectRatioNow(mObjectScreenRatio, nodeSize);


  		




  1151
  1160
  
    
    }


  		




  1152
  1161
  
    

  		




  1153
  
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  1154
  
  
    

  		




  1155
  
  
    
  float getObjectRatio()


  		




  1156
  
  
    
    {


  		




  1157
  
  
    
    return mObjectScreenRatio*mInitScreenRatio;


  		




  1158
  
  
    
    }


  		




  1159
  
  
    

  		




  1160
  1162
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  1161
  1163
  
    

  		




  1162
  1164
  
    
  public float getRatio()


  		












Also available in:  Unified diff