Revision 17d623f1
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/effects/EffectController.java | ||
|---|---|---|
| 31 | 31 |
TwistyObject getOldObject(); |
| 32 | 32 |
TwistyObject getObject(); |
| 33 | 33 |
int getNumScrambles(); |
| 34 |
void solve(); |
|
| 34 |
void solveOnly();
|
|
| 35 | 35 |
} |
| src/main/java/org/distorted/objectlib/effects/solve/SolveEffect.java | ||
|---|---|---|
| 132 | 132 |
{
|
| 133 | 133 |
case 0: mEffectReturned = 0; |
| 134 | 134 |
mPhase = 1; |
| 135 |
mController.solve(); |
|
| 135 |
mController.solveOnly();
|
|
| 136 | 136 |
createEffectsPhase1(mDuration); |
| 137 | 137 |
assignEffects(mPhase); |
| 138 | 138 |
break; |
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 660 | 660 |
mPreRender.solveObject(); |
| 661 | 661 |
} |
| 662 | 662 |
|
| 663 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 664 |
|
|
| 665 |
public void solveOnly() |
|
| 666 |
{
|
|
| 667 |
mPreRender.solveOnly(); |
|
| 668 |
} |
|
| 669 |
|
|
| 663 | 670 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 664 | 671 |
|
| 665 | 672 |
public void addRotation(MovesFinished listener, int axis, int rowBitmap, int angle, int duration) |
| src/main/java/org/distorted/objectlib/main/ObjectPreRender.java | ||
|---|---|---|
| 336 | 336 |
|
| 337 | 337 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 338 | 338 |
// INTERNAL API |
| 339 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 340 |
// this only sets the cubits state to solved |
|
| 341 |
|
|
| 342 |
public void solve() |
|
| 343 |
{
|
|
| 344 |
mSolve = true; |
|
| 345 |
} |
|
| 346 |
|
|
| 347 | 339 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 348 | 340 |
|
| 349 | 341 |
public int getNumScrambles() |
| ... | ... | |
| 537 | 529 |
} |
| 538 | 530 |
} |
| 539 | 531 |
|
| 532 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 533 |
// this only sets the cubits state to solved |
|
| 534 |
|
|
| 535 |
public void solveOnly() |
|
| 536 |
{
|
|
| 537 |
mSolve = true; |
|
| 538 |
} |
|
| 539 |
|
|
| 540 | 540 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 541 | 541 |
|
| 542 | 542 |
public void resetAllTextureMaps() |
Also available in: Unified diff
Bugfix: we shouldn't be calling TwsityObject.solve() directly from the app, only through ObjectControl.solveOnly().