Revision 6cf89a3e
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objects/TwistyDiamond.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
import org.distorted.helpers.ObjectShape; |
| 25 | 25 |
import org.distorted.helpers.ObjectSticker; |
| 26 |
import org.distorted.helpers.ScrambleStateGraph;
|
|
| 26 |
import org.distorted.helpers.ScrambleState; |
|
| 27 | 27 |
import org.distorted.library.main.DistortedEffects; |
| 28 | 28 |
import org.distorted.library.main.DistortedTexture; |
| 29 | 29 |
import org.distorted.library.mesh.MeshSquare; |
| ... | ... | |
| 138 | 138 |
|
| 139 | 139 |
private int mCurrState; |
| 140 | 140 |
private int mIndexExcluded; |
| 141 |
private final ScrambleStateGraph[] mStates;
|
|
| 141 |
private final ScrambleState[] mStates; |
|
| 142 | 142 |
|
| 143 | 143 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 144 | 144 |
|
| ... | ... | |
| 156 | 156 |
tmp[3*i+2] = 0; |
| 157 | 157 |
} |
| 158 | 158 |
|
| 159 |
mStates = new ScrambleStateGraph[]
|
|
| 159 |
mStates = new ScrambleState[] |
|
| 160 | 160 |
{
|
| 161 |
new ScrambleStateGraph( new int[][] {tmp,tmp,tmp,tmp} )
|
|
| 161 |
new ScrambleState( new int[][] {tmp,tmp,tmp,tmp} )
|
|
| 162 | 162 |
}; |
| 163 | 163 |
} |
| 164 | 164 |
|
Also available in: Unified diff
Introduce pseudorandom balancing into scrambling in case of the two Dinos (from now on, the more times a particular (ax,layer) combination has been chosen already in the scrambling sequence, the less likely it is to be chosen next).
Fix Dino6 - isSolved(). Sadly, it cannot be the geeneric function - it needs to be another special case.