Revision 81141862
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/effects/EffectController.java | ||
|---|---|---|
| 27 | 27 |
|
| 28 | 28 |
public interface EffectController extends EffectListener |
| 29 | 29 |
{
|
| 30 |
void addRotation(MovesFinished listener, int axis, int rowBitmap, int angle, int duration);
|
|
| 30 |
void addRotation(MovesFinished listener, int axis, int rowBitmap, int angle, int millisPerDegree);
|
|
| 31 | 31 |
TwistyObject getOldObject(); |
| 32 | 32 |
TwistyObject getObject(); |
| 33 | 33 |
int getNumScrambles(); |
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 654 | 654 |
mPreRender.changeObject(object); |
| 655 | 655 |
} |
| 656 | 656 |
|
| 657 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 658 |
|
|
| 659 |
public void setupObject(ObjectType object, int[][] moves) |
|
| 660 |
{
|
|
| 661 |
mPreRender.setupObject(object,moves); |
|
| 662 |
} |
|
| 663 |
|
|
| 664 | 657 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 665 | 658 |
|
| 666 | 659 |
public void scrambleObject(int num) |
| ... | ... | |
| 718 | 711 |
} |
| 719 | 712 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 720 | 713 |
|
| 721 |
public boolean retLocked() |
|
| 714 |
public boolean retLocked()
|
|
| 722 | 715 |
{
|
| 723 | 716 |
return mIsLocked; |
| 724 | 717 |
} |
| 725 | 718 |
|
| 726 | 719 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 727 | 720 |
|
| 728 |
public void toggleLock() |
|
| 721 |
public void toggleLock()
|
|
| 729 | 722 |
{
|
| 730 | 723 |
mIsLocked = !mIsLocked; |
| 731 | 724 |
} |
| 732 | 725 |
|
| 733 | 726 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 734 | 727 |
|
| 735 |
public void unlock() |
|
| 736 |
{
|
|
| 737 |
mIsLocked = false; |
|
| 738 |
} |
|
| 728 |
public void unlock()
|
|
| 729 |
{
|
|
| 730 |
mIsLocked = false;
|
|
| 731 |
}
|
|
| 739 | 732 |
|
| 740 | 733 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 741 | 734 |
|
| 742 |
public void setLock(boolean value) |
|
| 743 |
{
|
|
| 744 |
mRemLocked = mIsLocked; |
|
| 745 |
mIsLocked = value; |
|
| 746 |
} |
|
| 735 |
public void setLock(boolean value)
|
|
| 736 |
{
|
|
| 737 |
mRemLocked = mIsLocked;
|
|
| 738 |
mIsLocked = value;
|
|
| 739 |
}
|
|
| 747 | 740 |
|
| 748 | 741 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 749 | 742 |
|
| 750 |
public void unsetLock() |
|
| 751 |
{
|
|
| 752 |
mIsLocked = mRemLocked; |
|
| 753 |
} |
|
| 743 |
public void unsetLock()
|
|
| 744 |
{
|
|
| 745 |
mIsLocked = mRemLocked;
|
|
| 746 |
}
|
|
| 754 | 747 |
|
| 755 | 748 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 756 | 749 |
|
| src/main/java/org/distorted/objectlib/main/ObjectPreRender.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objectlib.main; |
| 21 | 21 |
|
| 22 |
import java.lang.ref.WeakReference; |
|
| 23 |
|
|
| 22 | 24 |
import android.app.Activity; |
| 23 | 25 |
import android.content.SharedPreferences; |
| 24 |
import android.content.res.Resources; |
|
| 25 | 26 |
|
| 26 | 27 |
import org.distorted.library.main.DistortedScreen; |
| 28 |
|
|
| 27 | 29 |
import org.distorted.objectlib.helpers.ObjectLibInterface; |
| 28 | 30 |
import org.distorted.objectlib.effects.BaseEffect; |
| 29 | 31 |
import org.distorted.objectlib.effects.EffectController; |
| ... | ... | |
| 31 | 33 |
import org.distorted.objectlib.helpers.BlockController; |
| 32 | 34 |
import org.distorted.objectlib.helpers.MovesFinished; |
| 33 | 35 |
|
| 34 |
import java.lang.ref.WeakReference; |
|
| 35 |
|
|
| 36 | 36 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 37 | 37 |
|
| 38 | 38 |
public class ObjectPreRender implements EffectController |
| ... | ... | |
| 48 | 48 |
private String mDebug; |
| 49 | 49 |
|
| 50 | 50 |
private boolean mFinishRotation, mRemoveRotation, mRemovePatternRotation, mAddRotation, |
| 51 |
mSetQuat, mChangeObject, mSetupObject, mSolveObject, mScrambleObject,
|
|
| 51 |
mSetQuat, mChangeObject, mSolveObject, mScrambleObject, |
|
| 52 | 52 |
mInitializeObject, mSetTextureMap, mResetAllTextureMaps, mSolve; |
| 53 | 53 |
private boolean mUIBlocked, mTouchBlocked, mIsSolved; |
| 54 | 54 |
private long mRotationFinishedID; |
| ... | ... | |
| 77 | 77 |
mAddRotation = false; |
| 78 | 78 |
mSetQuat = false; |
| 79 | 79 |
mChangeObject = false; |
| 80 |
mSetupObject = false; |
|
| 81 | 80 |
mSolveObject = false; |
| 82 | 81 |
mSolve = false; |
| 83 | 82 |
mScrambleObject = false; |
| ... | ... | |
| 98 | 97 |
|
| 99 | 98 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 100 | 99 |
|
| 101 |
private void createObjectNow(ObjectType object, int[][] moves)
|
|
| 100 |
private void createObjectNow(ObjectType object) |
|
| 102 | 101 |
{
|
| 103 | 102 |
boolean firstTime = (mNewObject==null); |
| 104 | 103 |
|
| 105 | 104 |
if( mOldObject!=null ) mOldObject.releaseResources(); |
| 106 | 105 |
mOldObject = mNewObject; |
| 107 | 106 |
|
| 108 |
Activity tact = mAct.get(); |
|
| 109 |
Resources res = tact.getResources(); |
|
| 110 |
|
|
| 111 |
mNewObject = object.create( mController.getQuat(), moves, res, mScreenWidth); |
|
| 107 |
mNewObject = object.create( mController.getQuat(), mAct.get().getResources(), mScreenWidth); |
|
| 112 | 108 |
|
| 113 | 109 |
if( mNewObject!=null ) |
| 114 | 110 |
{
|
| ... | ... | |
| 219 | 215 |
if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject ) |
| 220 | 216 |
{
|
| 221 | 217 |
blockEverything(BlockController.PLACE_1); |
| 222 |
createObjectNow(mNextObject, null); |
|
| 223 |
doEffectNow( BaseEffect.Type.SIZECHANGE ); |
|
| 224 |
} |
|
| 225 |
} |
|
| 226 |
|
|
| 227 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 228 |
|
|
| 229 |
private void setupObjectNow() |
|
| 230 |
{
|
|
| 231 |
mSetupObject = false; |
|
| 232 |
|
|
| 233 |
if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject) |
|
| 234 |
{
|
|
| 235 |
blockEverything(BlockController.PLACE_2); |
|
| 236 |
createObjectNow(mNextObject, mNextMoves); |
|
| 218 |
createObjectNow(mNextObject); |
|
| 237 | 219 |
doEffectNow( BaseEffect.Type.SIZECHANGE ); |
| 238 | 220 |
} |
| 239 |
else |
|
| 240 |
{
|
|
| 241 |
mNewObject.initializeObject(mNextMoves); |
|
| 242 |
} |
|
| 243 | 221 |
} |
| 244 | 222 |
|
| 245 | 223 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 390 | 368 |
mNextObject = object; |
| 391 | 369 |
} |
| 392 | 370 |
|
| 393 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 394 |
|
|
| 395 |
public void setupObject(ObjectType object, int[][] moves) |
|
| 396 |
{
|
|
| 397 |
mSetupObject= true; |
|
| 398 |
mNextObject = object; |
|
| 399 |
mNextMoves = moves; |
|
| 400 |
} |
|
| 401 |
|
|
| 402 | 371 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 403 | 372 |
|
| 404 | 373 |
public boolean isTouchBlocked() |
| ... | ... | |
| 467 | 436 |
if( mRemoveRotation ) removeRotationNow(); |
| 468 | 437 |
if( mRemovePatternRotation ) removePatternRotationNow(); |
| 469 | 438 |
if( mChangeObject ) changeObjectNow(); |
| 470 |
if( mSetupObject ) setupObjectNow(); |
|
| 471 | 439 |
if( mSolveObject ) solveObjectNow(); |
| 472 | 440 |
if( mScrambleObject ) scrambleObjectNow(); |
| 473 | 441 |
if( mAddRotation ) addRotationNow(); |
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 149 | 149 |
|
| 150 | 150 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 151 | 151 |
|
| 152 |
public TwistyObject create(Static4D quat, int[][] moves, Resources res, int scrWidth)
|
|
| 152 |
public TwistyObject create(Static4D quat, Resources res, int scrWidth) |
|
| 153 | 153 |
{
|
| 154 | 154 |
DistortedTexture texture = new DistortedTexture(); |
| 155 | 155 |
DistortedEffects effects = new DistortedEffects(); |
| ... | ... | |
| 163 | 163 |
case 0: |
| 164 | 164 |
case 1: |
| 165 | 165 |
case 2: |
| 166 |
case 3: return new TwistyCube (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 167 |
case 4: return new TwistyJing (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 166 |
case 3: return new TwistyCube (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 167 |
case 4: return new TwistyJing (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 168 | 168 |
case 5: |
| 169 | 169 |
case 6: |
| 170 |
case 7: return new TwistyPyraminx (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 170 |
case 7: return new TwistyPyraminx (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 171 | 171 |
case 8: |
| 172 |
case 9: return new TwistyKilominx (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 172 |
case 9: return new TwistyKilominx (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 173 | 173 |
case 10: |
| 174 |
case 11: return new TwistyMegaminx (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 175 |
case 12: return new TwistyUltimate (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 174 |
case 11: return new TwistyMegaminx (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 175 |
case 12: return new TwistyUltimate (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 176 | 176 |
case 13: |
| 177 | 177 |
case 14: |
| 178 |
case 15: return new TwistyDiamond (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 179 |
case 16: return new TwistyDino6 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 180 |
case 17: return new TwistyDino4 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 181 |
case 18: return new TwistyRedi (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 182 |
case 19: return new TwistyHelicopter (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 178 |
case 15: return new TwistyDiamond (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 179 |
case 16: return new TwistyDino6 (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 180 |
case 17: return new TwistyDino4 (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 181 |
case 18: return new TwistyRedi (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 182 |
case 19: return new TwistyHelicopter (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 183 | 183 |
case 20: |
| 184 |
case 21: return new TwistySkewb (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 185 |
case 22: return new TwistyIvy (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 186 |
case 23: return new TwistyRex (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 187 |
case 24: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 188 |
case 25: return new TwistyBandaged2Bar (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 189 |
case 26: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 190 |
case 27: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 191 |
case 28: return new TwistySquare1 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 192 |
case 29: return new TwistySquare2 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 184 |
case 21: return new TwistySkewb (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 185 |
case 22: return new TwistyIvy (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 186 |
case 23: return new TwistyRex (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 187 |
case 24: return new TwistyBandagedFused (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 188 |
case 25: return new TwistyBandaged2Bar (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 189 |
case 26: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 190 |
case 27: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 191 |
case 28: return new TwistySquare1 (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 192 |
case 29: return new TwistySquare2 (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 193 | 193 |
case 30: |
| 194 |
case 31: return new TwistyMirror (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 194 |
case 31: return new TwistyMirror (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 195 | 195 |
} |
| 196 | 196 |
|
| 197 | 197 |
return null; |
| src/main/java/org/distorted/objectlib/main/Twisty12.java | ||
|---|---|---|
| 52 | 52 |
|
| 53 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 54 | 54 |
|
| 55 |
public Twisty12(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
|
|
| 56 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 55 |
public Twisty12(int numLayers, int realSize, Static4D quat, DistortedTexture texture, |
|
| 56 |
MeshSquare mesh, DistortedEffects effects, Resources res, int scrWidth)
|
|
| 57 | 57 |
{
|
| 58 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 58 |
super(numLayers, realSize, quat, texture, mesh, effects, res, scrWidth); |
|
| 59 | 59 |
} |
| 60 | 60 |
|
| 61 | 61 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/Twisty4.java | ||
|---|---|---|
| 38 | 38 |
|
| 39 | 39 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 40 | 40 |
|
| 41 |
public Twisty4(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
|
|
| 42 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 41 |
public Twisty4(int numLayers, int realSize, Static4D quat, DistortedTexture texture, |
|
| 42 |
MeshSquare mesh, DistortedEffects effects, Resources res, int scrWidth)
|
|
| 43 | 43 |
{
|
| 44 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 44 |
super(numLayers, realSize, quat, texture, mesh, effects, res, scrWidth); |
|
| 45 | 45 |
} |
| 46 | 46 |
|
| 47 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/Twisty6.java | ||
|---|---|---|
| 39 | 39 |
|
| 40 | 40 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 41 | 41 |
|
| 42 |
public Twisty6(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
|
|
| 43 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 42 |
public Twisty6(int numLayers, int realSize, Static4D quat, DistortedTexture texture, |
|
| 43 |
MeshSquare mesh, DistortedEffects effects, Resources res, int scrWidth)
|
|
| 44 | 44 |
{
|
| 45 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 45 |
super(numLayers, realSize, quat, texture, mesh, effects, res, scrWidth); |
|
| 46 | 46 |
} |
| 47 | 47 |
|
| 48 | 48 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/Twisty8.java | ||
|---|---|---|
| 40 | 40 |
|
| 41 | 41 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 42 | 42 |
|
| 43 |
public Twisty8(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
|
|
| 44 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 43 |
public Twisty8(int numLayers, int realSize, Static4D quat, DistortedTexture texture, |
|
| 44 |
MeshSquare mesh, DistortedEffects effects, Resources res, int scrWidth)
|
|
| 45 | 45 |
{
|
| 46 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 46 |
super(numLayers, realSize, quat, texture, mesh, effects, res, scrWidth); |
|
| 47 | 47 |
} |
| 48 | 48 |
|
| 49 | 49 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 137 | 137 |
|
| 138 | 138 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 139 | 139 |
|
| 140 |
TwistyObject(int numLayers, int realSize, Static4D quat, DistortedTexture nodeTexture, MeshSquare nodeMesh,
|
|
| 141 |
DistortedEffects nodeEffects, int[][] moves, Resources res, int screenWidth)
|
|
| 140 |
TwistyObject(int numLayers, int realSize, Static4D quat, DistortedTexture nodeTexture, |
|
| 141 |
MeshSquare nodeMesh, DistortedEffects nodeEffects, Resources res, int screenWidth)
|
|
| 142 | 142 |
{
|
| 143 | 143 |
super(nodeTexture,nodeEffects,nodeMesh); |
| 144 | 144 |
|
| ... | ... | |
| 239 | 239 |
|
| 240 | 240 |
attach( new DistortedNode(mTexture,mEffects,mMesh) ); |
| 241 | 241 |
|
| 242 |
setupPosition(moves); |
|
| 243 |
|
|
| 244 | 242 |
float fov = getFOV(); |
| 245 | 243 |
double halfFOV = fov * (Math.PI/360); |
| 246 | 244 |
mCameraDist = 0.5f*NODE_RATIO / (float)Math.tan(halfFOV); |
| src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java | ||
|---|---|---|
| 35 | 35 |
public class TwistyBandaged2Bar extends TwistyBandagedAbstract |
| 36 | 36 |
{
|
| 37 | 37 |
public TwistyBandaged2Bar(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 38 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 38 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 39 | 39 |
{
|
| 40 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 40 |
super(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java | ||
|---|---|---|
| 35 | 35 |
public class TwistyBandaged3Plate extends TwistyBandagedAbstract |
| 36 | 36 |
{
|
| 37 | 37 |
public TwistyBandaged3Plate(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 38 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 38 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 39 | 39 |
{
|
| 40 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 40 |
super(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java | ||
|---|---|---|
| 80 | 80 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 81 | 81 |
|
| 82 | 82 |
TwistyBandagedAbstract(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 83 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 83 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 84 | 84 |
{
|
| 85 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 85 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 86 | 86 |
} |
| 87 | 87 |
|
| 88 | 88 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java | ||
|---|---|---|
| 35 | 35 |
public class TwistyBandagedEvil extends TwistyBandagedAbstract |
| 36 | 36 |
{
|
| 37 | 37 |
public TwistyBandagedEvil(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 38 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 38 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 39 | 39 |
{
|
| 40 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 40 |
super(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java | ||
|---|---|---|
| 35 | 35 |
public class TwistyBandagedFused extends TwistyBandagedAbstract |
| 36 | 36 |
{
|
| 37 | 37 |
public TwistyBandagedFused(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 38 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 38 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 39 | 39 |
{
|
| 40 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 40 |
super(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCube.java | ||
|---|---|---|
| 65 | 65 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 66 | 66 |
|
| 67 | 67 |
public TwistyCube(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 68 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 68 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 69 | 69 |
{
|
| 70 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 70 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 71 | 71 |
} |
| 72 | 72 |
|
| 73 | 73 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
|---|---|---|
| 69 | 69 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 70 | 70 |
|
| 71 | 71 |
public TwistyDiamond(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 72 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 72 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 73 | 73 |
{
|
| 74 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 74 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 75 | 75 |
} |
| 76 | 76 |
|
| 77 | 77 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDino.java | ||
|---|---|---|
| 72 | 72 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 73 | 73 |
|
| 74 | 74 |
TwistyDino(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 75 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 75 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 76 | 76 |
{
|
| 77 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 77 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 78 | 78 |
} |
| 79 | 79 |
|
| 80 | 80 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDino4.java | ||
|---|---|---|
| 39 | 39 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 40 | 40 |
|
| 41 | 41 |
public TwistyDino4(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 42 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 42 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 43 | 43 |
{
|
| 44 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 44 |
super(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 45 | 45 |
} |
| 46 | 46 |
|
| 47 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDino6.java | ||
|---|---|---|
| 39 | 39 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 40 | 40 |
|
| 41 | 41 |
public TwistyDino6(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 42 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 42 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 43 | 43 |
{
|
| 44 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 44 |
super(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 45 | 45 |
} |
| 46 | 46 |
|
| 47 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
|---|---|---|
| 77 | 77 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 78 | 78 |
|
| 79 | 79 |
public TwistyHelicopter(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 80 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 80 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 81 | 81 |
{
|
| 82 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 82 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 83 | 83 |
} |
| 84 | 84 |
|
| 85 | 85 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
|---|---|---|
| 76 | 76 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 77 | 77 |
|
| 78 | 78 |
public TwistyIvy(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 79 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 79 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 80 | 80 |
{
|
| 81 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 81 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 82 | 82 |
} |
| 83 | 83 |
|
| 84 | 84 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
|---|---|---|
| 73 | 73 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 74 | 74 |
|
| 75 | 75 |
public TwistyJing(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 76 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 76 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 77 | 77 |
{
|
| 78 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 78 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 79 | 79 |
} |
| 80 | 80 |
|
| 81 | 81 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
|---|---|---|
| 44 | 44 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 45 | 45 |
|
| 46 | 46 |
public TwistyKilominx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 47 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 47 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 48 | 48 |
{
|
| 49 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 49 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 50 | 50 |
} |
| 51 | 51 |
|
| 52 | 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java | ||
|---|---|---|
| 45 | 45 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 46 | 46 |
|
| 47 | 47 |
public TwistyMegaminx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 48 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 48 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 49 | 49 |
{
|
| 50 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 50 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 51 | 51 |
} |
| 52 | 52 |
|
| 53 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMinx.java | ||
|---|---|---|
| 96 | 96 |
|
| 97 | 97 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 98 | 98 |
|
| 99 |
TwistyMinx(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
|
|
| 100 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 99 |
TwistyMinx(int numLayers, int realSize, Static4D quat, DistortedTexture texture, |
|
| 100 |
MeshSquare mesh, DistortedEffects effects, Resources res, int scrWidth)
|
|
| 101 | 101 |
{
|
| 102 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 102 |
super(numLayers, realSize, quat, texture, mesh, effects, res, scrWidth); |
|
| 103 | 103 |
} |
| 104 | 104 |
|
| 105 | 105 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMirror.java | ||
|---|---|---|
| 87 | 87 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 88 | 88 |
|
| 89 | 89 |
public TwistyMirror(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 90 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 90 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 91 | 91 |
{
|
| 92 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 92 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 93 | 93 |
} |
| 94 | 94 |
|
| 95 | 95 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
|---|---|---|
| 66 | 66 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 67 | 67 |
|
| 68 | 68 |
public TwistyPyraminx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 69 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 69 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 70 | 70 |
{
|
| 71 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 71 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 72 | 72 |
} |
| 73 | 73 |
|
| 74 | 74 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyRedi.java | ||
|---|---|---|
| 73 | 73 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 74 | 74 |
|
| 75 | 75 |
public TwistyRedi(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 76 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 76 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 77 | 77 |
{
|
| 78 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 78 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 79 | 79 |
} |
| 80 | 80 |
|
| 81 | 81 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyRex.java | ||
|---|---|---|
| 74 | 74 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 75 | 75 |
|
| 76 | 76 |
public TwistyRex(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 77 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 77 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 78 | 78 |
{
|
| 79 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 79 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 80 | 80 |
} |
| 81 | 81 |
|
| 82 | 82 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySkewb.java | ||
|---|---|---|
| 72 | 72 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 73 | 73 |
|
| 74 | 74 |
public TwistySkewb(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 75 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 75 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 76 | 76 |
{
|
| 77 |
super(size, 2*size-2, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 77 |
super(size, 2*size-2, quat, texture, mesh, effects, res, scrWidth); |
|
| 78 | 78 |
} |
| 79 | 79 |
|
| 80 | 80 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare.java | ||
|---|---|---|
| 65 | 65 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 66 | 66 |
|
| 67 | 67 |
TwistySquare(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 68 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 68 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 69 | 69 |
{
|
| 70 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 70 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 71 | 71 |
} |
| 72 | 72 |
|
| 73 | 73 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
|---|---|---|
| 48 | 48 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 49 | 49 |
|
| 50 | 50 |
public TwistySquare1(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 51 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 51 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 52 | 52 |
{
|
| 53 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 53 |
super(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 54 | 54 |
} |
| 55 | 55 |
|
| 56 | 56 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
|---|---|---|
| 48 | 48 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 49 | 49 |
|
| 50 | 50 |
public TwistySquare2(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 51 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 51 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 52 | 52 |
{
|
| 53 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 53 |
super(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 54 | 54 |
} |
| 55 | 55 |
|
| 56 | 56 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
|---|---|---|
| 77 | 77 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 78 | 78 |
|
| 79 | 79 |
public TwistyUltimate(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 80 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 80 |
DistortedEffects effects, Resources res, int scrWidth) |
|
| 81 | 81 |
{
|
| 82 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 82 |
super(size, size, quat, texture, mesh, effects, res, scrWidth); |
|
| 83 | 83 |
} |
| 84 | 84 |
|
| 85 | 85 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Remove the 'setupObject()' redundant API.