Revision 5a4d4fba
Added by Leszek Koltunski almost 4 years ago
| src/main/java/org/distorted/main/RubikActivity.java | ||
|---|---|---|
| 107 | 107 |
if( sizeIndex>=0 && sizeIndex<sizes.length ) |
| 108 | 108 |
{
|
| 109 | 109 |
success = true; |
| 110 |
view.getPostRender().changeObject(obj,size);
|
|
| 110 |
view.getPreRender().changeObject(obj,size);
|
|
| 111 | 111 |
} |
| 112 | 112 |
|
| 113 | 113 |
} |
| ... | ... | |
| 118 | 118 |
int s = RubikStatePlay.DEF_SIZE; |
| 119 | 119 |
|
| 120 | 120 |
play.setObjectAndSize(this,obj,s); |
| 121 |
view.getPostRender().changeObject(obj,s);
|
|
| 121 |
view.getPreRender().changeObject(obj,s);
|
|
| 122 | 122 |
} |
| 123 | 123 |
} |
| 124 | 124 |
|
| ... | ... | |
| 150 | 150 |
|
| 151 | 151 |
RubikState.savePreferences(editor); |
| 152 | 152 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 153 |
view.getPostRender().savePreferences(editor);
|
|
| 153 |
view.getPreRender().savePreferences(editor);
|
|
| 154 | 154 |
|
| 155 | 155 |
editor.apply(); |
| 156 | 156 |
} |
| ... | ... | |
| 174 | 174 |
RubikState.restorePreferences(preferences); |
| 175 | 175 |
|
| 176 | 176 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 177 |
view.getPostRender().restorePreferences(preferences);
|
|
| 177 |
view.getPreRender().restorePreferences(preferences);
|
|
| 178 | 178 |
} |
| 179 | 179 |
|
| 180 | 180 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 203 | 203 |
public RubikObject getObject() |
| 204 | 204 |
{
|
| 205 | 205 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 206 |
RubikPostRender post = view.getPostRender();
|
|
| 207 |
return post.getObject();
|
|
| 206 |
RubikPreRender pre = view.getPreRender();
|
|
| 207 |
return pre.getObject();
|
|
| 208 | 208 |
} |
| 209 | 209 |
|
| 210 | 210 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 211 | 211 |
|
| 212 |
public RubikPostRender getPostRender()
|
|
| 212 |
public RubikPreRender getPreRender()
|
|
| 213 | 213 |
{
|
| 214 | 214 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 215 |
return view.getPostRender();
|
|
| 215 |
return view.getPreRender();
|
|
| 216 | 216 |
} |
| 217 | 217 |
|
| 218 | 218 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 220 | 220 |
public void changeObject(RubikObjectList object, int size) |
| 221 | 221 |
{
|
| 222 | 222 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 223 |
RubikPostRender post = view.getPostRender();
|
|
| 224 |
post.changeObject(object,size);
|
|
| 223 |
RubikPreRender pre = view.getPreRender();
|
|
| 224 |
pre.changeObject(object,size);
|
|
| 225 | 225 |
} |
| 226 | 226 |
|
| 227 | 227 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 229 | 229 |
public void setupObject(RubikObjectList object, int size, int[][] moves) |
| 230 | 230 |
{
|
| 231 | 231 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 232 |
RubikPostRender post = view.getPostRender();
|
|
| 233 |
post.setupObject(object,size,moves);
|
|
| 232 |
RubikPreRender pre = view.getPreRender();
|
|
| 233 |
pre.setupObject(object,size,moves);
|
|
| 234 | 234 |
} |
| 235 | 235 |
|
| 236 | 236 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Convert the PostRender to a PreRender, called before we render.
This makes more sense as this way things are prepared for the very first render.