Project

General

Profile

« Previous | Next » 

Revision 57ef6378

Added by Leszek Koltunski over 2 years ago

Float vertices - scratchbook

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java
322 322
      float width = numL/(numL-1.0f);
323 323
      float A = (2*SQ3/3)*SIN54;
324 324
      float B = 0.4f;
325
      double X = width*COS18*SIN_HALFD;
326
      double Y = width*SIN18;
327
      double Z = width*COS18*COS_HALFD;
325
      float X = width*COS18*SIN_HALFD;
326
      float Y = width*SIN18;
327
      float Z = width*COS18*COS_HALFD;
328 328

  
329
      double[][] vertices = new double[][]
329
      float[][] vertices = new float[][]
330 330
        {
331
            { 0.0, 0.0      , 0.0 },
331
            {   0,   0      ,   0 },
332 332
            {   X,   Y      ,  -Z },
333
            { 0.0, 2*Y      ,-2*Z },
333
            {   0, 2*Y      ,-2*Z },
334 334
            {  -X,   Y      ,  -Z },
335
            { 0.0, 0.0-width, 0.0 },
335
            {   0,   0-width,   0 },
336 336
            {   X,   Y-width,  -Z },
337
            { 0.0, 2*Y-width,-2*Z },
337
            {   0, 2*Y-width,-2*Z },
338 338
            {  -X,   Y-width,  -Z },
339 339
        };
340 340

  
......
370 370
      float width = tmpVal + (type/2)*tmpVal*SIN18;
371 371
      boolean left = (type%2)==0;
372 372

  
373
      double X = height*SIN_HALFD;
374
      double Y = height*SIN18/COS18;
375
      double Z = height*COS_HALFD;
373
      float X = height*SIN_HALFD;
374
      float Y = height*SIN18/COS18;
375
      float Z = height*COS_HALFD;
376 376

  
377
      double[][] vertices = new double[][]
377
      float[][] vertices = new float[][]
378 378
        {
379
            { 0.0, 0.0   , 0.0 },
379
            {   0,   0   ,   0 },
380 380
            {   X,   Y   ,  -Z },
381
            { 0.0, 2*Y   ,-2*Z },
381
            {   0, 2*Y   ,-2*Z },
382 382
            {  -X,   Y   ,  -Z },
383
            { 0.0, -width, 0.0 },
383
            {   0, -width,   0 },
384 384
            {   X, -width,  -Z },
385
            { 0.0, -width,-2*Z },
385
            {   0, -width,-2*Z },
386 386
            {  -X, -width,  -Z },
387 387
        };
388 388

  
......
434 434
    else
435 435
      {
436 436
      float width = (1+0.5f*(numL-3)*SIN18)*numL/(numL-1);
437

  
438
      double X = width*COS18*SIN_HALFD;
439
      double Y = width*SIN18;
440
      double Z = width*COS18*COS_HALFD;
441
      double H = width*(SIN54/COS54);
442
      double H3= H/COS_HALFD;
443
      double X3= H*SIN_HALFD;
444
      double Z3= H*COS_HALFD;
445
      double C = 1/(COS54*Math.sqrt(2-2*SIN18));
437
      float X = width*COS18*SIN_HALFD;
438
      float Y = width*SIN18;
439
      float Z = width*COS18*COS_HALFD;
440
      float H = width*(SIN54/COS54);
441
      float H3= H/COS_HALFD;
442
      float X3= H*SIN_HALFD;
443
      float Z3= H*COS_HALFD;
444
      float C = 1/(COS54*(float)Math.sqrt(2-2*SIN18));
446 445
      int N = small ? 4 : 3;
447 446
      int E = small ? 1 : 0;
448 447

  
449
      double[][] vertices = new double[][]
448
      float[][] vertices = new float[][]
450 449
        {
451
            { 0.0, 0.0  ,   0.0 },
450
            {   0,   0  ,     0 },
452 451
            {   X,   Y  ,    -Z },
453
            { 0.0,C*2*Y ,-2*C*Z },
452
            {   0,C*2*Y ,-2*C*Z },
454 453
            {  -X,   Y  ,    -Z },
455
            { 0.0,-width,   0.0 },
454
            {   0,-width,     0 },
456 455
            {  X3,-width,   -Z3 },
457
            { 0.0,-width,   -H3 },
456
            {   0,-width,   -H3 },
458 457
            { -X3,-width,   -Z3 }
459 458
        };
460 459

  

Also available in: Unified diff