Project

General

Profile

« Previous | Next » 

Revision b5347187

Added by Leszek Koltunski about 3 years ago

Progress with any size Kilominx.

View differences:

src/main/java/org/distorted/objects/TwistyKilominx.java
250 250
        }
251 251
      }
252 252

  
253
    for(int center=0; center<NUM_CENTERS; center++, index++)
253
    for(int center=0; center<NUM_CENTERS; center++)
254 254
      {
255 255
      for(int part=0; part<numCubitsPerCenter; part++, index++)
256 256
        {
......
309 309
    if( mNumCornerEdgeVariants>0 )
310 310
      {
311 311
      if( mCornerMeshes==null ) mCornerMeshes = new MeshBase[mNumCornerEdgeVariants];
312
      if( mEdgeMeshes  ==null ) mEdgeMeshes   = new MeshBase[mNumCornerEdgeVariants][(highestSize-3)/2];
312
      if( mEdgeMeshes  ==null ) mEdgeMeshes   = new MeshBase[mNumCornerEdgeVariants][highestSize-3];
313 313
      }
314 314

  
315 315
    if( mCenterMeshes==null ) mCenterMeshes = new MeshBase[variants];
......
362 362

  
363 363
  int getFaceColor(int cubit, int cubitface, int numLayers)
364 364
    {
365
    return cubitface>=0 && cubitface<3 ? mCornerFaceMap[cubit][cubitface] : NUM_TEXTURES*NUM_FACES;
365
    if( numLayers==3 )
366
      {
367
      return cubitface>=0 && cubitface<3 ? mCornerFaceMap[cubit][cubitface] : NUM_TEXTURES*NUM_FACES;
368
      }
369

  
370
    return 0;
366 371
    }
367 372

  
368 373
///////////////////////////////////////////////////////////////////////////////////////////////////
......
381 386
    float[] vertices = { -X1, Y2, 0, -A*Y1, X1, Y2, 0, Y1 };
382 387

  
383 388
    FactorySticker factory = FactorySticker.getInstance();
384
    factory.drawRoundedPolygon(canvas, paint, left, top, vertices, S, FACE_COLORS[face], R);
389
    factory.drawRoundedPolygon(canvas, paint, left, top, vertices, S, FACE_COLORS[face%NUM_FACES], R);
385 390

  
386 391
    float MID = TEXTURE_HEIGHT*0.5f;
387 392
    float WID = TEXTURE_HEIGHT*0.1f;

Also available in: Unified diff