Revision 1fda81c4
Added by Leszek Koltunski 7 months ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 63 | 63 |
|
| 64 | 64 |
public abstract class TwistyObject |
| 65 | 65 |
{
|
| 66 |
public static final int MESH_NICE = 0; |
|
| 67 |
public static final int MESH_FAST = 1; |
|
| 68 |
|
|
| 69 | 66 |
public static final int MODE_ICON = 0; |
| 70 | 67 |
public static final int MODE_NORM = 1; |
| 71 | 68 |
|
| ... | ... | |
| 164 | 161 |
|
| 165 | 162 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 166 | 163 |
|
| 167 |
TwistyObject(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitAssets asset)
|
|
| 164 |
TwistyObject(int iconMode, Static4D quat, Static3D move, float scale, InitAssets asset) |
|
| 168 | 165 |
{
|
| 169 | 166 |
try |
| 170 | 167 |
{
|
| ... | ... | |
| 175 | 172 |
mNumLayers = reader.getNumLayers(); |
| 176 | 173 |
mSize = reader.getSize(); |
| 177 | 174 |
mInitData = null; |
| 178 |
initialize(meshState,iconMode,quat,move,scale,asset,true);
|
|
| 175 |
initialize(iconMode,quat,move,scale,asset,true); |
|
| 179 | 176 |
if( asset!=null ) asset.close(); |
| 180 | 177 |
mError = false; |
| 181 | 178 |
mErrorString=null; |
| ... | ... | |
| 189 | 186 |
|
| 190 | 187 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 191 | 188 |
|
| 192 |
public TwistyObject(int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 189 |
public TwistyObject(int iconMode, float size, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset) |
|
| 193 | 190 |
{
|
| 194 | 191 |
mNumLayers = data.getNumLayers(); |
| 195 | 192 |
mSize = size; |
| 196 | 193 |
mInitData = data; |
| 197 |
initialize(meshState,iconMode,quat,move,scale,asset,false);
|
|
| 194 |
initialize(iconMode,quat,move,scale,asset,false); |
|
| 198 | 195 |
if( asset!=null ) asset.close(); |
| 199 | 196 |
mError = false; |
| 200 | 197 |
mErrorString = null; |
| ... | ... | |
| 218 | 215 |
|
| 219 | 216 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 220 | 217 |
|
| 221 |
private void initialize(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitAssets asset, boolean fromJSON)
|
|
| 218 |
private void initialize(int iconMode, Static4D quat, Static3D move, float scale, InitAssets asset, boolean fromJSON) |
|
| 222 | 219 |
{
|
| 223 | 220 |
mRotationState = STATE_NOTHING; |
| 224 | 221 |
mIconMode = iconMode; |
| ... | ... | |
| 287 | 284 |
MatrixEffectMove moveEffect = new MatrixEffectMove(move); |
| 288 | 285 |
|
| 289 | 286 |
InputStream meshStream = asset!=null ? asset.getMeshStream(): null; |
| 290 |
boolean fromDMESH = (meshStream!=null && meshState==MESH_NICE);
|
|
| 287 |
boolean fromDMESH = (meshStream!=null); |
|
| 291 | 288 |
getQuatsAndShapes(fromDMESH,fromJSON); |
| 292 |
createMeshAndCubits(meshStream,meshState,fromDMESH);
|
|
| 289 |
createMeshAndCubits(meshStream,fromDMESH); |
|
| 293 | 290 |
setUpTextures(fromDMESH,fromJSON); |
| 294 | 291 |
|
| 295 | 292 |
int index = getSolvedFunctionIndex(); |
| ... | ... | |
| 426 | 423 |
|
| 427 | 424 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 428 | 425 |
|
| 429 |
private void createMeshAndCubits(InputStream stream, int meshState, boolean fromDMESH)
|
|
| 426 |
private void createMeshAndCubits(InputStream stream, boolean fromDMESH) |
|
| 430 | 427 |
{
|
| 431 | 428 |
mCubits = new TwistyObjectCubit[mNumCubits]; |
| 432 | 429 |
|
| ... | ... | |
| 450 | 447 |
|
| 451 | 448 |
for(int i=0; i<mNumCubits; i++) |
| 452 | 449 |
{
|
| 453 |
cubitMesh[i] = createCubitMesh(i,mNumLayers,meshState,mNumCubitFaces);
|
|
| 450 |
cubitMesh[i] = createCubitMesh(i,mNumLayers,mNumCubitFaces); |
|
| 454 | 451 |
Static3D pos = getPos(mOrigPos[i]); |
| 455 | 452 |
cubitMesh[i].apply(new MatrixEffectMove(pos),1,0); |
| 456 | 453 |
} |
| ... | ... | |
| 483 | 480 |
|
| 484 | 481 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 485 | 482 |
|
| 486 |
private MeshBase createCubitMesh(int cubit, int[] numLayers, int meshState, int numComponents)
|
|
| 483 |
private MeshBase createCubitMesh(int cubit, int[] numLayers, int numComponents) |
|
| 487 | 484 |
{
|
| 488 | 485 |
int variant = getCubitVariant(cubit,numLayers); |
| 489 | 486 |
|
| ... | ... | |
| 495 | 492 |
ObjectVertexEffects effects = getVertexEffects(variant); |
| 496 | 493 |
FactoryCubit factory = FactoryCubit.getInstance(); |
| 497 | 494 |
factory.createNewFaceTransform(mShapes[variant],mVariantFaceIsOuter[variant]); |
| 498 |
mMeshes[variant] = factory.createRoundedSolid(mShapes[variant],faceShape,effects, meshState, numComponents);
|
|
| 495 |
mMeshes[variant] = factory.createRoundedSolid(mShapes[variant],faceShape,effects,numComponents); |
|
| 499 | 496 |
} |
| 500 | 497 |
|
| 501 | 498 |
MeshBase mesh = mMeshes[variant].copy(true); |
Also available in: Unified diff
remove 'MESH_NICE'