commit a7a7cc9c331435c54913e9f605211e67a2d05e1a Author: Leszek Koltunski Date: Sat Feb 1 01:16:34 2020 +0000 Add a 5x5x5 cube. diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java index f01020d9..2a10b1fe 100644 --- a/src/main/java/org/distorted/magic/RubikActivity.java +++ b/src/main/java/org/distorted/magic/RubikActivity.java @@ -39,7 +39,7 @@ public class RubikActivity extends AppCompatActivity { static final int DEFAULT_SIZE = 3; private static final int SMALLEST_SIZE = 2; - private static final int[] button_ids = {R.id.rubikSize2, R.id.rubikSize3, R.id.rubikSize4}; + private static final int[] button_ids = {R.id.rubikSize2, R.id.rubikSize3, R.id.rubikSize4, R.id.rubikSize5}; public static final int MIN_SCRAMBLE = 1; public static final int DEF_SCRAMBLE = 3; @@ -167,6 +167,14 @@ public class RubikActivity extends AppCompatActivity settings.show(getSupportFragmentManager(), null); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void Scores(View v) + { + RubikScores scores = new RubikScores(); + scores.show(getSupportFragmentManager(), null); + } + /////////////////////////////////////////////////////////////////////////////////////////////////// public void About(View v) diff --git a/src/main/java/org/distorted/magic/RubikRenderer.java b/src/main/java/org/distorted/magic/RubikRenderer.java index f46ecdd9..217e9f60 100644 --- a/src/main/java/org/distorted/magic/RubikRenderer.java +++ b/src/main/java/org/distorted/magic/RubikRenderer.java @@ -229,82 +229,82 @@ public class RubikRenderer implements GLSurfaceView.Renderer, EffectListener // various things are done here delayed, 'after the next render' as not to be done mid-render and // cause artifacts. - @Override - public void onDrawFrame(GL10 glUnused) - { - mScreen.render( System.currentTimeMillis() ); + @Override + public void onDrawFrame(GL10 glUnused) + { + mScreen.render( System.currentTimeMillis() ); - if( mSetQuatCurrent ) - { - mSetQuatCurrent = false; - mView.setQuatCurrent(); - } + if( mSetQuatCurrent ) + { + mSetQuatCurrent = false; + mView.setQuatCurrent(); + } - if( mSetQuatAccumulated ) - { - mSetQuatAccumulated = false; - mView.setQuatAccumulated(); - } + if( mSetQuatAccumulated ) + { + mSetQuatAccumulated = false; + mView.setQuatAccumulated(); + } - if( mFinishRotation ) - { - mFinishRotation = false; - mCanRotate = false; - mCanUI = false; - mRotationFinishedID = mNewCube.finishRotationNow(this); - } + if( mFinishRotation ) + { + mFinishRotation = false; + mCanRotate = false; + mCanUI = false; + mRotationFinishedID = mNewCube.finishRotationNow(this); + } - if( mRemoveRotation ) - { - mRemoveRotation=false; - mNewCube.removeRotationNow(); - - boolean solved = mNewCube.isSolved(); - - if( solved && !mIsSolved ) - { - mCanDrag = false; - mCanRotate = false; - mCanUI = false; - doEffectNow( BaseEffect.Type.WIN ); - } - else - { - mCanRotate = true; - mCanUI = true; - } - - mIsSolved = solved; - } + if( mRemoveRotation ) + { + mRemoveRotation=false; + mNewCube.removeRotationNow(); - if( mSizeChangeCube ) - { - mSizeChangeCube = false; - mCanDrag = false; - mCanRotate = false; - mCanUI = false; - createCubeNow(mNextCubeSize); - doEffectNow( BaseEffect.Type.SIZECHANGE ); - } + boolean solved = mNewCube.isSolved(); - if( mSolveCube ) - { - mSolveCube = false; - mCanDrag = false; - mCanRotate = false; - mCanUI = false; - doEffectNow( BaseEffect.Type.SOLVE ); - } + if( solved && !mIsSolved ) + { + mCanDrag = false; + mCanRotate = false; + mCanUI = false; + doEffectNow( BaseEffect.Type.WIN ); + } + else + { + mCanRotate = true; + mCanUI = true; + } - if( mScrambleCube ) - { - mScrambleCube = false; - mCanDrag = false; - mCanRotate = false; - mCanUI = false; - doEffectNow( BaseEffect.Type.SCRAMBLE ); - } - } + mIsSolved = solved; + } + + if( mSizeChangeCube ) + { + mSizeChangeCube = false; + mCanDrag = false; + mCanRotate = false; + mCanUI = false; + createCubeNow(mNextCubeSize); + doEffectNow( BaseEffect.Type.SIZECHANGE ); + } + + if( mSolveCube ) + { + mSolveCube = false; + mCanDrag = false; + mCanRotate = false; + mCanUI = false; + doEffectNow( BaseEffect.Type.SOLVE ); + } + + if( mScrambleCube ) + { + mScrambleCube = false; + mCanDrag = false; + mCanRotate = false; + mCanUI = false; + doEffectNow( BaseEffect.Type.SCRAMBLE ); + } + } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/magic/RubikScores.java b/src/main/java/org/distorted/magic/RubikScores.java new file mode 100644 index 00000000..afa88cb3 --- /dev/null +++ b/src/main/java/org/distorted/magic/RubikScores.java @@ -0,0 +1,29 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Distorted is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.magic; + +import android.support.v7.app.AppCompatDialogFragment; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikScores extends AppCompatDialogFragment + { + + } diff --git a/src/main/res/drawable/button5.png b/src/main/res/drawable/button5.png new file mode 100644 index 00000000..c6c5ff3a Binary files /dev/null and b/src/main/res/drawable/button5.png differ diff --git a/src/main/res/layout/main.xml b/src/main/res/layout/main.xml index 2e74e049..af619fb0 100644 --- a/src/main/res/layout/main.xml +++ b/src/main/res/layout/main.xml @@ -6,94 +6,119 @@ -