Project

General

Profile

« Previous | Next » 

Revision 35476762

Added by Leszek Koltunski about 4 years ago

Convert RubikCube to the new V&F center schema!

View differences:

src/main/java/org/distorted/library/main/DistortedLibrary.java
445 445
    float halfY       = mesh.getStretchY() / 2.0f;
446 446
    float halfZ       = mesh.getStretchZ() / 2.0f;
447 447
    float inflate     = mesh.getInflate();
448
    int width         = surface.mWidth;
449
    int height        = surface.mHeight;
450 448
    float distance    = surface.mDistance;
451 449
    float mipmap      = surface.mMipmap;
452 450
    float[] projection= surface.mProjectionMatrix;
453 451

  
454
    EffectQueue.send(queues, width, height, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 1 );
452
    EffectQueue.send(queues, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 1 );
455 453
    GLES31.glDrawArrays(GLES31.GL_TRIANGLE_STRIP, 0, mesh.getNumVertices() );
456 454

  
457 455
    if( mesh.getShowNormals() )
458 456
      {
459 457
      DistortedLibrary.mMainProgram.useProgram();
460
      EffectQueue.send(queues, width, height, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 0 );
458
      EffectQueue.send(queues, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 0 );
461 459
      displayNormals(queues,mesh);
462 460
      }
463 461
    }
......
479 477
    float halfY       = mesh.getStretchY() / 2.0f;
480 478
    float halfZ       = mesh.getStretchZ() / 2.0f;
481 479
    float inflate     = mesh.getInflate();
482
    int width         = surface.mWidth;
483
    int height        = surface.mHeight;
484 480
    float distance    = surface.mDistance;
485 481
    float mipmap      = surface.mMipmap;
486 482
    float[] projection= surface.mProjectionMatrix;
487 483

  
488
    EffectQueue.send(queues, width, height, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 0 );
484
    EffectQueue.send(queues, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 0 );
489 485
    GLES31.glDrawArrays(GLES31.GL_TRIANGLE_STRIP, 0, mesh.getNumVertices() );
490 486

  
491 487
    if( mesh.getShowNormals() ) displayNormals(queues,mesh);

Also available in: Unified diff