Revision bdbbb4c5
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objects/TwistyDino4.java | ||
---|---|---|
21 | 21 |
|
22 | 22 |
import android.content.res.Resources; |
23 | 23 |
|
24 |
import org.distorted.helpers.ScrambleState;
|
|
24 |
import org.distorted.objectlb.ScrambleState;
|
|
25 | 25 |
import org.distorted.library.main.DistortedEffects; |
26 | 26 |
import org.distorted.library.main.DistortedTexture; |
27 | 27 |
import org.distorted.library.mesh.MeshSquare; |
28 | 28 |
import org.distorted.library.type.Static4D; |
29 | 29 |
import org.distorted.main.R; |
30 |
import org.distorted.objectlb.ObjectList; |
|
30 | 31 |
|
31 | 32 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
32 | 33 |
|
... | ... | |
36 | 37 |
|
37 | 38 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
38 | 39 |
|
39 |
TwistyDino4(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
|
40 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
|
40 |
public TwistyDino4(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
|
|
41 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
41 | 42 |
{ |
42 | 43 |
super(size, quat, texture, mesh, effects, moves, ObjectList.DIN4, res, scrWidth); |
43 | 44 |
} |
44 | 45 |
|
45 | 46 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
46 | 47 |
|
47 |
ScrambleState[] getScrambleStates() |
|
48 |
protected ScrambleState[] getScrambleStates()
|
|
48 | 49 |
{ |
49 | 50 |
if( mStates==null ) |
50 | 51 |
{ |
... | ... | |
67 | 68 |
|
68 | 69 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
69 | 70 |
|
70 |
int[] getSolvedQuats(int cubit, int numLayers) |
|
71 |
protected int[] getSolvedQuats(int cubit, int numLayers)
|
|
71 | 72 |
{ |
72 | 73 |
return null; |
73 | 74 |
} |
74 | 75 |
|
75 | 76 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
76 | 77 |
|
77 |
int getFaceColor(int cubit, int cubitface, int size) |
|
78 |
protected int getFaceColor(int cubit, int cubitface, int size)
|
|
78 | 79 |
{ |
79 | 80 |
if( mFaceMap==null ) mFaceMap = new int[] { 4, 2, 2, 4, 0, 2, 1, 4, 0, 0, 1, 1 }; |
80 | 81 |
return (cubitface==0 || cubitface==1) ? mFaceMap[cubit] : NUM_TEXTURES; |
... | ... | |
82 | 83 |
|
83 | 84 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
84 | 85 |
|
85 |
int getSolvedFunctionIndex() |
|
86 |
protected int getSolvedFunctionIndex()
|
|
86 | 87 |
{ |
87 | 88 |
return 1; |
88 | 89 |
} |
Also available in: Unified diff
Refactoring: split the 'objects' package into two, 'objects' and 'objectlib'.
The point: we're going to need to move the 'objectlib' stuff into its own library module, and that's because we're going to create a new app module which needs access to it.