Revision 337f4660
Added by Leszek Koltunski 8 months ago
src/main/java/org/distorted/main_old/RubikActivity.java | ||
---|---|---|
58 | 58 |
import org.distorted.screens.RubikScreenPlay; |
59 | 59 |
import org.distorted.tutorials.TutorialActivity; |
60 | 60 |
|
61 |
import static org.distorted.objectlib.main.TwistyObject.MESH_NICE; |
|
62 |
|
|
63 | 61 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
64 | 62 |
|
65 | 63 |
public class RubikActivity extends AppCompatActivity |
... | ... | |
264 | 262 |
RubikScores scores = RubikScores.getInstance(); |
265 | 263 |
scores.incrementNumRuns(); |
266 | 264 |
scores.setCountry(this); |
267 |
RubikObjectList.restoreMeshState(preferences); |
|
265 |
//RubikObjectList.restoreMeshState(preferences);
|
|
268 | 266 |
} |
269 | 267 |
|
270 | 268 |
int object = RubikObjectList.getCurrObject(); |
... | ... | |
325 | 323 |
} |
326 | 324 |
|
327 | 325 |
RubikObjectList.savePreferences(editor); |
328 |
RubikObjectList.saveMeshState(editor); |
|
326 |
//RubikObjectList.saveMeshState(editor);
|
|
329 | 327 |
ScreenList.savePreferences(editor); |
330 | 328 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
331 | 329 |
OSInterface os = view.getInterface(); |
... | ... | |
573 | 571 |
public void changeIfDifferent(int ordinal, ObjectControl control) |
574 | 572 |
{ |
575 | 573 |
RubikObject object = RubikObjectList.getObject(ordinal); |
576 |
int meshState = object!=null ? object.getMeshState() : MESH_NICE; |
|
574 |
//int meshState = object!=null ? object.getMeshState() : MESH_NICE;
|
|
577 | 575 |
int iconMode = TwistyObject.MODE_NORM; |
578 | 576 |
InputStream jsonStream = object==null ? null : object.getObjectStream(this); |
579 | 577 |
InputStream meshStream = object==null ? null : object.getMeshStream(this); |
... | ... | |
582 | 580 |
OSInterface os = view.getInterface(); |
583 | 581 |
InitAssets asset = new InitAssets(jsonStream,meshStream,os); |
584 | 582 |
|
585 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,asset);
|
|
583 |
control.changeIfDifferent(ordinal,name,iconMode,asset); |
|
586 | 584 |
} |
587 | 585 |
|
588 | 586 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
635 | 633 |
|
636 | 634 |
if( object!=null ) |
637 | 635 |
{ |
638 |
int meshState = object.getMeshState(); |
|
639 | 636 |
int iconMode = TwistyObject.MODE_NORM; |
640 | 637 |
InputStream jsonStream = object.getObjectStream(this); |
641 | 638 |
InputStream meshStream = object.getMeshStream(this); |
... | ... | |
643 | 640 |
OSInterface os = view.getInterface(); |
644 | 641 |
InitAssets asset = new InitAssets(jsonStream,meshStream,os); |
645 | 642 |
ObjectControl control = getControl(); |
646 |
control.changeObject(-1,meshState,iconMode,asset);
|
|
643 |
control.changeObject(-1,iconMode,asset); |
|
647 | 644 |
} |
648 | 645 |
} |
649 | 646 |
} |
Also available in: Unified diff
remove 'MESH_NICE'