Project

General

Profile

« Previous | Next » 

Revision 3a0a23bf

Added by Leszek Koltunski almost 2 years ago

Beginnings of support for 'sticker overrides' - possibility to override the color of an individual face of an individual cubit. Ultimately this will enable overriding with any bitmap; so far only a solid color.

Also, fixes for two crashers.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectPreRender.java
538 538

  
539 539
  public void addRotation(MovesFinished listener, int axis, int rowBitmap, int bareAngle, int millPreDegree)
540 540
    {
541
    int[][] basicAngles = mNewObject.getBasicAngles();
541
    int[][] basicAngles = mNewObject==null ? null : mNewObject.getBasicAngles();
542
    int length = basicAngles==null ? 0 : basicAngles.length;
542 543

  
543
    if( axis<basicAngles.length )
544
    if( axis<length )
544 545
      {
545 546
      mAddRotation = true;
546 547
      int row = computeRowFromBitmap(rowBitmap);

Also available in: Unified diff