/ - Diff - Distorted Android

       private NumberPicker mColsPicker, mRowsPicker;
       private LinearLayout mLay;
       private boolean[] mShape;
       private DistortedObject mObject;
       private int mObjectType;
       private int mBitmap;
       // fields needed for the second 'apply vertex effects' screen
       //
-...
       private float fsinkA;
       private float fswirlA;
       private float fcenterX, fcenterY;
       private DistortedObject mObject;
       private EffectNames[] effects = new EffectNames[4];
       private int mObjectType;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         setContentView(R.layout.objectpickerlayout);
         mLay = (LinearLayout)findViewById(R.id.objectpicker_buttongrid);
         mColsPicker = (NumberPicker)findViewById(R.id.objectpicker_cols);
         mRowsPicker = (NumberPicker)findViewById(R.id.objectpicker_rows);
-...
           @Override
           public void onValueChange(NumberPicker picker, int oldVal, int newVal)
+            {
             setGrid();
             mNumCols = mColsPicker.getValue();
+            }
           });
-...
           @Override
           public void onValueChange(NumberPicker picker, int oldVal, int newVal)
+            {
             setGrid();
             mNumRows = mRowsPicker.getValue();
+            }
           });
-...
         String[] objectType = new String[] {"DistortedCubes", "DistortedBitmap"};
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, objectType);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         typeSpinner.setAdapter(adapter);
         ArrayAdapter<String> adapterType = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, objectType);
         adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         typeSpinner.setAdapter(adapterType);
         Spinner bitmapSpinner  = (Spinner)findViewById(R.id.objectpicker_spinnerBitmap);
         bitmapSpinner.setOnItemSelectedListener(this);
         String[] objectBitmap = new String[] {"Girl", "Dog", "Cat", "Grid"};
         ArrayAdapter<String> adapterBitmap = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, objectBitmap);
         adapterBitmap.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         bitmapSpinner.setAdapter(adapterBitmap);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void setGrid()
+        {
         mNumCols = mColsPicker.getValue();
         mNumRows = mRowsPicker.getValue();
         mLay = (LinearLayout)findViewById(R.id.objectpicker_buttongrid);
         int width = mLay.getWidth();
         int height= mLay.getHeight();
-...
             b.setOnClickListener(this);
             b.setId(rows*mNumCols+cols);
             b.setLayoutParams(p);
             b.setBackgroundColor(COLOR_OFF);
             b.setBackgroundColor(COLOR_ON);
             tr.addView(b, p);
             mShape[rows*mNumCols+cols] = false;
             mShape[rows*mNumCols+cols] = true;
+            }
           mLay.addView(tr);
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void Create(View v)
       public int getBitmap()
+        {
         firstScreen = false;
         return mBitmap;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void Continue(View v)
+        {
         if( mObjectType==1 )
+          {
           firstScreen = false;
           mObject = new DistortedBitmap(100,100,mNumCols);
           setContentView(R.layout.vertex3dlayout);
           Default(null);
+          }
         else
+          {
           String str = "";
           View view = getLayoutInflater().inflate(R.layout.objectpicker2layout, null);
           for(int i=0; i<mNumRows*mNumCols; i++)
             str += mShape[i] ? "1" : "0";
           setContentView(view);
           mObject = new DistortedCubes(mNumCols, str, 10);
           view.post(new Runnable() {
                 @Override
                 public void run() {
                   setGrid();
+                }
             });
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void Create(View v)
+        {
         firstScreen = false;
         String str = "";
         for(int i=0; i<mNumRows*mNumCols; i++)
           str += mShape[i] ? "1" : "0";
         mObject = new DistortedCubes(mNumCols, str, 10);
         setContentView(R.layout.vertex3dlayout);
         Default(null);
-...
+        {
         switch(parent.getId())
+          {
           case R.id.objectpicker_spinnerType: mObjectType = pos; break;
           case R.id.objectpicker_spinnerType  : mObjectType = pos; break;
           case R.id.objectpicker_spinnerBitmap: switch(pos)
+                                                  {
                                                   case 0: mBitmap = R.raw.face; break;
                                                   case 1: mBitmap = R.raw.dog;  break;
                                                   case 2: mBitmap = R.raw.cat;  break;
                                                   case 3: mBitmap = R.raw.grid; break;
+                                                  }
                                                 break;
+          }
+        }
-...
+          {
           mColsPicker.setValue(mNumCols);
           mRowsPicker.setValue(mNumRows);
           if( hasFocus ) setGrid();
+          }
+        }

         public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
+          {
           InputStream is1 = mView.getContext().getResources().openRawResource(R.raw.grid);
           InputStream is2 = mView.getContext().getResources().openRawResource(R.raw.center);
           Vertex3DActivity act = (Vertex3DActivity)mView.getContext();
           InputStream is1 = act.getResources().openRawResource(act.getBitmap());
           InputStream is2 = act.getResources().openRawResource(R.raw.center);
           Bitmap bitmap1,bitmap2;

     <?xml version="1.0" encoding="utf-8"?>
        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
            <Button
             android:id="@+id/objectpicker_create"
             android:onClick="Create"
             android:text="@string/Create"
             android:layout_width="match_parent"
             android:layout_height="80dp"
             android:layout_span="3"
             android:layout_marginTop="5dp"/>
            <LinearLayout
             android:id="@+id/objectpicker_buttongrid"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
             android:gravity="center"
             android:orientation="vertical"
             android:layout_weight="0.8">
         </LinearLayout>
        </LinearLayout>

     <?xml version="1.0" encoding="utf-8"?>
        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
                      android:orientation="vertical"
                      android:layout_width="match_parent"
                      android:layout_height="match_parent"
                      android:gravity="center_vertical">
            <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:stretchColumns="1,2,3"
             android:shrinkColumns="1,2,3">
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:stretchColumns="1,2,3,4"
                android:shrinkColumns="1,2,3,4"
+               >
             <TableRow
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 android:layout_height="match_parent"
                 android:paddingTop="10dp">
                 <TextView
                     android:layout_width="wrap_content"
-...
                     android:layout_width="fill_parent"
                     android:layout_height="50dp"
                     android:id="@+id/objectpicker_spinnerType"
                     android:layout_span="3"/>
                     android:layout_span="4"/>
             </TableRow>
             <TableRow
                <TableRow
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:paddingTop="10dp">
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textAppearance="?android:attr/textAppearanceMedium"
                        android:text="@string/Bitmap"
                        android:id="@+id/textView7"
                        android:layout_marginLeft="10dp"
                        android:layout_gravity="center_vertical"/>
                    <Spinner
                        android:layout_width="wrap_content"
                        android:layout_height="50dp"
                        android:id="@+id/objectpicker_spinnerBitmap"
                        android:layout_span="4"/>
                </TableRow>
                <TableRow
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 android:layout_height="match_parent"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp">
                 <TextView
                     android:layout_width="wrap_content"
-...
                     android:text="@string/rows"
                     android:id="@+id/textView8"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="10dp"/>
                     android:layout_marginLeft="10dp"
                     />
                 <NumberPicker
                     android:id="@+id/objectpicker_rows"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:layout_span="1"
                     />
                 <TextView
-...
                     android:text="@string/cols"
                     android:id="@+id/textView9"
                     android:layout_marginLeft="10dp"
                     android:layout_gravity="center_vertical"/>
                     android:layout_gravity="center_vertical"
                     />
                 <NumberPicker
                     android:id="@+id/objectpicker_cols"
-...
            </TableLayout>
         <LinearLayout
             android:id="@+id/objectpicker_buttongrid"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:gravity="center"
             android:orientation="vertical"
             android:layout_weight="0.8">
         </LinearLayout>
         <Button
             android:id="@+id/objectpicker_create"
             android:onClick="Create"
             android:text="@string/Create"
             android:onClick="Continue"
             android:text="@string/continu"
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_span="4"

src/main/res/values/strings.xml
46	46	<string name="Default">Default</string>
47	47	<string name="save">Save</string>
48	48	<string name="Create">Create</string>
	49	<string name="Bitmap">Bitmap</string>
49	50
50	51	<string name="example_monalisa">Mona Lisa</string>
51	52	<string name="example_monalisa_subtitle">The basics of Distortions.</string>

Project

General

Profile

Distorted Android

Revision bcc8e016

Added by Leszek Koltunski over 8 years ago