Project

General

Profile

« Previous | Next » 

Revision 5618c5a9

Added by Leszek Koltunski over 1 year ago

separate the 'isSolved' part from TwistyObject

View differences:

src/main/java/org/distorted/objectlib/json/JsonReader.java
26 26 
import org.distorted.objectlib.helpers.ObjectSignature;
27 27 
import org.distorted.objectlib.helpers.ObjectStickerOverride;
28 28 
import org.distorted.objectlib.helpers.ObjectVertexEffects;
29 
import org.distorted.objectlib.main.Cubit;
29 
import org.distorted.objectlib.main.TwistyObjectCubit;
30 30 
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator;
31 31 
import org.json.JSONArray;
32 32 
import org.json.JSONException;
......
174 174 
      mCubitFaceColor[i] = new int[numColor];
175 175 
      for(int j=0; j<numColor; j++) mCubitFaceColor[i][j] = jsonColor.getInt(j);
176 176 

  		




  177
  
  
    
      mCubitType[i] = jsonCubit.optInt("type", Cubit.TYPE_NORMAL);


  		




  
  177
  
    
      mCubitType[i] = jsonCubit.optInt("type", TwistyObjectCubit.TYPE_NORMAL);


  		




  178
  178
  
    
      float xoff = (float)jsonCubit.optDouble("offsetX", 0 );


  		




  179
  179
  
    
      float yoff = (float)jsonCubit.optDouble("offsetY", 0 );


  		




  180
  180
  
    
      float zoff = (float)jsonCubit.optDouble("offsetZ", 0 );


  		












Also available in:  Unified diff