Project

General

Profile

« Previous | Next » 

Revision d92030e4

Added by Leszek Koltunski over 3 years ago

Improve the Skewb; set max components to 110 in MeshBase so that all of Professor Skewb's components fit.

View differences:

src/main/java/org/distorted/objects/FactoryCubit.java
232 232

  
233 233
    float E = 0.5f;
234 234
    float F = SQ2/2;
235
    float G = SQ6/16;
235 236
    float[] vertices0 = { -E+E/4,E/4, E/4,-E+E/4, E/4,E/4};
236 237
    float[] bands0 = computeBands(0.028f,35,E/3,0.7f,7);
237 238

  
......
242 243
    meshes[2] = meshes[0].copy(true);
243 244
    meshes[2].setEffectAssociation(0,4,0);
244 245

  
245
    float[] vertices1 = { 0,0, F,0, 7*F/8,(SQ3/8)*F, 5*F/8,(3*SQ3/8)*F, F/2,(SQ3/2)*F };
246
    float[] vertices1 = { -F/2,-2*G, F/2,-2*G, 3*F/8,-G, 1*F/8,G, 0,2*G };
246 247
    float[] bands1 = computeBands(0,0,1,0,3);
247 248

  
248 249
    meshes[3] = new MeshPolygon(vertices1,bands1,1,5);
......
545 546
    Static3D center1= new Static3D(0,0,0);
546 547
    Static3D center2= new Static3D(-0.5f,-0.5f,-0.5f);
547 548
    Static3D move1  = new Static3D(-E/4,-E/4,0);
548
    Static3D move2  = new Static3D(-0.5f,-0.5f,-0.5f);
549
    Static3D move2  = new Static3D(-0.5f+SQ2/4,-0.5f+SQ6/8,-0.5f);
549 550

  
550 551
    VertexEffect[] effect = new VertexEffect[10];
551 552

  
......
966 967
    vertices[1] = new Static3D(+E*SQ2,      0, 0);
967 968
    vertices[2] = new Static3D(     0, -E*SQ2, 0);
968 969
    vertices[3] = new Static3D(     0, +E*SQ2, 0);
969
    roundCorners(mesh,roundingCenter,vertices,0.10f,0.10f);
970
    roundCorners(mesh,roundingCenter,vertices,0.06f,0.10f);
970 971

  
971 972
    mesh.mergeEffComponents();
972 973
    mesh.addEmptyTexComponent();

Also available in: Unified diff