/ - Diff - Distorted Android

     class Effects3DRenderer implements GLSurfaceView.Renderer
+    {
         private static final float FOV = 70.0f;
         private static final float NEAR = 0.1f;
         private GLSurfaceView mView;
         private DistortedTexture mObjectTexture, mBackgroundTexture, mCenterTexture, mRegionTexture;
         private DistortedEffects mObjectEffects, mBackgroundEffects, mCenterEffects, mRegionEffects;
-...
           MeshObject meshO   = act.getMesh();
           MeshFlat quad      = new MeshFlat(1,1);
           mObjWidth = mObjectTexture.getWidth();
           mObjHeight= mObjectTexture.getHeight();
           mObjDepth = mObjectTexture.getDepth(meshO);
-...
           mRegionNode = new DistortedNode(mRegionTexture, mRegionEffects, quad);
           mScreen = new DistortedScreen();
           mScreen.setProjection(FOV, NEAR);
           mScreen.attach(mBackgroundTexture, mBackgroundEffects, quad );
           mScreen.attach(mObjectTexture    , mObjectEffects    , meshO);
+          }
-...
           float factorBackX = ((float)width)/backgroundSize;
           float factorBackY = ((float)height)/backgroundSize;
           mBackgroundEffects.move(new Static3D( -width/2, -height/2,-mFactorObj*(mObjWidth+mObjHeight)/2) );
           // quite tricky: move the background exactly to the FAR plane! (see DistortedOutputSurface.setProjection() )
           mBackgroundEffects.move(new Static3D( -width/2, -height/2, -height*(1.0f-NEAR)/(2.0f*(float)Math.tan(FOV*Math.PI/360))) );
           mBackgroundEffects.scale(new Static3D(2*factorBackX, 2*factorBackY, 1.0f) );
           mScreen.resize(width, height);

             if( depth ) mRoot.glEnable (GLES30.GL_DEPTH_TEST);
             else        mRoot.glDisable(GLES30.GL_DEPTH_TEST);
             mRoot.glDepthMask(depth);
             // TODO for some reason this does not work - investigate.
             //mRoot.glDepthMask(depth);
             // we can also, to save memory, delete/recreate
             // the depth buffer each time. This is optional.

     public class ProjectionActivity extends Activity implements OnSeekBarChangeListener
+    {
         private TextView textF, textX, textY;
         private TextView textF, textN;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           setContentView(R.layout.projectionlayout);
           textF = (TextView)findViewById(R.id.projectionTextFOV);
           textX = (TextView)findViewById(R.id.projectionTextX);
           textY = (TextView)findViewById(R.id.projectionTextY);
           textN = (TextView)findViewById(R.id.projectionTextNear);
           SeekBar bar;
           bar = (SeekBar)findViewById(R.id.projectionSeekFOV);
           bar.setOnSeekBarChangeListener(this);
           bar.setProgress(50);
           bar = (SeekBar)findViewById(R.id.projectionSeekX);
           bar.setOnSeekBarChangeListener(this);
           bar.setProgress(50);
           bar = (SeekBar)findViewById(R.id.projectionSeekY);
           bar = (SeekBar)findViewById(R.id.projectionSeekNear);
           bar.setOnSeekBarChangeListener(this);
           bar.setProgress(50);
+          }
-...
         public void onProgressChanged(SeekBar bar, int progress, boolean fromUser)
+          {
           int ret;
           float ret;
           ProjectionSurfaceView view = (ProjectionSurfaceView)findViewById(R.id.surfaceViewProjection);
           ProjectionRenderer renderer = view.getRenderer();
           switch (bar.getId())
+            {
             case R.id.projectionSeekFOV: ret = renderer.setFOV(progress);
                                          textF.setText(getString(R.string.fov_placeholder,ret));
                                          break;
             case R.id.projectionSeekX  : ret = renderer.setX(progress);
                                          textX.setText(getString(R.string.x_placeholder,ret));
                                          break;
             case R.id.projectionSeekY  : ret = renderer.setY(progress);
                                          textY.setText(getString(R.string.y_placeholder,ret));
                                          break;
             case R.id.projectionSeekFOV : ret = renderer.setFOV(progress);
                                           textF.setText(getString(R.string.fov_placeholder,(int)ret));
                                           break;
             case R.id.projectionSeekNear: ret = renderer.setNear(progress);
                                           textN.setText(getString(R.string.near_placeholder,ret));
                                           break;
+            }
+          }

        private DistortedEffects mEffects;
        private DistortedScreen mScreen;
        private float mF, mX, mY;
        private int mWidth, mHeight;
        private float mF, mNear;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        int setFOV(int f)
        float setFOV(int f)
+          {
           mF = f;
           mScreen.setProjection(mF,mX,mY);
           return (int)mF;
           mScreen.setProjection(mF,mNear);
           return mF;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        int setX(int x)
        float setNear(int near)
+          {
           mX = (x-50)*0.02f*mWidth;
           mScreen.setProjection(mF,mX,mY);
           return (int)mX;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        int setY(int y)
+          {
           mY = (y-50)*0.02f*mHeight;
           mScreen.setProjection(mF,mX,mY);
           return (int)mY;
           mNear = near/100.0f;
           mScreen.setProjection(mF,mNear);
           return mNear;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
        public void onSurfaceChanged(GL10 glUnused, int width, int height)
+          {
           mWidth = width;
           mHeight= height;
           mScreen.setProjection(mF,mX,mY);
           mScreen.setProjection(mF,mNear);
           mEffects.abortAllEffects();
           Paint paint = new Paint();

src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java
137	137	}
138	138
139	139	mScreen = new DistortedScreen();
140		mScreen.setProjection(60.0f, 0.0f, 0.0f);
	140	mScreen.setProjection(60.0f, 0.02f);
141	141	}
142	142
143	143	///////////////////////////////////////////////////////////////////////////////////////////////////

             android:paddingTop="5dp" >
             <TextView
                 android:id="@+id/projectionTextX"
                 android:id="@+id/projectionTextNear"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="0.5"
-...
                 android:textAppearance="?android:attr/textAppearanceMedium" />
             <SeekBar
                 android:id="@+id/projectionSeekX"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp" />
         </LinearLayout>
         <LinearLayout
             android:id="@+id/linearLayout3"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="center|fill_horizontal"
             android:orientation="horizontal"
             android:paddingBottom="5dp"
             android:paddingTop="5dp" >
             <TextView
                 android:id="@+id/projectionTextY"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="0.5"
                 android:paddingStart="15dp"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
             <SeekBar
                 android:id="@+id/projectionSeekY"
                 android:id="@+id/projectionSeekNear"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"

         <string name="size_placeholder">Size %1$.1f</string>
         <string name="hips_placeholder">Hips %1$d</string>
         <string name="fov_placeholder">FOV: %1$d</string>
         <string name="x_placeholder">X: %1$d</string>
         <string name="y_placeholder">Y: %1$d</string>
         <string name="near_placeholder">Near: %1$.2f</string>
         <string name="wind_placeholder">Wind: %1$d</string>
         <string name="blur_placeholder">Blur: %1$d</string>

Project

General

Profile

Distorted Android

Revision af662543

Added by Leszek Koltunski almost 8 years ago