Revision 3a0a23bf
Added by Leszek Koltunski almost 2 years ago
| src/main/java/org/distorted/objectlib/main/TwistyJson.java | ||
|---|---|---|
| 27 | 27 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 28 | 28 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 29 | 29 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| 30 |
import org.distorted.objectlib.helpers.ObjectStickerOverride; |
|
| 30 | 31 |
import org.distorted.objectlib.scrambling.ScrambleState; |
| 31 | 32 |
import org.distorted.objectlib.json.JsonReader; |
| 32 | 33 |
import org.distorted.objectlib.touchcontrol.TouchControlDodecahedron; |
| ... | ... | |
| 135 | 136 |
return mReader.retSticker(sticker); |
| 136 | 137 |
} |
| 137 | 138 |
|
| 139 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 140 |
|
|
| 141 |
@Override |
|
| 142 |
public ObjectStickerOverride[] getStickerOverrides() |
|
| 143 |
{
|
|
| 144 |
return mReader.getStickerOverrides(); |
|
| 145 |
} |
|
| 146 |
|
|
| 138 | 147 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 139 | 148 |
|
| 140 | 149 |
@Override |
Also available in: Unified diff
Beginnings of support for 'sticker overrides' - possibility to override the color of an individual face of an individual cubit. Ultimately this will enable overriding with any bitmap; so far only a solid color.
Also, fixes for two crashers.