Revision 3a1efb32
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objectlib.main; |
| 21 | 21 |
|
| 22 |
import java.io.DataInputStream; |
|
| 23 |
import java.io.IOException; |
|
| 24 |
import java.io.InputStream; |
|
| 25 |
import java.util.Random; |
|
| 26 |
|
|
| 22 | 27 |
import android.content.SharedPreferences; |
| 23 | 28 |
import android.graphics.Bitmap; |
| 24 | 29 |
import android.graphics.Canvas; |
| ... | ... | |
| 51 | 56 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| 52 | 57 |
import org.distorted.objectlib.helpers.ScrambleState; |
| 53 | 58 |
import org.distorted.objectlib.json.JsonReader; |
| 54 |
import org.distorted.objectlib.touchcontrol.TouchControl; |
|
| 55 |
import org.distorted.objectlib.touchcontrol.TouchControlCuboids; |
|
| 56 |
import org.distorted.objectlib.touchcontrol.TouchControlDodecahedron; |
|
| 57 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
|
| 58 |
import org.distorted.objectlib.touchcontrol.TouchControlOctahedron; |
|
| 59 |
import org.distorted.objectlib.touchcontrol.TouchControlTetrahedron; |
|
| 59 |
import org.distorted.objectlib.touchcontrol.*; |
|
| 60 | 60 |
|
| 61 |
import java.io.DataInputStream; |
|
| 62 |
import java.io.IOException; |
|
| 63 |
import java.io.InputStream; |
|
| 64 |
import java.util.Random; |
|
| 65 |
|
|
| 66 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_TETRAHEDRON; |
|
| 67 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON; |
|
| 68 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_OCTAHEDRON; |
|
| 69 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_DODECAHEDRON; |
|
| 70 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CUBOID; |
|
| 61 |
import static org.distorted.objectlib.touchcontrol.TouchControl.*; |
|
| 71 | 62 |
|
| 72 | 63 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 73 | 64 |
|
| ... | ... | |
| 1351 | 1342 |
case TC_CUBOID : int[] numLayers = getNumLayers(); |
| 1352 | 1343 |
mTouchControl = new TouchControlCuboids(this,getDist3D(numLayers)); |
| 1353 | 1344 |
break; |
| 1345 |
case TC_CHANGING : mTouchControl = new TouchControlShapeChanging(this); |
|
| 1346 |
break; |
|
| 1354 | 1347 |
} |
| 1355 | 1348 |
} |
| 1356 | 1349 |
return mTouchControl; |
Also available in: Unified diff
Bugfixes for the ShapeChanging touch control.
Still doesn't work but doesn't crash anymore :)