/ - Diff - Magic Cube - Distorted Android

+    {
         private static final int ACTIVITY_NUMBER = 3;
         private static final float RATIO_BAR   = 0.10f;
         private static final float RATIO_BUT   = 0.07f;
         static final float RATIO_SCROLL= 0.30f;
         public static final float DIALOG_BUTTON_SIZE  = 0.06f;
-...
         private void computeHeights()
+          {
           int barHeight    = (int)(mScreenHeight*RATIO_BAR);
           int butHeight    = (int)(mScreenHeight*RATIO_BUT);
           int viewHeight   = (int)(mScreenHeight*RATIO_SCROLL);
           int objectHeight = (int)(mScreenHeight*(1-RATIO_SCROLL+RATIO_BAR));
           int padding      = (int)(mScreenHeight* RubikActivity.PADDING);
           LinearLayout layout = findViewById(R.id.lowerBar);
           ViewGroup.LayoutParams paramsL = layout.getLayoutParams();
           LinearLayout botLayout = findViewById(R.id.lowerBar);
           ViewGroup.LayoutParams paramsL = botLayout.getLayoutParams();
           paramsL.height = barHeight;
           layout.setLayoutParams(paramsL);
           botLayout.setLayoutParams(paramsL);
           LinearLayout butLayout = findViewById(R.id.bandagedCreatorButtons);
           ViewGroup.LayoutParams paramsB = butLayout.getLayoutParams();
           paramsB.height = butHeight;
           butLayout.setPadding(padding,0,padding,padding);
           butLayout.setLayoutParams(paramsB);
           LinearLayout topLayout = findViewById(R.id.bandagedCreatorTopView);
           ViewGroup.LayoutParams paramsT = topLayout.getLayoutParams();
           paramsT.height = viewHeight;
           int p = (int)(mScreenHeight* RubikActivity.PADDING);
           topLayout.setPadding(p,p,p,p);
           topLayout.setPadding(padding,padding,padding,padding);
           topLayout.setLayoutParams(paramsT);
           BandagedCreatorView creator = findViewById(R.id.bandagedCreatorObjectView);
-...
+          {
           SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
           SharedPreferences.Editor editor = preferences.edit();
           String objects = mScreen.generateObjectStrings();
           editor.putString("bandagedObjects", objects );
           mScreen.savePreferences(editor);
           editor.apply();
+          }
-...
         private void restorePreferences()
+          {
           SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
           String objects = preferences.getString("bandagedObjects","");
           mScreen.addObjects(this,objects);
           mScreen.restorePreferences(this,preferences);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           return mFirebaseAnalytics;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public void changeObject(int x, int y, int z)
+          {
           BandagedCreatorRenderer renderer = getRenderer();
           renderer.changeObject(x,y,z);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public BandagedCreatorRenderer getRenderer()

        private boolean mInitialPhase;
        private long mStartTime;
        private float mScaleValue;
        private float mX, mY, mZ, mW;
        private float mQuatX, mQuatY, mQuatZ, mQuatW;
        private int mX, mY, mZ;
        private boolean mResetQuats, mSetQuatT, mResettingObject, mConnectingCubits;
        private int mIndex1, mIndex2;
        private int mSaveIcon;
        private DistortedFramebuffer mFramebuffer;
        private String mPath;
        private boolean mCubitsCreated;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
          mSetQuatT         = false;
          mResettingObject  = false;
          mConnectingCubits = false;
          mCubitsCreated    = false;
          mSaveIcon = -1;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        private BandagedCubit[] createCubits()
        private void createCubits()
+         {
          boolean roundCorners = false;//DistortedLibrary.fastCompilationTF();
          android.util.Log.e("D", "creating cubits : "+mX+" "+mY+" "+mZ);
          int len = POSITIONS.length;
          BandagedCubit[] cubits = new BandagedCubit[len];
          mCubits = new BandagedCubit[len];
          for(int c=0; c<len; c++)
+           {
            cubits[c] = new BandagedCubit(POSITIONS[c],mQuatT,mQuatA,mScale,roundCorners);
            mCubits[c] = new BandagedCubit(POSITIONS[c],mQuatT,mQuatA,mScale,false);
+           }
          return cubits;
          mView.setCubits(mCubits);
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
          if( mSetQuatT )
+           {
            mSetQuatT = false;
            mQuatT.set(mX,mY,mZ,mW);
            mQuatT.set(mQuatX,mQuatY,mQuatZ,mQuatW);
+           }
          if( mResetQuats )
-...
           DistortedLibrary.onSurfaceCreated(mView.getContext(),this,1);
           DistortedLibrary.setCull(true);
           mCubits= createCubits();
           mView.setCubits(mCubits);
           createCubits();
           mCubitsCreated = true;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
        public void setQuatTemp(float x, float y, float z, float w)
+         {
          mX = x;
          mY = y;
          mZ = z;
          mW = w;
          mQuatX = x;
          mQuatY = y;
          mQuatZ = z;
          mQuatW = w;
          mSetQuatT = true;
+         }
-...
          mSaveIcon = -1;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        public void changeObject(int x, int y, int z)
+         {
          if( mX!=x || mY!=y || mZ!=z )
+           {
            android.util.Log.e("D", "really changing object to : "+x+" "+y+" "+z);
            mX = x;
            mY = y;
            mZ = z;
            if( mCubitsCreated )
+             {
              createCubits();
              mScreen.detachAll();
              int len = POSITIONS.length;
              mView.resetCubits();
              for(int i=0; i<len; i++)
+               {
                mCubits[i].scaleMove(mScaleValue);
                DistortedNode node = mCubits[i].getNode();
                mScreen.attach(node);
+               }
+             }
+           }
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        public void displaySavingDialog()

     package org.distorted.bandaged;
     import java.lang.ref.WeakReference;
     import java.util.ArrayList;
     import android.app.Activity;
     import android.content.SharedPreferences;
     import android.graphics.Bitmap;
     import android.view.View;
     import android.view.ViewGroup;
     import android.widget.AdapterView;
     import android.widget.ArrayAdapter;
     import android.widget.ImageView;
     import android.widget.LinearLayout;
     import android.widget.Spinner;
     import org.distorted.external.RubikFiles;
     import org.distorted.helpers.TransparentImageButton;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     public class BandagedCreatorScreen
     public class BandagedCreatorScreen implements AdapterView.OnItemSelectedListener
+    {
       public static final int MAX_SUPPORTED_SIZE = 5;
       private WeakReference<BandagedCreatorActivity> mAct;
       private TransparentImageButton mBackButton, mResetButton, mDoneButton;
       private LinearLayout mObjectView;
       private int mNumObjects;
       private ArrayList<BandagedCreatorObjectView> mViews;
       private int mNumObjects, mX, mY, mZ;
       private final ArrayList<BandagedCreatorObjectView> mViews;
       private Spinner mSpinnerX, mSpinnerY, mSpinnerZ;
       private boolean mSpinnersReady;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public BandagedCreatorScreen()
+        {
         mSpinnersReady = false;
         mNumObjects = 0;
         mViews = new ArrayList<>();
+        }
-...
           });
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private String[] createSizes(String mark)
+        {
         String[] ret = new String[MAX_SUPPORTED_SIZE];
         for(int i=1; i<=MAX_SUPPORTED_SIZE; i++)
+          {
           ret[i-1] = mark+" : "+i;
+          }
         return ret;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void changeObject()
+        {
         if( mSpinnersReady )
+          {
           BandagedCreatorActivity act = mAct.get();
           if( act!=null ) act.changeObject(mX+1,mY+1,mZ+1);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void onAttachedToWindow(final BandagedCreatorActivity act)
+        {
         mAct = new WeakReference<>(act);
         mObjectView = act.findViewById(R.id.bandagedCreatorView);
         int width = act.getScreenWidthInPixels();
         int width  = act.getScreenWidthInPixels();
         int height = act.getScreenHeightInPixels();
         int padding= (int)(height*RubikActivity.PADDING/3);
         LinearLayout.LayoutParams paramsL = new LinearLayout.LayoutParams(width/4, LinearLayout.LayoutParams.MATCH_PARENT);
         LinearLayout.LayoutParams paramsM = new LinearLayout.LayoutParams(width/2, LinearLayout.LayoutParams.MATCH_PARENT);
-...
         layout.addView(layoutLeft);
         layout.addView(layoutMid);
         layout.addView(layoutRight);
         mSpinnerX = act.findViewById(R.id.bandagedCreatorX);
         mSpinnerX.setOnItemSelectedListener(this);
         ArrayAdapter<String> adX = new ArrayAdapter<>(act, android.R.layout.simple_spinner_item, createSizes("X") );
         adX.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         mSpinnerX.setAdapter(adX);
         mSpinnerY = act.findViewById(R.id.bandagedCreatorY);
         mSpinnerY.setOnItemSelectedListener(this);
         ArrayAdapter<String> adY = new ArrayAdapter<>(act, android.R.layout.simple_spinner_item, createSizes("Y") );
         adY.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         mSpinnerY.setAdapter(adY);
         mSpinnerZ = act.findViewById(R.id.bandagedCreatorZ);
         mSpinnerZ.setOnItemSelectedListener(this);
         ArrayAdapter<String> adZ = new ArrayAdapter<>(act, android.R.layout.simple_spinner_item, createSizes("Z") );
         adZ.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         mSpinnerZ.setAdapter(adZ);
         ViewGroup.MarginLayoutParams paramsX = (ViewGroup.MarginLayoutParams) mSpinnerX.getLayoutParams();
         paramsX.setMargins(0,0,2*padding,0);
         ViewGroup.MarginLayoutParams paramsY = (ViewGroup.MarginLayoutParams) mSpinnerY.getLayoutParams();
         paramsY.setMargins(padding,0,padding,0);
         ViewGroup.MarginLayoutParams paramsZ = (ViewGroup.MarginLayoutParams) mSpinnerZ.getLayoutParams();
         paramsZ.setMargins(2*padding,0,0,0);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void addObjects(BandagedCreatorActivity act, String objectString)
       private void addObjects(BandagedCreatorActivity act, String objectString)
+        {
         if( objectString.length()>0 )
+          {
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       String generateObjectStrings()
       private String generateObjectStrings()
+        {
         String result = "";
         int numViews = mViews.size();
-...
         return result;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         @Override
         public void onItemSelected(AdapterView<?> parent, View view, int pos, long id)
+          {
           int spinnerID = parent.getId();
           if( spinnerID==R.id.bandagedCreatorX )
+            {
             mX = pos;
+            }
           else if( spinnerID==R.id.bandagedCreatorY )
+            {
             mY = pos;
+            }
           else if( spinnerID==R.id.bandagedCreatorZ )
+            {
             mZ = pos;
+            }
           changeObject();
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         @Override
         public void onNothingSelected(AdapterView<?> parent) { }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public void savePreferences(SharedPreferences.Editor editor)
+          {
           String objects = generateObjectStrings();
           editor.putString("bandagedObjects", objects );
           editor.putInt("bandagedX", mX);
           editor.putInt("bandagedY", mY);
           editor.putInt("bandagedZ", mZ);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public void restorePreferences(BandagedCreatorActivity act, SharedPreferences preferences)
+          {
           String objects = preferences.getString("bandagedObjects","");
           addObjects(act,objects);
           mX = preferences.getInt("bandagedX", 2);
           mY = preferences.getInt("bandagedY", 2);
           mZ = preferences.getInt("bandagedZ", 2);
           mSpinnerX.setSelection(mX);
           mSpinnerY.setSelection(mY);
           mSpinnerZ.setSelection(mZ);
           mSpinnersReady = true;
           changeObject();
+          }
+    }

     <?xml version="1.0" encoding="utf-8"?>
     <RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/relativeLayout"
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
         <org.distorted.bandaged.BandagedCreatorView
             android:id="@+id/bandagedCreatorObjectView"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_alignParentBottom="true"
             android:layout_alignParentStart="true"/>
         android:layout_height="match_parent"
         android:background="@android:color/transparent"
         android:orientation="vertical">
         <LinearLayout
             android:id="@+id/bandagedCreatorTopView"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_height="100dp"
             android:background="@color/light_grey"
             android:orientation="horizontal"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true">
             android:orientation="horizontal">
             <HorizontalScrollView
                 android:id="@+id/bandagedCreatorScrollView"
-...
             </HorizontalScrollView>
         </LinearLayout>
         <LinearLayout
             android:id="@+id/lowerBar"
             android:layout_alignParentBottom="true"
             android:layout_alignParentStart="true"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:orientation="horizontal"
             android:background="@android:color/transparent">
         </LinearLayout>
         <RelativeLayout
            android:id="@+id/relativeLayout"
            android:layout_width="match_parent"
            android:layout_height="match_parent">
            <org.distorted.bandaged.BandagedCreatorView
                android:id="@+id/bandagedCreatorObjectView"
                android:layout_width="match_parent"
                android:layout_height="0dp"
                android:layout_alignParentBottom="true"
                android:layout_alignParentStart="true"/>
            <LinearLayout
                android:id="@+id/bandagedCreatorButtons"
                android:layout_width="match_parent"
                android:layout_height="0dp"
                android:background="@android:color/transparent"
                android:orientation="horizontal"
                android:layout_alignParentTop="true">
                <Spinner
                    android:id="@+id/bandagedCreatorX"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1.0"
                    android:textAlignment="center"/>
                <Spinner
                    android:id="@+id/bandagedCreatorY"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1.0"
                    android:textAlignment="center"/>
                <Spinner
                    android:id="@+id/bandagedCreatorZ"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1.0"
                    android:textAlignment="center"/>
            </LinearLayout>
     </RelativeLayout>
            <LinearLayout
                android:id="@+id/lowerBar"
                android:layout_alignParentBottom="true"
                android:layout_alignParentStart="true"
                android:layout_width="match_parent"
                android:layout_height="0dp"
                android:orientation="horizontal"
                android:background="@android:color/transparent">
            </LinearLayout>
         </RelativeLayout>
     </LinearLayout>

         <string name="solver">3x3x3 Löser</string>
         <string name="tutorials">Lernprogrammen</string>
         <string name="about">Über die App</string>
         <string name="bandaged">Bandaged 3x3</string>
         <string name="bandaged">Bandaged</string>
         <string name="updates">Aktualisierungen</string>
         <string name="no_updates">Nicht gefunden</string>
         <string name="install">Installieren</string>

         <string name="solver">Solucionador</string>
         <string name="tutorials">Tutoriales</string>
         <string name="about">Acerca de</string>
         <string name="bandaged">Bandaged 3x3</string>
         <string name="bandaged">Bandaged</string>
         <string name="updates">Actualizaciones</string>
         <string name="no_updates">Extraviado</string>
         <string name="install">Instalar</string>

         <string name="solver">Solutionneur</string>
         <string name="tutorials">Tutoriels</string>
         <string name="about">À propos de</string>
         <string name="bandaged">Bandaged 3x3</string>
         <string name="bandaged">Bandaged</string>
         <string name="updates">Mises à jour</string>
         <string name="no_updates">Pas trouvé</string>
         <string name="install">Installer</string>

         <string name="solver">3x3x3 ソルバー</string>
         <string name="tutorials">チュートリアル</string>
         <string name="about">アプリについて</string>
         <string name="bandaged">包帯3x3</string>
         <string name="bandaged">包帯</string>
         <string name="updates">更新</string>
         <string name="no_updates">見つかりません</string>
         <string name="install">インストール</string>

         <string name="solver">3x3x3 해결사</string>
         <string name="tutorials">튜토리얼</string>
         <string name="about">정보</string>
         <string name="bandaged">밴디지 큐브</string>
         <string name="bandaged">밴디지</string>
         <string name="updates">업데이트</string>
         <string name="no_updates">업데이트가 없습니다</string>
         <string name="install">설치</string>

         <string name="solver">Rozwiązywacz</string>
         <string name="tutorials">Tutoriale</string>
         <string name="about">O aplikacji</string>
         <string name="bandaged">Bandaged 3x3</string>
         <string name="bandaged">Bandaged</string>
         <string name="updates">Aktualizacje</string>
         <string name="no_updates">Nie znaleziono</string>
         <string name="install">Zainstaluj</string>

         <string name="solver">Решебник 3х3х3</string>
         <string name="tutorials">Учебники</string>
         <string name="about">О нас</string>
         <string name="bandaged">Bandaged 3x3</string>
         <string name="bandaged">Bandaged</string>
         <string name="updates">Обновления</string>
         <string name="no_updates">Не найдено</string>
         <string name="install">Установите</string>

         <string name="solver">3x3x3 Solver</string>
         <string name="tutorials">Tutorials</string>
         <string name="about">About</string>
         <string name="bandaged">Bandaged 3x3</string>
         <string name="bandaged">Bandaged</string>
         <string name="updates">Updates</string>
         <string name="no_updates">No update found</string>
         <string name="install">Install</string>

Project

General

Profile

Magic Cube

Revision b9d062cf

Added by Leszek Koltunski over 3 years ago