commit 4b7c432e195a6dd228c0b13de8da3b1de42e8fef Author: Leszek Koltunski Date: Sun May 17 22:04:18 2020 +0100 Progress (?) with Predeform: give up trying to render the Mesh in Activity1. diff --git a/src/main/java/org/distorted/examples/predeform/PredeformActivity.java b/src/main/java/org/distorted/examples/predeform/PredeformActivity.java index 5dc2a74..7892524 100644 --- a/src/main/java/org/distorted/examples/predeform/PredeformActivity.java +++ b/src/main/java/org/distorted/examples/predeform/PredeformActivity.java @@ -21,36 +21,37 @@ package org.distorted.examples.predeform; import android.app.Activity; import android.content.Intent; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Canvas; -import android.graphics.Paint; import android.os.Bundle; +import android.view.Gravity; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.LinearLayout; import android.widget.NumberPicker; import android.widget.Spinner; +import android.widget.TableRow; import org.distorted.examples.R; -import org.distorted.library.mesh.MeshBase; - -import java.io.IOException; -import java.io.InputStream; /////////////////////////////////////////////////////////////////////////////////////////////////// -public class PredeformActivity extends Activity implements AdapterView.OnItemSelectedListener +public class PredeformActivity extends Activity + implements View.OnClickListener, AdapterView.OnItemSelectedListener { - private int mNumCols; - private int mNumRows; - private int mNumSlic; - private int mObjectType; - private int mBitmapID; - + private static final int COLOR_OFF = 0xffffe81f; + private static final int COLOR_ON = 0xff0000ff; + private static final int COLOR_INAC= 0xff999999; + + private int mNumCols = 1; + private int mNumRows = 1; + private int mNumSlic = 1; + private boolean mGridInitialized; private NumberPicker mColsPicker, mRowsPicker, mSlicPicker; private boolean[] mShape; - private MeshBase mMesh; + private int mObjectType; + private int mBitmapID; + private LinearLayout mLay; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -59,13 +60,9 @@ public class PredeformActivity extends Activity implements AdapterView.OnItemSel { super.onCreate(savedState); - mNumCols = 1; - mNumRows = 1; - mNumSlic = 1; - mBitmapID=-1; - resetShape(); + setContentView(R.layout.objectpickerlayout); - setContentView(R.layout.object_picker_layout); + mLay = findViewById(R.id.objectpicker_buttongrid); mColsPicker = findViewById(R.id.objectpicker_cols); mRowsPicker = findViewById(R.id.objectpicker_rows); @@ -83,8 +80,7 @@ public class PredeformActivity extends Activity implements AdapterView.OnItemSel @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - mNumCols = newVal; - resetShape(); + setGrid(); } }); @@ -93,8 +89,7 @@ public class PredeformActivity extends Activity implements AdapterView.OnItemSel @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - mNumRows = newVal; - resetShape(); + setGrid(); } }); @@ -103,21 +98,21 @@ public class PredeformActivity extends Activity implements AdapterView.OnItemSel @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - mNumSlic = newVal; - resetShape(); + mNumSlic = mSlicPicker.getValue(); } }); mObjectType = 0; + mGridInitialized = false; Spinner typeSpinner = findViewById(R.id.objectpicker_spinnerType); typeSpinner.setOnItemSelectedListener(this); String[] objectType = new String[PredeformMeshList.LENGTH]; - for(int mesh = 0; mesh< PredeformMeshList.LENGTH; mesh++) + for(int mesh=0; mesh adapterType = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, objectType); @@ -135,97 +130,65 @@ public class PredeformActivity extends Activity implements AdapterView.OnItemSel bitmapSpinner.setAdapter(adapterBitmap); } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void resetShape() - { - mShape = new boolean[mNumRows*mNumCols]; - - for (int rows=0; rows0 ? (int)( 0.9f*width / mNumCols) : 0; + int h = mNumRows>0 ? (int)( 0.9f*height/ mNumRows) : 0; + int size= Math.min(w, h); + int pad = size<20 ? 1 : size/20; -/////////////////////////////////////////////////////////////////////////////////////////////////// + mLay.removeAllViews(); - private void recreateObject() - { - String str = PredeformMeshList.getString(mObjectType, mNumCols, mNumRows, mShape); - mMesh = PredeformMeshList.createMesh(mObjectType, mNumCols, mNumRows, mNumSlic, mBitmapID, str); - } + mShape = new boolean[mNumRows*mNumCols]; -/////////////////////////////////////////////////////////////////////////////////////////////////// + TableRow.LayoutParams p = new TableRow.LayoutParams(); - private Bitmap createBitmap(int bitmapID) - { - int size = mNumCols > mNumRows ? (Math.max(mNumCols, mNumSlic)) : (Math.max(mNumRows, mNumSlic)); + p.rightMargin = pad; + p.leftMargin = pad; + p.topMargin = pad; + p.bottomMargin = pad; + p.height = size; + p.width = size; - if( bitmapID!=-1) - { - try (InputStream is = getResources().openRawResource(bitmapID)) - { - return BitmapFactory.decodeStream(is); - } - catch( IOException ex ) { android.util.Log.e("act", "failed to open resource "+bitmapID); } - } - else + for (int rows=0; rows=1); mColsPicker.setEnabled(dim>=2); mSlicPicker.setEnabled(dim>=3); - - recreateObject(); } break; case R.id.objectpicker_spinnerBitmap: switch(pos) @@ -293,9 +260,6 @@ public class PredeformActivity extends Activity implements AdapterView.OnItemSel case 6: mBitmapID = R.raw.monalisa; break; case 7: mBitmapID = R.raw.world ; break; } - - PredeformSurfaceView v = findViewById(R.id.predeformSurfaceView); - v.getRenderer().setTexture( createBitmap(mBitmapID) ); break; } } @@ -319,6 +283,6 @@ public class PredeformActivity extends Activity implements AdapterView.OnItemSel mRowsPicker.setValue(mNumRows); mSlicPicker.setValue(mNumSlic); - resetShape(); + if( !mGridInitialized ) setGrid(); } } diff --git a/src/main/java/org/distorted/examples/predeform/PredeformActivity2.java b/src/main/java/org/distorted/examples/predeform/PredeformActivity2.java index 055e039..4bfdc7f 100644 --- a/src/main/java/org/distorted/examples/predeform/PredeformActivity2.java +++ b/src/main/java/org/distorted/examples/predeform/PredeformActivity2.java @@ -56,7 +56,7 @@ public class PredeformActivity2 extends Activity implements SeekBar.OnSeekBarCha @Override protected void onPause() { - GLSurfaceView mView = findViewById(R.id.predeform2SurfaceView); + GLSurfaceView mView = findViewById(R.id.predeformSurfaceView); if( mView!=null ) mView.onPause(); DistortedLibrary.onPause(); @@ -70,7 +70,7 @@ public class PredeformActivity2 extends Activity implements SeekBar.OnSeekBarCha { super.onResume(); - GLSurfaceView mView = findViewById(R.id.predeform2SurfaceView); + GLSurfaceView mView = findViewById(R.id.predeformSurfaceView); if( mView!=null ) mView.onResume(); } @@ -107,7 +107,7 @@ public class PredeformActivity2 extends Activity implements SeekBar.OnSeekBarCha setContentView(R.layout.predeformlayout); - Spinner renderSpinner = findViewById(R.id.predeform2SpinnerMode); + Spinner renderSpinner = findViewById(R.id.predeformSpinnerMode); renderSpinner.setOnItemSelectedListener(this); String[] objectBitmap = new String[] { "Render: Normal", "Render: OIT" }; @@ -116,13 +116,13 @@ public class PredeformActivity2 extends Activity implements SeekBar.OnSeekBarCha adapterBitmap.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); renderSpinner.setAdapter(adapterBitmap); - mTextLevel = findViewById(R.id.predeform2InflateText); + mTextLevel = findViewById(R.id.predeformInflateText); - SeekBar transparencyBar = findViewById(R.id.predeform2Transparency); + SeekBar transparencyBar = findViewById(R.id.predeformTransparency); transparencyBar.setOnSeekBarChangeListener(this); transparencyBar.setProgress(50); - SeekBar inflateBar = findViewById(R.id.predeform2InflateLevel); + SeekBar inflateBar = findViewById(R.id.predeformInflateLevel); inflateBar.setOnSeekBarChangeListener(this); inflateBar.setProgress(50); } @@ -195,10 +195,10 @@ public class PredeformActivity2 extends Activity implements SeekBar.OnSeekBarCha public void onItemSelected(AdapterView parent, View view, int pos, long id) { - PredeformSurfaceView2 v = findViewById(R.id.predeform2SurfaceView); - PredeformRenderer2 renderer = v.getRenderer(); + PredeformSurfaceView v = findViewById(R.id.predeformSurfaceView); + PredeformRenderer renderer = v.getRenderer(); - if( parent.getId()==R.id.predeform2SpinnerMode) + if( parent.getId()==R.id.predeformSpinnerMode) { renderer.setRenderModeToOIT(pos==1); } @@ -216,13 +216,13 @@ public class PredeformActivity2 extends Activity implements SeekBar.OnSeekBarCha { switch (bar.getId()) { - case R.id.predeform2Transparency: PredeformSurfaceView2 v1 = findViewById(R.id.predeform2SurfaceView); - v1.getRenderer().setTransparency(progress); - break; - case R.id.predeform2InflateLevel: PredeformSurfaceView2 v2 = findViewById(R.id.predeform2SurfaceView); - float level = v2.getRenderer().setLevel(progress); - mTextLevel.setText(getString(R.string.inflate_placeholder, level)); - break; + case R.id.predeformTransparency: PredeformSurfaceView v1 = findViewById(R.id.predeformSurfaceView); + v1.getRenderer().setTransparency(progress); + break; + case R.id.predeformInflateLevel: PredeformSurfaceView v2 = findViewById(R.id.predeformSurfaceView); + float level = v2.getRenderer().setLevel(progress); + mTextLevel.setText(getString(R.string.inflate_placeholder, level)); + break; } } diff --git a/src/main/java/org/distorted/examples/predeform/PredeformRenderer.java b/src/main/java/org/distorted/examples/predeform/PredeformRenderer.java index 1898f95..0fa0bac 100644 --- a/src/main/java/org/distorted/examples/predeform/PredeformRenderer.java +++ b/src/main/java/org/distorted/examples/predeform/PredeformRenderer.java @@ -19,16 +19,21 @@ package org.distorted.examples.predeform; -import android.graphics.Bitmap; import android.opengl.GLSurfaceView; +import org.distorted.library.effect.FragmentEffectAlpha; +import org.distorted.library.effect.MatrixEffectQuaternion; import org.distorted.library.effect.MatrixEffectScale; +import org.distorted.library.effect.VertexEffectScale; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshBase; +import org.distorted.library.type.DynamicQuat; +import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; +import org.distorted.library.type.Static4D; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; @@ -37,7 +42,7 @@ import javax.microedition.khronos.opengles.GL10; class PredeformRenderer implements GLSurfaceView.Renderer { - private static final float FOV = 0.0f; + private static final float FOV = 30.0f; private static final float NEAR = 0.1f; private GLSurfaceView mView; @@ -45,7 +50,12 @@ class PredeformRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects; private MeshBase mMesh; private DistortedScreen mScreen; + private float mObjWidth, mObjHeight, mObjDepth; private Static3D mScale; + private Static1D mAlpha; + + Static4D mQuat1, mQuat2; + int mScreenMin; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -53,10 +63,35 @@ class PredeformRenderer implements GLSurfaceView.Renderer { mView = v; + mAlpha = new Static1D(1.0f); mScale= new Static3D(1,1,1); - mTexture = new DistortedTexture(); + + Static3D center=new Static3D(0,0,0); + + PredeformActivity2 act = (PredeformActivity2)v.getContext(); + + mTexture = act.getTexture(); + mMesh = act.getMesh(); + + mObjWidth = act.getCols(); + mObjHeight= act.getRows(); + mObjDepth = act.getSlic(); + + mQuat1 = new Static4D(0,0,0,1); // unity + mQuat2 = new Static4D(0,0,0,1); // quaternions + + DynamicQuat quatInt1 = new DynamicQuat(0,0.5f); + DynamicQuat quatInt2 = new DynamicQuat(0,0.5f); + + quatInt1.add(mQuat1); + quatInt2.add(mQuat2); + mEffects = new DistortedEffects(); + mEffects.apply( new VertexEffectScale(new Static3D(mObjWidth,mObjHeight,mObjDepth) ) ); mEffects.apply( new MatrixEffectScale(mScale)); + mEffects.apply( new MatrixEffectQuaternion(quatInt2, center) ); + mEffects.apply( new MatrixEffectQuaternion(quatInt1, center) ); + mEffects.apply( new FragmentEffectAlpha(mAlpha)); mScreen = new DistortedScreen(); mScreen.glClearColor(1.0f,1.0f,1.0f,0.0f); @@ -64,48 +99,61 @@ class PredeformRenderer implements GLSurfaceView.Renderer } /////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + mScreen.render( System.currentTimeMillis() ); + } - void setMesh(MeshBase mesh) +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) { - mMesh = mesh; + final float SCALE = 0.75f; + + mScreenMin = Math.min(width, height); + float factor = ( width*mObjHeight > height*mObjWidth ) ? (SCALE*height)/mObjHeight : (SCALE*width)/mObjWidth; + mScale.set(factor,factor,factor); + mScreen.resize(width, height); } /////////////////////////////////////////////////////////////////////////////////////////////////// - void setTexture(Bitmap bmp) + void setRenderModeToOIT(boolean oit) { - mTexture.setTexture(bmp); + mScreen.setOrderIndependentTransparency(oit); } /////////////////////////////////////////////////////////////////////////////////////////////////// - public void onDrawFrame(GL10 glUnused) + void setTransparency(int level) { - mScreen.render( System.currentTimeMillis() ); + mAlpha.set((float)level/100.0f); } /////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) + + float setLevel(int level) { - final float SCALE = 0.75f; + float inflateLevel = (level-50)/50.0f; + mMesh.setInflate(inflateLevel); - float factor = ( width > height ) ? SCALE*height : SCALE*width; - mScale.set(factor,factor,factor); - mScreen.resize(width, height); + return inflateLevel; } /////////////////////////////////////////////////////////////////////////////////////////////////// public void onSurfaceCreated(GL10 glUnused, EGLConfig config) { - PredeformActivity act = (PredeformActivity)mView.getContext(); + PredeformActivity2 act = (PredeformActivity2)mView.getContext(); - mMesh = act.getMesh(); mTexture.setTexture( act.getBitmap() ); mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); + VertexEffectScale.enable(); + FragmentEffectAlpha.enable(); + try { DistortedLibrary.onCreate(act); diff --git a/src/main/java/org/distorted/examples/predeform/PredeformRenderer2.java b/src/main/java/org/distorted/examples/predeform/PredeformRenderer2.java deleted file mode 100644 index d526f6e..0000000 --- a/src/main/java/org/distorted/examples/predeform/PredeformRenderer2.java +++ /dev/null @@ -1,166 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2016 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.examples.predeform; - -import android.opengl.GLSurfaceView; - -import org.distorted.library.effect.FragmentEffectAlpha; -import org.distorted.library.effect.MatrixEffectQuaternion; -import org.distorted.library.effect.MatrixEffectScale; -import org.distorted.library.effect.VertexEffectScale; -import org.distorted.library.main.DistortedEffects; -import org.distorted.library.main.DistortedLibrary; -import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshBase; -import org.distorted.library.type.DynamicQuat; -import org.distorted.library.type.Static1D; -import org.distorted.library.type.Static3D; -import org.distorted.library.type.Static4D; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class PredeformRenderer2 implements GLSurfaceView.Renderer -{ - private static final float FOV = 30.0f; - private static final float NEAR = 0.1f; - - private GLSurfaceView mView; - private DistortedTexture mTexture; - private DistortedEffects mEffects; - private MeshBase mMesh; - private DistortedScreen mScreen; - private float mObjWidth, mObjHeight, mObjDepth; - private Static3D mScale; - private Static1D mAlpha; - - Static4D mQuat1, mQuat2; - int mScreenMin; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - PredeformRenderer2(GLSurfaceView v) - { - mView = v; - - mAlpha = new Static1D(1.0f); - mScale= new Static3D(1,1,1); - - Static3D center=new Static3D(0,0,0); - - PredeformActivity2 act = (PredeformActivity2)v.getContext(); - - mTexture = act.getTexture(); - mMesh = act.getMesh(); - - mObjWidth = act.getCols(); - mObjHeight= act.getRows(); - mObjDepth = act.getSlic(); - - mQuat1 = new Static4D(0,0,0,1); // unity - mQuat2 = new Static4D(0,0,0,1); // quaternions - - DynamicQuat quatInt1 = new DynamicQuat(0,0.5f); - DynamicQuat quatInt2 = new DynamicQuat(0,0.5f); - - quatInt1.add(mQuat1); - quatInt2.add(mQuat2); - - mEffects = new DistortedEffects(); - mEffects.apply( new VertexEffectScale(new Static3D(mObjWidth,mObjHeight,mObjDepth) ) ); - mEffects.apply( new MatrixEffectScale(mScale)); - mEffects.apply( new MatrixEffectQuaternion(quatInt2, center) ); - mEffects.apply( new MatrixEffectQuaternion(quatInt1, center) ); - mEffects.apply( new FragmentEffectAlpha(mAlpha)); - - mScreen = new DistortedScreen(); - mScreen.glClearColor(1.0f,1.0f,1.0f,0.0f); - mScreen.setProjection(FOV, NEAR); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - mScreen.render( System.currentTimeMillis() ); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - final float SCALE = 0.75f; - - mScreenMin = Math.min(width, height); - float factor = ( width*mObjHeight > height*mObjWidth ) ? (SCALE*height)/mObjHeight : (SCALE*width)/mObjWidth; - mScale.set(factor,factor,factor); - mScreen.resize(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - void setRenderModeToOIT(boolean oit) - { - mScreen.setOrderIndependentTransparency(oit); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - void setTransparency(int level) - { - mAlpha.set((float)level/100.0f); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - float setLevel(int level) - { - float inflateLevel = (level-50)/50.0f; - mMesh.setInflate(inflateLevel); - - return inflateLevel; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - PredeformActivity2 act = (PredeformActivity2)mView.getContext(); - - mTexture.setTexture( act.getBitmap() ); - mScreen.detachAll(); - mScreen.attach(mTexture,mEffects,mMesh); - - VertexEffectScale.enable(); - FragmentEffectAlpha.enable(); - - try - { - DistortedLibrary.onCreate(act); - } - catch(Exception ex) - { - android.util.Log.e("Inflate", ex.getMessage() ); - } - } -} diff --git a/src/main/java/org/distorted/examples/predeform/PredeformSurfaceView.java b/src/main/java/org/distorted/examples/predeform/PredeformSurfaceView.java index 7fdcfe1..ad17dd8 100644 --- a/src/main/java/org/distorted/examples/predeform/PredeformSurfaceView.java +++ b/src/main/java/org/distorted/examples/predeform/PredeformSurfaceView.java @@ -24,11 +24,17 @@ import android.content.Context; import android.content.pm.ConfigurationInfo; import android.opengl.GLSurfaceView; import android.util.AttributeSet; +import android.view.MotionEvent; +import android.widget.Toast; + +import org.distorted.examples.R; /////////////////////////////////////////////////////////////////////////////////////////////////// class PredeformSurfaceView extends GLSurfaceView { + private final static int DIRECTION_SENSITIVITY= 12; + private int mX, mY; private PredeformRenderer mRenderer; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -37,6 +43,9 @@ class PredeformSurfaceView extends GLSurfaceView { super(context,attrs); + mX = -1; + mY = -1; + if(!isInEditMode()) { mRenderer = new PredeformRenderer(this); @@ -44,6 +53,7 @@ class PredeformSurfaceView extends GLSurfaceView final ConfigurationInfo configurationInfo = activityManager.getDeviceConfigurationInfo(); setEGLContextClientVersion( (configurationInfo.reqGlEsVersion>>16) >= 3 ? 3:2 ); setRenderer(mRenderer); + Toast.makeText(context, R.string.example_rotate_toast , Toast.LENGTH_SHORT).show(); } } @@ -53,5 +63,79 @@ class PredeformSurfaceView extends GLSurfaceView { return mRenderer; } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void resetQuats() + { + float qx = mRenderer.mQuat1.get0(); + float qy = mRenderer.mQuat1.get1(); + float qz = mRenderer.mQuat1.get2(); + float qw = mRenderer.mQuat1.get3(); + + float rx = mRenderer.mQuat2.get0(); + float ry = mRenderer.mQuat2.get1(); + float rz = mRenderer.mQuat2.get2(); + float rw = mRenderer.mQuat2.get3(); + + float tx = rw*qx - rz*qy + ry*qz + rx*qw; + float ty = rw*qy + rz*qx + ry*qw - rx*qz; + float tz = rw*qz + rz*qw - ry*qx + rx*qy; + float tw = rw*qw - rz*qz - ry*qy - rx*qx; + + mRenderer.mQuat1.set(0f, 0f, 0f, 1f); + mRenderer.mQuat2.set(tx, ty, tz, tw); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override public boolean onTouchEvent(MotionEvent event) + { + int action = event.getAction(); + int x = (int)event.getX(); + int y = (int)event.getY(); + + switch(action) + { + case MotionEvent.ACTION_DOWN: mX = x; + mY = y; + break; + + case MotionEvent.ACTION_MOVE: if( mX>=0 && mY>= 0 ) + { + float px = mY-y; + float py = mX-x; + float pz = 0; + float plen = (float)Math.sqrt(px*px + py*py + pz*pz); + + if( plen>0 ) + { + px /= plen; + py /= plen; + pz /= plen; + + float cosA = (float)Math.cos(plen*3.14f/mRenderer.mScreenMin); + float sinA = (float)Math.sqrt(1-cosA*cosA); + + mRenderer.mQuat1.set(px*sinA, py*sinA, pz*sinA, cosA); + } + } + if( (mX-x)*(mX-x) + (mY-y)*(mY-y) > mRenderer.mScreenMin*mRenderer.mScreenMin/(DIRECTION_SENSITIVITY*DIRECTION_SENSITIVITY) ) + { + mX = x; + mY = y; + resetQuats(); + } + break; + + case MotionEvent.ACTION_UP : mX = -1; + mY = -1; + resetQuats(); + break; + } + + return true; + } + } diff --git a/src/main/java/org/distorted/examples/predeform/PredeformSurfaceView2.java b/src/main/java/org/distorted/examples/predeform/PredeformSurfaceView2.java deleted file mode 100644 index 6be4f08..0000000 --- a/src/main/java/org/distorted/examples/predeform/PredeformSurfaceView2.java +++ /dev/null @@ -1,141 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2016 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.examples.predeform; - -import android.app.ActivityManager; -import android.content.Context; -import android.content.pm.ConfigurationInfo; -import android.opengl.GLSurfaceView; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.widget.Toast; - -import org.distorted.examples.R; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class PredeformSurfaceView2 extends GLSurfaceView -{ - private final static int DIRECTION_SENSITIVITY= 12; - private int mX, mY; - private PredeformRenderer2 mRenderer; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public PredeformSurfaceView2(Context context, AttributeSet attrs) - { - super(context,attrs); - - mX = -1; - mY = -1; - - if(!isInEditMode()) - { - mRenderer = new PredeformRenderer2(this); - final ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); - final ConfigurationInfo configurationInfo = activityManager.getDeviceConfigurationInfo(); - setEGLContextClientVersion( (configurationInfo.reqGlEsVersion>>16) >= 3 ? 3:2 ); - setRenderer(mRenderer); - Toast.makeText(context, R.string.example_rotate_toast , Toast.LENGTH_SHORT).show(); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public PredeformRenderer2 getRenderer() - { - return mRenderer; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void resetQuats() - { - float qx = mRenderer.mQuat1.get0(); - float qy = mRenderer.mQuat1.get1(); - float qz = mRenderer.mQuat1.get2(); - float qw = mRenderer.mQuat1.get3(); - - float rx = mRenderer.mQuat2.get0(); - float ry = mRenderer.mQuat2.get1(); - float rz = mRenderer.mQuat2.get2(); - float rw = mRenderer.mQuat2.get3(); - - float tx = rw*qx - rz*qy + ry*qz + rx*qw; - float ty = rw*qy + rz*qx + ry*qw - rx*qz; - float tz = rw*qz + rz*qw - ry*qx + rx*qy; - float tw = rw*qw - rz*qz - ry*qy - rx*qx; - - mRenderer.mQuat1.set(0f, 0f, 0f, 1f); - mRenderer.mQuat2.set(tx, ty, tz, tw); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override public boolean onTouchEvent(MotionEvent event) - { - int action = event.getAction(); - int x = (int)event.getX(); - int y = (int)event.getY(); - - switch(action) - { - case MotionEvent.ACTION_DOWN: mX = x; - mY = y; - break; - - case MotionEvent.ACTION_MOVE: if( mX>=0 && mY>= 0 ) - { - float px = mY-y; - float py = mX-x; - float pz = 0; - float plen = (float)Math.sqrt(px*px + py*py + pz*pz); - - if( plen>0 ) - { - px /= plen; - py /= plen; - pz /= plen; - - float cosA = (float)Math.cos(plen*3.14f/mRenderer.mScreenMin); - float sinA = (float)Math.sqrt(1-cosA*cosA); - - mRenderer.mQuat1.set(px*sinA, py*sinA, pz*sinA, cosA); - } - } - if( (mX-x)*(mX-x) + (mY-y)*(mY-y) > mRenderer.mScreenMin*mRenderer.mScreenMin/(DIRECTION_SENSITIVITY*DIRECTION_SENSITIVITY) ) - { - mX = x; - mY = y; - resetQuats(); - } - break; - - case MotionEvent.ACTION_UP : mX = -1; - mY = -1; - resetQuats(); - break; - } - - return true; - } - -} - diff --git a/src/main/res/layout/object_picker_layout.xml b/src/main/res/layout/object_picker_layout.xml deleted file mode 100644 index 422be64..0000000 --- a/src/main/res/layout/object_picker_layout.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - -