/src/main/java/org/distorted/objects/TwistyMegaminx.java - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision abf36986

Add Mirror Cube 2x2 and 3x3.

src/main/java/org/distorted/objects/TwistyMegaminx.java
529	529	int variant = edge / numCubitsPerEdge;
530	530	if( mEdgeMap==null ) initializeEdgeMap();
531	531
532		return (part==0 \|\| cubitface==((part+1)%2)) ? mEdgeMap[variant][cubitface+2] + ((part+3)/2)*NUM_FACES : NUM_TEXTURES;
	532	return (part==0 \|\| cubitface==((part+1)%2)) ? mEdgeMap[variant][cubitface+2] + ((part+3)/2)*NUM_FACE_COLORS : NUM_TEXTURES;
533	533	}
534	534
535	535	///////////////////////////////////////////////////////////////////////////////////////////////////
536	536
537	537	int getCenterColor(int center, int cubitface, int numLayers)
538	538	{
539		return cubitface>0 ? NUM_TEXTURES : center + NUM_FACES*(numLayers+1)/2;
	539	return cubitface>0 ? NUM_TEXTURES : center + NUM_FACE_COLORS*(numLayers+1)/2;
540	540	}
541	541
542	542	///////////////////////////////////////////////////////////////////////////////////////////////////
...	...
607	607
608	608	private int getStickerIndex(int face)
609	609	{
610		int variant = face/NUM_FACES;
	610	int variant = face/NUM_FACE_COLORS;
611	611
612	612	if( variant==0 ) return 0;
613	613

Also available in: Unified diff