Revision eaf46415
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/screens/RubikScreenSolution.java | ||
|---|---|---|
| 34 | 34 |
import org.distorted.helpers.TransparentImageButton; |
| 35 | 35 |
import org.distorted.main.R; |
| 36 | 36 |
import org.distorted.main.RubikActivity; |
| 37 |
import org.distorted.main.RubikPreRender;
|
|
| 37 |
import org.distorted.objectlib.main.ObjectPreRender;
|
|
| 38 | 38 |
import org.distorted.patterns.RubikPattern; |
| 39 | 39 |
|
| 40 | 40 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 121 | 121 |
@Override |
| 122 | 122 |
public void onClick(View v) |
| 123 | 123 |
{
|
| 124 |
RubikPreRender pre = act.getPreRender();
|
|
| 124 |
ObjectPreRender pre = act.getPreRender();
|
|
| 125 | 125 |
backMove(pre); |
| 126 | 126 |
mMovesText.setText(act.getString(R.string.mo_placeholder,mCurrMove,mNumMoves)); |
| 127 | 127 |
} |
| ... | ... | |
| 140 | 140 |
@Override |
| 141 | 141 |
public void onClick(View v) |
| 142 | 142 |
{
|
| 143 |
RubikPreRender pre = act.getPreRender();
|
|
| 143 |
ObjectPreRender pre = act.getPreRender();
|
|
| 144 | 144 |
makeMove(pre); |
| 145 | 145 |
mMovesText.setText(act.getString(R.string.mo_placeholder,mCurrMove,mNumMoves)); |
| 146 | 146 |
} |
| ... | ... | |
| 187 | 187 |
|
| 188 | 188 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 189 | 189 |
|
| 190 |
private void makeMove(RubikPreRender pre)
|
|
| 190 |
private void makeMove(ObjectPreRender pre)
|
|
| 191 | 191 |
{
|
| 192 | 192 |
if( mCanRotate ) |
| 193 | 193 |
{
|
| ... | ... | |
| 226 | 226 |
|
| 227 | 227 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 228 | 228 |
|
| 229 |
private void backMove(RubikPreRender pre)
|
|
| 229 |
private void backMove(ObjectPreRender pre)
|
|
| 230 | 230 |
{
|
| 231 | 231 |
if( mCanRotate ) |
| 232 | 232 |
{
|
Also available in: Unified diff
Move PreRender to objectlib.
This code is now shared betweeen the Rubik and Tutorial activities.