/src/main/java/org/distorted/object/RubikObjectList.java - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 49f67f9b

Progress with Pyraminx.

src/main/java/org/distorted/object/RubikObjectList.java
29	29
30	30	public enum RubikObjectList
31	31	{
32		CUBE2 ( 2, R.drawable.button2 , RubikCube.class, RubikCubeMovement.class),
33		CUBE3 ( 3, R.drawable.button3 , RubikCube.class, RubikCubeMovement.class),
34		CUBE4 ( 4, R.drawable.button4 , RubikCube.class, RubikCubeMovement.class),
35		CUBE5 ( 5, R.drawable.button5 , RubikCube.class, RubikCubeMovement.class),
	32	CUBE2 ( 1, R.drawable.cube2, RubikCube.class, RubikCubeMovement.class),
	33	CUBE3 ( 2, R.drawable.cube3, RubikCube.class, RubikCubeMovement.class),
	34	CUBE4 ( 3, R.drawable.cube4, RubikCube.class, RubikCubeMovement.class),
	35	CUBE5 ( 4, R.drawable.cube5, RubikCube.class, RubikCubeMovement.class),
36	36	;
37	37
38	38	public static final int LENGTH = values().length;
...	...
86	86	DistortedEffects effects = new DistortedEffects();
87	87	MeshRectangles mesh = new MeshRectangles(20,20); // mesh of the node, not of the cubits
88	88
89		return new RubikCube(mObjectSize, quatCur, quatAcc, texture, mesh, effects);
	89	return new RubikPyraminx(mObjectSize, quatCur, quatAcc, texture, mesh, effects);
90	90	}
91	91
92	92	///////////////////////////////////////////////////////////////////////////////////////////////////
...	...
94	94
95	95	public RubikObjectMovement getObjectMovementClass()
96	96	{
97		return new RubikCubeMovement();
	97	return new RubikPyraminxMovement();
98	98	}
99	99	}

Also available in: Unified diff