Project

General

Profile

« Previous | Next » 

Revision a7a7cc9c

Added by Leszek Koltunski over 4 years ago

Add a 5x5x5 cube.

View differences:

src/main/java/org/distorted/magic/RubikRenderer.java
229 229
// various things are done here delayed, 'after the next render' as not to be done mid-render and
230 230
// cause artifacts.
231 231

  
232
    @Override
233
    public void onDrawFrame(GL10 glUnused) 
234
      {
235
      mScreen.render( System.currentTimeMillis() );
232
   @Override
233
   public void onDrawFrame(GL10 glUnused)
234
     {
235
     mScreen.render( System.currentTimeMillis() );
236 236

  
237
      if( mSetQuatCurrent )
238
        {
239
        mSetQuatCurrent = false;
240
        mView.setQuatCurrent();
241
        }
237
     if( mSetQuatCurrent )
238
       {
239
       mSetQuatCurrent = false;
240
       mView.setQuatCurrent();
241
       }
242 242

  
243
      if( mSetQuatAccumulated )
244
        {
245
        mSetQuatAccumulated = false;
246
        mView.setQuatAccumulated();
247
        }
243
     if( mSetQuatAccumulated )
244
       {
245
       mSetQuatAccumulated = false;
246
       mView.setQuatAccumulated();
247
       }
248 248

  
249
      if( mFinishRotation )
250
        {
251
        mFinishRotation = false;
252
        mCanRotate      = false;
253
        mCanUI          = false;
254
        mRotationFinishedID = mNewCube.finishRotationNow(this);
255
        }
249
     if( mFinishRotation )
250
       {
251
       mFinishRotation = false;
252
       mCanRotate      = false;
253
       mCanUI          = false;
254
       mRotationFinishedID = mNewCube.finishRotationNow(this);
255
       }
256 256

  
257
      if( mRemoveRotation )
258
        {
259
        mRemoveRotation=false;
260
        mNewCube.removeRotationNow();
261

  
262
        boolean solved = mNewCube.isSolved();
263

  
264
        if( solved && !mIsSolved )
265
          {
266
          mCanDrag        = false;
267
          mCanRotate      = false;
268
          mCanUI          = false;
269
          doEffectNow( BaseEffect.Type.WIN );
270
          }
271
        else
272
          {
273
          mCanRotate = true;
274
          mCanUI     = true;
275
          }
276

  
277
        mIsSolved = solved;
278
        }
257
     if( mRemoveRotation )
258
       {
259
       mRemoveRotation=false;
260
       mNewCube.removeRotationNow();
279 261

  
280
      if( mSizeChangeCube )
281
        {
282
        mSizeChangeCube = false;
283
        mCanDrag        = false;
284
        mCanRotate      = false;
285
        mCanUI          = false;
286
        createCubeNow(mNextCubeSize);
287
        doEffectNow( BaseEffect.Type.SIZECHANGE );
288
        }
262
       boolean solved = mNewCube.isSolved();
289 263

  
290
      if( mSolveCube )
291
        {
292
        mSolveCube      = false;
293
        mCanDrag        = false;
294
        mCanRotate      = false;
295
        mCanUI          = false;
296
        doEffectNow( BaseEffect.Type.SOLVE );
297
        }
264
       if( solved && !mIsSolved )
265
         {
266
         mCanDrag        = false;
267
         mCanRotate      = false;
268
         mCanUI          = false;
269
         doEffectNow( BaseEffect.Type.WIN );
270
         }
271
       else
272
         {
273
         mCanRotate = true;
274
         mCanUI     = true;
275
         }
298 276

  
299
      if( mScrambleCube )
300
        {
301
        mScrambleCube = false;
302
        mCanDrag      = false;
303
        mCanRotate    = false;
304
        mCanUI        = false;
305
        doEffectNow( BaseEffect.Type.SCRAMBLE );
306
        }
307
      }
277
       mIsSolved = solved;
278
       }
279

  
280
     if( mSizeChangeCube )
281
       {
282
       mSizeChangeCube = false;
283
       mCanDrag        = false;
284
       mCanRotate      = false;
285
       mCanUI          = false;
286
       createCubeNow(mNextCubeSize);
287
       doEffectNow( BaseEffect.Type.SIZECHANGE );
288
       }
289

  
290
     if( mSolveCube )
291
       {
292
       mSolveCube      = false;
293
       mCanDrag        = false;
294
       mCanRotate      = false;
295
       mCanUI          = false;
296
       doEffectNow( BaseEffect.Type.SOLVE );
297
       }
298

  
299
     if( mScrambleCube )
300
       {
301
       mScrambleCube = false;
302
       mCanDrag      = false;
303
       mCanRotate    = false;
304
       mCanUI        = false;
305
       doEffectNow( BaseEffect.Type.SCRAMBLE );
306
       }
307
     }
308 308

  
309 309
///////////////////////////////////////////////////////////////////////////////////////////////////
310 310

  

Also available in: Unified diff