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

« Previous | Next »

Revision 1bb09f88

Progress with serializing object to JSON: stickers, quats.

src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java
88	88
89	89	///////////////////////////////////////////////////////////////////////////////////////////////////
90	90
91		protected int getNumStickerTypes(int[] numLayers)
	91	public int getNumStickerTypes(int[] numLayers)
92	92	{
93	93	return (numLayers[0]+3)/2;
94	94	}
...	...
554	554
555	555	///////////////////////////////////////////////////////////////////////////////////////////////////
556	556
557		protected ObjectSticker retSticker(int face)
	557	public ObjectSticker retSticker(int sticker)
558	558	{
559	559	if( mStickers==null )
560	560	{
...	...
595	595	}
596	596	}
597	597
598		return mStickers[getStickerIndex(face)];
	598	return mStickers[sticker];
599	599	}
600	600
601	601	///////////////////////////////////////////////////////////////////////////////////////////////////
602	602
603		private int getStickerIndex(int face)
	603	protected int getStickerIndex(int face)
604	604	{
605	605	int variant = face/NUM_FACE_COLORS;
606	606

Also available in: Unified diff