/ - Diff - Distorted Android

src/main/java/org/distorted/examples/fragment3d/Fragment3DActivity.java
362	362	case 8: mObject.saturation(dyn1, regi, true ); break;
363	363	case 9: mObject.contrast (dyn1, regi, false); break;
364	364	case 10:mObject.contrast (dyn1, regi, true ); break;
365
366	365	}
367	366	}
368	367

       private ArrayList<Vertex3DEffect> mEffects;
       private int mEffectAdd;
       private float mCenterX, mCenterY;
       private float mRegionX, mRegionY, mRegionR;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         tmp.setBackgroundColor(mShape[id] ? COLOR_ON:COLOR_OFF);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void setRegion(float x, float y, float r)
+        {
         mRegionX = x;
         mRegionY = y;
         mRegionR = r;
         Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
         view.getRenderer().setRegion(mRegionX, mRegionY, mRegionR);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void setCenter(float x, float y)
-...
         return mCenterY;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public float getRegionX()
+        {
         return mRegionX;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public float getRegionY()
+        {
         return mRegionY;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public float getRegionR()
+        {
         return mRegionR;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void Continue(View v)
-...
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // 'second screen' methods
       private void setVertexView()
       private void resetData()
+        {
         mCenterX = 0.5f*getWidth();
         mCenterY = 0.5f*getHeight();
         mRegionX = 0;
         mRegionY = 0;
         mRegionR = getWidth()/2;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // 'second screen' methods
       private void setVertexView()
+        {
         resetData();
         final View view = getLayoutInflater().inflate(R.layout.vertex3dlayout, null);
-...
         layout.removeAllViews();
         mObject.abortEffects(EffectTypes.VERTEX);
         mCenterX = 0.5f*getWidth();
         mCenterY = 0.5f*getHeight();
         resetData();
         Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
         Vertex3DRenderer renderer= view.getRenderer();
         renderer.setCenter( mCenterX, mCenterY );
         renderer.setRegion( mRegionX, mRegionY, mRegionR );
         renderer.mQuat1.set(0,0,0,1);
         renderer.mQuat2.set(0,0,0,1);
+        }

         float x = (mInterCenter[0]*0.012f - 0.1f)*act.getWidth();
         float y = (mInterCenter[1]*0.012f - 0.1f)*act.getHeight();
         mCenterSta.set(x,y);
         act.setCenter(x,y);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           setCenterText();
+          }
         mAct.get().setCenter(mCenterSta.getX(),mCenterSta.getY());
         Vertex3DActivity act = mAct.get();
         act.setCenter(mCenterSta.getX(),mCenterSta.getY());
         act.setRegion(mRegionSta.getX(),mRegionSta.getY(), mRegionSta.getZ());
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

         private DistortedObject mObject;
         private DistortedBitmap mBackground;
         private DistortedBitmap mCenter;
         private DistortedBitmap mRegion;
         private int mObjWidth, mObjHeight;
         private DynamicQuat mQuatInt1, mQuatInt2;
         private Dynamic3D mMoveInter;
         private Static3D mMovePoint;
         private float mFactorObj;
         private Dynamic3D mRegionScaleInter;
         private Static3D mRegionScalePoint;
         private float mFactorObj, mFactorReg;
         Static4D mQuat1, mQuat2;
         int mScreenMin;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public Vertex3DRenderer(GLSurfaceView v)
-...
           mObject     = ((Vertex3DActivity)v.getContext()).getObject();
           mBackground = new DistortedBitmap(100, 100, 1);
           mCenter     = new DistortedBitmap(100, 100, 1);
           mRegion     = new DistortedBitmap(100, 100, 1);
           mObjWidth = mObject.getWidth();
           mObjHeight= mObject.getHeight();
-...
           mQuatInt1.add(mQuat1);
           mQuatInt2.add(mQuat2);
           mMovePoint= new Static3D(0,0,0);
           mMoveInter= new Dynamic3D();
           mMovePoint= new Static3D(0,0,0);
           mMoveInter.add(mMovePoint);
           mRegionScaleInter = new Dynamic3D();
           mRegionScalePoint = new Static3D(0,0,0);
           mRegionScaleInter.add(mRegionScalePoint);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           mMovePoint.set(mFactorObj*x,mFactorObj*y,0);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public void setRegion(float x, float y, float r)
+          {
           float f = mFactorReg*r;
           mRegionScalePoint.set(f,f,f);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public void onDrawFrame(GL10 glUnused)
-...
           mBackground.draw(time);
           mObject.draw(time);
           mCenter.draw(time);
           mRegion.draw(time);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           mObject.abortEffects(EffectTypes.MATRIX);
           mBackground.abortEffects(EffectTypes.MATRIX);
           mCenter.abortEffects(EffectTypes.MATRIX);
           mRegion.abortEffects(EffectTypes.MATRIX);
           float factorCen;
           int centerSize = mCenter.getWidth();
           int regionSize = mRegion.getWidth();
           mFactorReg = (0.5f*width)/regionSize;
           if( width*mObjHeight > height*mObjWidth ) // screen is more 'horizontal' than the Object
+            {
-...
           Vertex3DActivity act = (Vertex3DActivity)mView.getContext();
           mMovePoint.set(mFactorObj*act.getCenterX(),mFactorObj*act.getCenterY(),0);
           float f = mFactorReg*act.getRegionR();
           mRegionScalePoint.set(f,f,f);
           Static3D rotateObj = new Static3D(mObjWidth/2,mObjHeight/2, 0);
-...
           mCenter.move(mMoveInter);
           mCenter.scale(factorCen);
           mRegion.quaternion(mQuatInt1, rotateCen);
           mRegion.quaternion(mQuatInt2, rotateCen);
           mRegion.move( new Static3D( (width -mFactorReg*regionSize-mFactorObj*mObjWidth )/2 ,
                                       (height-mFactorReg*regionSize-mFactorObj*mObjHeight)/2 , 12) );
           mRegion.move(mMoveInter);
           mRegion.scale(mRegionScaleInter);
           int backgroundSize = mBackground.getWidth();
           float factorBackX = ((float)width)/backgroundSize;
           float factorBackY = ((float)height)/backgroundSize;
-...
           InputStream is1 = act.getResources().openRawResource(act.getBitmap());
           InputStream is2 = act.getResources().openRawResource(R.raw.water);
           InputStream is3 = act.getResources().openRawResource(R.raw.center);
           InputStream is4 = act.getResources().openRawResource(R.raw.region);
           Bitmap bitmap1,bitmap2,bitmap3;
           Bitmap bitmap1,bitmap2,bitmap3,bitmap4;
           try
+            {
             bitmap1 = BitmapFactory.decodeStream(is1);
             bitmap2 = BitmapFactory.decodeStream(is2);
             bitmap3 = BitmapFactory.decodeStream(is3);
             bitmap4 = BitmapFactory.decodeStream(is4);
+            }
           finally
+            {
-...
               is1.close();
               is2.close();
               is3.close();
               is4.close();
+              }
             catch(IOException e) { }
+            }
-...
           mObject.setBitmap(bitmap1);
           mBackground.setBitmap(bitmap2);
           mCenter.setBitmap(bitmap3);
           mRegion.setBitmap(bitmap4);
           try
+            {

Project

General

Profile

Distorted Android

Revision 6f779cd4

Added by Leszek Koltunski almost 8 years ago