Revision 8becce57
Added by Leszek Koltunski about 4 years ago
| src/main/java/org/distorted/magic/RubikActivity.java | ||
|---|---|---|
| 102 | 102 |
if( sizeIndex>=0 && sizeIndex<sizes.length ) |
| 103 | 103 |
{
|
| 104 | 104 |
success = true; |
| 105 |
view.getRenderer().changeObject( obj, size, null );
|
|
| 105 |
view.getPostRender().changeObject( obj, size, null );
|
|
| 106 | 106 |
} |
| 107 | 107 |
|
| 108 | 108 |
} |
| ... | ... | |
| 113 | 113 |
int s = RubikStatePlay.DEF_SIZE; |
| 114 | 114 |
|
| 115 | 115 |
play.setObjectAndSize(obj,s); |
| 116 |
view.getRenderer().changeObject(obj,s, null);
|
|
| 116 |
view.getPostRender().changeObject(obj,s, null);
|
|
| 117 | 117 |
} |
| 118 | 118 |
} |
| 119 | 119 |
|
| ... | ... | |
| 145 | 145 |
|
| 146 | 146 |
RubikState.savePreferences(editor); |
| 147 | 147 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 148 |
view.getRenderer().savePreferences(editor);
|
|
| 148 |
view.getPostRender().savePreferences(editor);
|
|
| 149 | 149 |
|
| 150 | 150 |
editor.apply(); |
| 151 | 151 |
} |
| ... | ... | |
| 169 | 169 |
RubikState.restorePreferences(preferences); |
| 170 | 170 |
|
| 171 | 171 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 172 |
view.getRenderer().restorePreferences(preferences);
|
|
| 172 |
view.getPostRender().restorePreferences(preferences);
|
|
| 173 | 173 |
} |
| 174 | 174 |
|
| 175 | 175 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 179 | 179 |
public RubikObject getObject() |
| 180 | 180 |
{
|
| 181 | 181 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 182 |
RubikRenderer renderer = view.getRenderer(); |
|
| 183 |
return renderer.getObject(); |
|
| 182 |
RubikPostRender post = view.getPostRender(); |
|
| 183 |
return post.getObject(); |
|
| 184 |
} |
|
| 185 |
|
|
| 186 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 187 |
|
|
| 188 |
public RubikPostRender getPostRender() |
|
| 189 |
{
|
|
| 190 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
|
| 191 |
return view.getPostRender(); |
|
| 184 | 192 |
} |
| 185 | 193 |
|
| 186 | 194 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 188 | 196 |
public void changeObject(RubikObjectList object, int size, String moves) |
| 189 | 197 |
{
|
| 190 | 198 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 191 |
RubikRenderer renderer = view.getRenderer();
|
|
| 199 |
RubikPostRender post = view.getPostRender();
|
|
| 192 | 200 |
|
| 193 |
if( renderer.canDrag() )
|
|
| 201 |
if( post.canDrag() )
|
|
| 194 | 202 |
{
|
| 195 |
renderer.changeObject(object,size,moves);
|
|
| 203 |
post.changeObject(object,size,moves);
|
|
| 196 | 204 |
} |
| 197 | 205 |
} |
| 198 | 206 |
|
| ... | ... | |
| 266 | 274 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 267 | 275 |
RubikStatePlay play = (RubikStatePlay)RubikState.PLAY.getStateClass(); |
| 268 | 276 |
int scramble = play.getPicker(); |
| 269 |
view.getRenderer().scrambleObject(scramble);
|
|
| 277 |
view.getPostRender().scrambleObject(scramble);
|
|
| 270 | 278 |
} |
| 271 | 279 |
|
| 272 | 280 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 274 | 282 |
public void Solve(View v) |
| 275 | 283 |
{
|
| 276 | 284 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 277 |
view.getRenderer().solveObject();
|
|
| 285 |
view.getPostRender().solveObject();
|
|
| 278 | 286 |
} |
| 279 | 287 |
} |
Also available in: Unified diff
Major progress with Prretty Patterns - hopefully only initializing the Object remains!