/src/main/java/org/distorted/objectlib/objects/TwistyDino4.java - Diff - TwistyPuzzleLib - Distorted Android

« Previous | Next »

Revision a57e6870

Added by Leszek Koltunski over 2 years ago

ID a57e68709b2a215648baaafe762126da905453b4
Parent d309baa5
Child dfdb26a9

make numLayers into an int[] (preparation for Cuboids)
Caution: because of previous changes to cubit order in cube, the Solver is broken!

src/main/java/org/distorted/objectlib/objects/TwistyDino4.java
39	39
40	40	///////////////////////////////////////////////////////////////////////////////////////////////////
41	41
42		public TwistyDino4(int size, Static4D quat, Static3D move, DistortedTexture texture,
	42	public TwistyDino4(int[] numL, Static4D quat, Static3D move, DistortedTexture texture,
43	43	MeshSquare mesh, DistortedEffects effects, Resources res, int scrWidth)
44	44	{
45		super(size, quat, move, texture, mesh, effects, res, scrWidth);
	45	super(numL, quat, move, texture, mesh, effects, res, scrWidth);
46	46	}
47	47
48	48	///////////////////////////////////////////////////////////////////////////////////////////////////
...	...
70	70
71	71	///////////////////////////////////////////////////////////////////////////////////////////////////
72	72
73		protected int[] getSolvedQuats(int cubit, int numLayers)
	73	protected int[] getSolvedQuats(int cubit, int[] numLayers)
74	74	{
75	75	return null;
76	76	}
77	77
78	78	///////////////////////////////////////////////////////////////////////////////////////////////////
79	79
80		protected int getFaceColor(int cubit, int cubitface, int size)
	80	protected int getFaceColor(int cubit, int cubitface, int[] numLayers)
81	81	{
82	82	if( mFaceMap==null ) mFaceMap = new int[] { 4, 2, 2, 4, 0, 2, 1, 4, 0, 0, 1, 1 };
83	83	return (cubitface==0 \|\| cubitface==1) ? mFaceMap[cubit] : NUM_TEXTURES;
...	...
99	99
100	100	///////////////////////////////////////////////////////////////////////////////////////////////////
101	101
102		public ObjectType intGetObjectType(int numLayers)
	102	public ObjectType intGetObjectType(int[] numLayers)
103	103	{
104	104	return ObjectType.DIN4_3;
105	105	}
106	106
107	107	///////////////////////////////////////////////////////////////////////////////////////////////////
108	108
109		public int getObjectName(int numLayers)
	109	public int getObjectName(int[] numLayers)
110	110	{
111	111	return R.string.din43;
112	112	}
113	113
114	114	///////////////////////////////////////////////////////////////////////////////////////////////////
115	115
116		public int getInventor(int numLayers)
	116	public int getInventor(int[] numLayers)
117	117	{
118	118	return R.string.din43_inventor;
119	119	}

Also available in: Unified diff

Project

General

Profile

TwistyPuzzleLib

Revision a57e6870

Added by Leszek Koltunski over 2 years ago