Project

General

Profile

« Previous | Next » 

Revision f0450fcc

Added by Leszek Koltunski about 3 years ago

Change Cubit.mRotationRow[] from an index pointing at a single rotating layer to a bitmap potentially pointing at several layers.
(in preparation for bandaged objects)

View differences:

src/main/java/org/distorted/objects/TwistyBandagedAbstract.java
306 306
    int dimIndex     = mAxisMap[posIndex][quatIndex];
307 307
    boolean reaches  = multiplier*pos[posIndex] + dim[dimIndex]*0.5f > (numLayers-1)*0.5f;
308 308

  
309
    int ret=  reaches ? stickerIndex*NUM_FACES + face : NUM_STICKERS*NUM_FACES;
310

  
311
if( cubit==0 )
312
  {
313
android.util.Log.e("DISTORTED", "cubit="+cubit+" cubitface="+cubitface+" ret="+ret+" stickerIndex="+stickerIndex+" face="+face);
314
android.util.Log.e("DISTORTED", "reaches="+reaches+" border="+((numLayers-1)*0.5f)+" left="+(multiplier*pos[posIndex] + dim[dimIndex]*0.5f));
315
android.util.Log.e("DISTORTED", "posIndex="+posIndex+" dimIndex="+dimIndex);
316

  
317
  }
318
    return ret;
309
    return reaches ? stickerIndex*NUM_FACES + face : NUM_STICKERS*NUM_FACES;
319 310
    }
320 311

  
321 312
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff