Project

General

Profile

« Previous | Next » 

Revision 09cf2a36

Added by Leszek Koltunski over 2 years ago

Introduce 'Simple' and 'Nice' meshes.

View differences:

src/main/java/org/distorted/tutorials/TutorialActivity.java
42 42

  
43 43
import org.distorted.main.R;
44 44
import org.distorted.dialogs.RubikDialogError;
45
import org.distorted.objects.RubikObject;
45 46
import org.distorted.objects.RubikObjectList;
46 47

  
48
import static org.distorted.objectlib.main.TwistyObject.MESH_NICE;
49

  
47 50
///////////////////////////////////////////////////////////////////////////////////////////////////
48 51

  
49 52
public class TutorialActivity extends AppCompatActivity
......
222 225

  
223 226
///////////////////////////////////////////////////////////////////////////////////////////////////
224 227

  
225
    private void changeIfDifferent(int objectOrdinal,ObjectControl control)
228
    private void changeIfDifferent(int ordinal,ObjectControl control)
226 229
      {
227
      InputStream jsonStream = ObjectJson.getStream(this,objectOrdinal);
228
      InputStream meshStream = ObjectMesh.getStream(this,objectOrdinal);
229
      control.changeIfDifferent(objectOrdinal,jsonStream,meshStream);
230
      RubikObject object = RubikObjectList.getObject(ordinal);
231
      int meshState = object!=null ? object.getMeshState() : MESH_NICE;
232

  
233
      InputStream jsonStream = ObjectJson.getStream(this,ordinal);
234
      InputStream meshStream = ObjectMesh.getStream(this,ordinal);
235
      control.changeIfDifferent(ordinal,meshState,jsonStream,meshStream);
230 236
      }
231 237

  
232 238
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff