Project

General

Profile

« Previous | Next » 

Revision 0b050556

Added by Leszek Koltunski almost 2 years ago

Sticker overrides finished. Add crazy planets JSONs and icons.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
81 81 

  		




  82
  82
  
    
  CRA1_2 ( TwistyCrazy2x2.class      , 16, R.drawable.cra1_2, true, new InitData(new int[] {2,2,2} )),


  		




  83
  83
  
    
  CRA1_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.CRAZY  )),


  		




  84
  
  
    
  CRA2_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MERCURY)),


  		




  85
  
  
    
  CRA3_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.VENUS  )),


  		




  86
  
  
    
  CRA4_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.EARTH  )),


  		




  87
  
  
    
  CRA5_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MARS   )),


  		




  88
  
  
    
  CRA6_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.JUPITER)),


  		




  89
  
  
    
  CRA7_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.SATURN )),


  		




  90
  
  
    
  CRA8_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.URANUS )),


  		




  91
  
  
    
  CRA9_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.NEPTUNE)),


  		




  
  84
  
    
  CRA2_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra2_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MERCURY)),


  		




  
  85
  
    
  CRA3_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra3_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.VENUS  )),


  		




  
  86
  
    
  CRA4_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra4_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.EARTH  )),


  		




  
  87
  
    
  CRA5_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra5_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MARS   )),


  		




  
  88
  
    
  CRA6_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra6_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.JUPITER)),


  		




  
  89
  
    
  CRA7_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra7_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.SATURN )),


  		




  
  90
  
    
  CRA8_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra8_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.URANUS )),


  		




  
  91
  
    
  CRA9_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra9_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.NEPTUNE)),


  		




  92
  92
  
    

  		




  93
  93
  
    
  VOID_3 ( TwistyVoid.class          , 17, R.drawable.void_3, false, new InitData(new int[] {3,3,3})),        // wasDownloadableButNowIsBuiltIn()


  		




  94
  94
  
    
  CRYS_3 ( TwistyCrystal.class       , 27, R.drawable.crys_3, false, new InitData(new int[] {3,3,3,3,3,3})),  // function!


  		












  

    
      src/main/java/org/distorted/objectlib/main/TwistyObject.java
    
  





  1536
  1536
  
    

  		




  1537
  1537
  
    
      mMesh.setTextureMap(maps,mNumCubitFaces*cubit);


  		




  1538
  1538
  
    
      }


  		




  
  1539
  
    

  		




  
  1540
  
    
    for(int i=0; i<mNumOverrides; i++)


  		




  
  1541
  
    
      {


  		




  
  1542
  
    
      int[] cubitFaces = mStickerOverrides[i].getCubitFaces();


  		




  
  1543
  
    
      int length = cubitFaces.length/2;


  		




  
  1544
  
    

  		




  
  1545
  
    
      for(int j=0; j<length; j++)


  		




  
  1546
  
    
        overrideCubitFaceColor(i,cubitFaces[2*j],cubitFaces[2*j+1], ratioW, ratioH);


  		




  
  1547
  
    
      }


  		




  
  1548
  
    
    }


  		




  
  1549
  
    

  		




  
  1550
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  
  1551
  
    

  		




  
  1552
  
    
  private void overrideCubitFaceColor(int override, int cubit, int face, float ratioW, float ratioH)


  		




  
  1553
  
    
    {


  		




  
  1554
  
    
    final Static4D[] maps = new Static4D[1];


  		




  
  1555
  
    
    int color = mNumTextures-mNumOverrides+1+override;


  		




  
  1556
  
    
    int row   = (mNumTexRows-1) - color/mNumTexCols;


  		




  
  1557
  
    
    int col   = color%mNumTexCols;


  		




  
  1558
  
    
    maps[0] = new Static4D(col*ratioW, row*ratioH, ratioW, ratioH);


  		




  
  1559
  
    
    mMesh.setTextureMap(maps,mNumCubitFaces*cubit+face);


  		




  1539
  1560
  
    
    }


  		




  1540
  1561
  
    

  		




  1541
  1562
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












Also available in:  Unified diff