Revision dae74fc9
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 75 | 75 |
MIRR_4 ( TwistyMirror.class , new int[] {4,4,4} , 24, R.drawable.mirr_4),
|
| 76 | 76 |
SQU1_3 ( TwistySquare1.class , new int[] {3,2,3} , 24, R.drawable.squ1_3),
|
| 77 | 77 |
SQU2_3 ( TwistySquare2.class , new int[] {3,2,3} , 24, R.drawable.squ2_3),
|
| 78 |
CONT_2 ( TwistyContainer.class , new int[] {2,2,2,2} , 12, R.drawable.squ2_3),
|
|
| 78 |
CONT_2 ( TwistyContainer.class , new int[] {2,2,2,2} , 12, R.drawable.cont_2),
|
|
| 79 | 79 |
; |
| 80 | 80 |
|
| 81 | 81 |
public static final int NUM_OBJECTS = values().length; |
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 77 | 77 |
public static final int COLOR_ORANGE = 0xffff6200; |
| 78 | 78 |
public static final int COLOR_GREY = 0xff727c7b; |
| 79 | 79 |
public static final int COLOR_VIOLET = 0xff7700bb; |
| 80 |
public static final int COLOR_INTERNAL= 0xffeeeeee;
|
|
| 80 |
public static final int COLOR_INTERNAL= 0xff000000;
|
|
| 81 | 81 |
|
| 82 | 82 |
public static final int TEXTURE_HEIGHT = 256; |
| 83 | 83 |
static final int NUM_STICKERS_IN_ROW = 4; |
| src/main/java/org/distorted/objectlib/objects/TwistyContainer.java | ||
|---|---|---|
| 216 | 216 |
{
|
| 217 | 217 |
float[][] bands = { {0.05f,35,0.26f,0.7f,5,2,1}, {0.001f,35,0.26f,0.7f,5,2,1} };
|
| 218 | 218 |
int[] bandIndices = { 0,1,1,1,1 };
|
| 219 |
float[][] corners = { {0.05f,0.25f} };
|
|
| 219 |
float[][] corners = { {0.03f,0.20f} };
|
|
| 220 | 220 |
int[] indices = { 0,0,0,0,-1 };
|
| 221 | 221 |
float[][] centers = { { 0.0f, SQ2, 0.0f} };
|
| 222 | 222 |
return new ObjectFaceShape(bands,bandIndices,corners,indices,centers,indices,null); |
| 223 | 223 |
} |
| 224 | 224 |
else if( variant==1 ) |
| 225 | 225 |
{
|
| 226 |
float[][] bands = { {0.05f,25,0.26f,0.7f,5,1,1}, {0.001f,25,0.26f,0.7f,5,1,1} };
|
|
| 226 |
float[][] bands = { {0.04f,25,0.26f,0.7f,5,1,1}, {0.001f,25,0.26f,0.7f,5,1,1} };
|
|
| 227 | 227 |
int[] bandIndices = { 0,0,1,1,1,1 };
|
| 228 |
float[][] corners = { {0.05f,0.25f} };
|
|
| 228 |
float[][] corners = { {0.03f,0.20f} };
|
|
| 229 | 229 |
int[] indices = { -1,0,0,0,0 };
|
| 230 | 230 |
float[][] centers = { {-1,0,1} };
|
| 231 | 231 |
return new ObjectFaceShape(bands,bandIndices,corners,indices,centers,indices,null); |
| ... | ... | |
| 234 | 234 |
{
|
| 235 | 235 |
float[][] bands = { {0.05f,35,0.26f,0.7f,5,1,1}, {0.001f,35,0.26f,0.7f,5,1,1} };
|
| 236 | 236 |
int[] bandIndices = { 0,1,1,1 };
|
| 237 |
float[][] corners = { {0.05f,0.25f} };
|
|
| 237 |
float[][] corners = { {0.03f,0.20f} };
|
|
| 238 | 238 |
int[] indices = { 0,0,0,-1 };
|
| 239 | 239 |
float[][] centers = { {0.0f, SQ2/2, -1.0f} };
|
| 240 | 240 |
return new ObjectFaceShape(bands,bandIndices,corners,indices,centers,indices,null); |
| ... | ... | |
| 259 | 259 |
|
| 260 | 260 |
public float getStickerRadius() |
| 261 | 261 |
{
|
| 262 |
return 0.08f;
|
|
| 262 |
return 0.10f;
|
|
| 263 | 263 |
} |
| 264 | 264 |
|
| 265 | 265 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 266 | 266 |
|
| 267 | 267 |
public float getStickerStroke() |
| 268 | 268 |
{
|
| 269 |
return ObjectControl.isInIconMode() ? 0.16f : 0.08f;
|
|
| 269 |
return ObjectControl.isInIconMode() ? 0.20f : 0.06f;
|
|
| 270 | 270 |
} |
| 271 | 271 |
|
| 272 | 272 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Finish the Container.