commit 5068fa0676e56b41d2e420b09adb95eef55f9532 Author: Leszek Koltunski Date: Wed May 25 21:12:27 2016 +0100 Initial commit diff --git a/build.gradle b/build.gradle index 3a58f4c..9eaca95 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "23.0.3" defaultConfig { - applicationId "org.distortedandroid.examples" + applicationId "org.distorted.examples" minSdkVersion 15 targetSdkVersion 23 } diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index f09a462..c6252b6 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/src/main/java/org/distorted/examples/TableOfContents.java b/src/main/java/org/distorted/examples/TableOfContents.java new file mode 100644 index 0000000..320527e --- /dev/null +++ b/src/main/java/org/distorted/examples/TableOfContents.java @@ -0,0 +1,262 @@ +package org.distorted.examples; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import android.app.Activity; +import android.app.ListActivity; +import android.content.Intent; +import android.os.Bundle; +import android.util.SparseArray; +import android.view.View; +import android.widget.AdapterView; +import android.widget.AdapterView.OnItemClickListener; +import android.widget.SimpleAdapter; + +import org.distorted.examples.R; +import org.distorted.examples.monalisa.MonaLisaActivity; +import org.distorted.examples.sink.SinkActivity; +import org.distorted.examples.fov.FOVActivity; +import org.distorted.examples.deform.DeformActivity; +import org.distorted.examples.listener.ListenerActivity; +import org.distorted.examples.interpolator.InterpolatorActivity; +import org.distorted.examples.girl.GirlActivity; +import org.distorted.examples.macroblock.MacroblockActivity; +import org.distorted.examples.movingeffects.MovingEffectsActivity; +import org.distorted.examples.olimpic.OlimpicActivity; +import org.distorted.examples.differenteffects.DifferentEffectsActivity; +import org.distorted.examples.differentbitmaps.DifferentBitmapsActivity; +import org.distorted.examples.scratchpad.ScratchpadActivity; +import org.distorted.examples.check.CheckActivity; +import org.distorted.examples.bean.BeanActivity; +import org.distorted.examples.fbo.FBOActivity; +import org.distorted.examples.starwars.StarWarsActivity; +import org.distorted.examples.cubes.CubesActivity; +import org.distorted.examples.quaternion.QuaternionActivity; +import org.distorted.examples.effects3d.Effects3DActivity; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class TableOfContents extends ListActivity + { + private static final String ITEM_IMAGE = "item_image"; + private static final String ITEM_TITLE = "item_title"; + private static final String ITEM_SUBTITLE = "item_subtitle"; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setTitle(R.string.toc); + setContentView(R.layout.table_of_contents); + + final List> data = new ArrayList>(); + final SparseArray> activityMapping = new SparseArray>(); + + int i = 0; + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_monalisa); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_monalisa)); + item.put(ITEM_SUBTITLE, getText(R.string.example_monalisa_subtitle)); + data.add(item); + activityMapping.put(i++, MonaLisaActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_sink); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_sink)); + item.put(ITEM_SUBTITLE, getText(R.string.example_sink_subtitle)); + data.add(item); + activityMapping.put(i++, SinkActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_bean); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_bean)); + item.put(ITEM_SUBTITLE, getText(R.string.example_bean_subtitle)); + data.add(item); + activityMapping.put(i++, BeanActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_fov); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_fov)); + item.put(ITEM_SUBTITLE, getText(R.string.example_fov_subtitle)); + data.add(item); + activityMapping.put(i++, FOVActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_deform); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_deform)); + item.put(ITEM_SUBTITLE, getText(R.string.example_deform_subtitle)); + data.add(item); + activityMapping.put(i++, DeformActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_listener); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_listener)); + item.put(ITEM_SUBTITLE, getText(R.string.example_listener_subtitle)); + data.add(item); + activityMapping.put(i++, ListenerActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_interpolator); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_interpolator)); + item.put(ITEM_SUBTITLE, getText(R.string.example_interpolator_subtitle)); + data.add(item); + activityMapping.put(i++, InterpolatorActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_girl); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_girl)); + item.put(ITEM_SUBTITLE, getText(R.string.example_girl_subtitle)); + data.add(item); + activityMapping.put(i++, GirlActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_macroblock); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_macroblock)); + item.put(ITEM_SUBTITLE, getText(R.string.example_macroblock_subtitle)); + data.add(item); + activityMapping.put(i++, MacroblockActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_movingeffects); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_movingeffects)); + item.put(ITEM_SUBTITLE, getText(R.string.example_movingeffects_subtitle)); + data.add(item); + activityMapping.put(i++, MovingEffectsActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_differenteffects); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_differenteffects)); + item.put(ITEM_SUBTITLE, getText(R.string.example_differenteffects_subtitle)); + data.add(item); + activityMapping.put(i++, DifferentEffectsActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_differentbitmaps); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_differentbitmaps)); + item.put(ITEM_SUBTITLE, getText(R.string.example_differentbitmaps_subtitle)); + data.add(item); + activityMapping.put(i++, DifferentBitmapsActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_scratchpad); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_scratchpad)); + item.put(ITEM_SUBTITLE, getText(R.string.example_scratchpad_subtitle)); + data.add(item); + activityMapping.put(i++, ScratchpadActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_check); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_check)); + item.put(ITEM_SUBTITLE, getText(R.string.example_check_subtitle)); + data.add(item); + activityMapping.put(i++, CheckActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_fbo); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_fbo)); + item.put(ITEM_SUBTITLE, getText(R.string.example_fbo_subtitle)); + data.add(item); + activityMapping.put(i++, FBOActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_starwars); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_starwars)); + item.put(ITEM_SUBTITLE, getText(R.string.example_starwars_subtitle)); + data.add(item); + activityMapping.put(i++, StarWarsActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_olimpic); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_olimpic)); + item.put(ITEM_SUBTITLE, getText(R.string.example_olimpic_subtitle)); + data.add(item); + activityMapping.put(i++, OlimpicActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_quaternion); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_quaternion)); + item.put(ITEM_SUBTITLE, getText(R.string.example_quaternion_subtitle)); + data.add(item); + activityMapping.put(i++, QuaternionActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_cubes); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_cubes)); + item.put(ITEM_SUBTITLE, getText(R.string.example_cubes_subtitle)); + data.add(item); + activityMapping.put(i++, CubesActivity.class); + } + + { + final Map item = new HashMap(); + item.put(ITEM_IMAGE, R.drawable.icon_example_matrix3d); + item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_effects3d)); + item.put(ITEM_SUBTITLE, getText(R.string.example_effects3d_subtitle)); + data.add(item); + activityMapping.put(i++, Effects3DActivity.class); + } + + final SimpleAdapter dataAdapter = new SimpleAdapter(this, data, R.layout.toc_item, new String[] {ITEM_IMAGE, ITEM_TITLE, ITEM_SUBTITLE}, new int[] {R.id.Image, R.id.Title, R.id.SubTitle}); + setListAdapter(dataAdapter); + + getListView().setOnItemClickListener(new OnItemClickListener() + { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) + { + final Class activityToLaunch = activityMapping.get(position); + + if (activityToLaunch != null) + { + final Intent launchIntent = new Intent(TableOfContents.this, activityToLaunch); + startActivity(launchIntent); + } + } + }); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/bean/BeanActivity.java b/src/main/java/org/distorted/examples/bean/BeanActivity.java new file mode 100644 index 0000000..92c83c1 --- /dev/null +++ b/src/main/java/org/distorted/examples/bean/BeanActivity.java @@ -0,0 +1,52 @@ + +package org.distorted.examples.bean; + +import org.distorted.library.Distorted; + +import android.app.Activity; +import android.os.Bundle; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class BeanActivity extends Activity +{ + private BeanSurfaceView mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + mView = new BeanSurfaceView(this); + setContentView(mView); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + mView.onPause(); + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +} diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java new file mode 100644 index 0000000..c54d8de --- /dev/null +++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java @@ -0,0 +1,140 @@ + +package org.distorted.examples.bean; + +import java.io.IOException; +import java.io.InputStream; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.Interpolator2D; +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Float2D; +import org.distorted.library.Float4D; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class BeanRenderer implements GLSurfaceView.Renderer +{ + private GLSurfaceView mView; + private DistortedBitmap mBean; + private Float2D pLeft, pRight; + private Interpolator2D iLeft, iRight; + private Float4D rLeft, rRight; + private int bmpHeight, bmpWidth; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public BeanRenderer(GLSurfaceView v) + { + mView = v; + + pLeft = new Float2D(100, 199); + pRight= new Float2D(230, 150); + + rLeft = new Float4D(-9,-31,35,35); + rRight= new Float4D(-9,-31,35,35); + + iLeft = new Interpolator2D(); + iRight= new Interpolator2D(); + + iLeft.setCount(0.0f); + iRight.setCount(0.0f); + iLeft.setDuration(1500); + iRight.setDuration(1500); + + Float2D p1 = new Float2D(0,0); + Float2D p2 = new Float2D(-10,-34); + + iLeft.add(p1); + iLeft.add(p1); + iLeft.add(p1); + iLeft.add(p1); + iLeft.add(p2); + iLeft.add(p2); + + iRight.add(p1); + iRight.add(p2); + iRight.add(p2); + iRight.add(p1); + iRight.add(p1); + iRight.add(p1); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + mBean.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + mBean.abortAllEffects(Distorted.TYPE_MATR); + + if( bmpHeight/bmpWidth > height/width ) + { + int w = (height*bmpWidth)/bmpHeight; + mBean.move((width-w)/2 ,0, 0); + mBean.scale((float)height/bmpHeight); + } + else + { + int h = (width*bmpHeight)/bmpWidth; + mBean.move(0 ,(height-h)/2, 0); + mBean.scale((float)width/bmpWidth); + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.bean); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + bmpHeight = bitmap.getHeight(); + bmpWidth = bitmap.getWidth(); + + mBean = new DistortedBitmap(bitmap, 10); + mBean.distort(iLeft , rLeft , pLeft ); + mBean.distort(iRight, rRight, pRight); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Bean", ex.getMessage() ); + } + } +} diff --git a/src/main/java/org/distorted/examples/bean/BeanSurfaceView.java b/src/main/java/org/distorted/examples/bean/BeanSurfaceView.java new file mode 100644 index 0000000..a9b97bd --- /dev/null +++ b/src/main/java/org/distorted/examples/bean/BeanSurfaceView.java @@ -0,0 +1,27 @@ + +package org.distorted.examples.bean; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class BeanSurfaceView extends GLSurfaceView +{ +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public BeanSurfaceView(Context context) + { + super(context); + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + setRenderer(new BeanRenderer(this)); + } +} + diff --git a/src/main/java/org/distorted/examples/check/CheckActivity.java b/src/main/java/org/distorted/examples/check/CheckActivity.java new file mode 100644 index 0000000..7c95e9e --- /dev/null +++ b/src/main/java/org/distorted/examples/check/CheckActivity.java @@ -0,0 +1,121 @@ + +package org.distorted.examples.check; + +import org.distorted.library.Distorted; +import org.distorted.examples.R; + +import android.app.Activity; +import android.opengl.GLSurfaceView; +import android.os.Bundle; +import android.widget.NumberPicker; +import android.widget.NumberPicker.OnValueChangeListener; +import android.view.View; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class CheckActivity extends Activity +{ + private NumberPicker mVPicker, mFPicker; + private static int maxV, maxF; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + setContentView(R.layout.check1layout); + + mVPicker = (NumberPicker)findViewById(R.id.check1NumberPickerVertex); + mFPicker = (NumberPicker)findViewById(R.id.check1NumberPickerFragment); + + mVPicker.setMaxValue(1000); + mVPicker.setMinValue( 0); + mFPicker.setMaxValue(1000); + mFPicker.setMinValue( 0); + + mVPicker.setOnValueChangedListener(new OnValueChangeListener() + { + @Override + public void onValueChange(NumberPicker picker, int oldVal, int newVal) + { + maxV = newVal; + } + }); + + mFPicker.setOnValueChangedListener(new OnValueChangeListener() + { + @Override + public void onValueChange(NumberPicker picker, int oldVal, int newVal) + { + maxF = newVal; + } + }); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.checkSurfaceView); + if( mView!=null ) mView.onPause(); + + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.checkSurfaceView); + if( mView!=null ) mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onWindowFocusChanged(boolean hasFocus) + { + super.onWindowFocusChanged(hasFocus); + + mVPicker.setValue(1); + mFPicker.setValue(1); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static int getMaxV() + { + return maxV; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static int getMaxF() + { + return maxF; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void Check(View v) + { + setContentView(R.layout.check2layout); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +} diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java new file mode 100644 index 0000000..39816ea --- /dev/null +++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java @@ -0,0 +1,165 @@ + +package org.distorted.examples.check; + +import java.io.IOException; +import java.io.InputStream; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Float2D; +import org.distorted.library.Float3D; + +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class CheckRenderer implements GLSurfaceView.Renderer +{ + private GLSurfaceView mView; + private DistortedBitmap mSuccess; + private Float2D pUp, pDown; + private Float3D vUp, vDown; + + private int bmpHeight, bmpWidth; + + public static String compilationResult; + public static String compilationTitle; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public CheckRenderer(GLSurfaceView view) + { + mView = view; + + Distorted.setMaxVertex(CheckActivity.getMaxV()); + Distorted.setMaxFragment(CheckActivity.getMaxF()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + mSuccess.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + mSuccess.abortAllEffects(Distorted.TYPE_MATR); + + if( bmpHeight/bmpWidth > height/width ) + { + int w = (height*bmpWidth)/bmpHeight; + mSuccess.move((width-w)/2 ,0, 0); + mSuccess.scale((float)height/bmpHeight); + } + else + { + int h = (width*bmpHeight)/bmpWidth; + mSuccess.move(0 ,(height-h)/2, 0); + mSuccess.scale((float)width/bmpWidth); + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.success); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + bmpHeight = bitmap.getHeight(); + bmpWidth = bitmap.getWidth(); + + pDown = new Float2D(bmpWidth/2, 0); + pUp = new Float2D(bmpWidth/2,bmpHeight); + + vUp = new Float3D( 0,+bmpHeight,0); + vDown = new Float3D( 0,-bmpHeight,0); + + mSuccess = new DistortedBitmap(bitmap, 30); + mSuccess.deform( vUp, pUp, 2000, 0.0f); + mSuccess.deform(vDown, pDown, 2000, 0.0f); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + compilationTitle = ex.getClass().getSimpleName(); + compilationResult= ex.getMessage(); + + String ver; + + ver = GLES20.glGetString(GLES20.GL_SHADING_LANGUAGE_VERSION); + compilationResult += "\n\nGLSL version: "+(ver==null ? "null" : ver); + ver = GLES20.glGetString(GLES20.GL_VERSION); + compilationResult += "\nGL version: "+(ver==null ? "null" : ver); + ver = GLES20.glGetString(GLES20.GL_VENDOR); + compilationResult += "\nGL vendor: "+(ver==null ? "null" : ver); + ver = GLES20.glGetString(GLES20.GL_RENDERER); + compilationResult += "\nGL renderer: "+(ver==null ? "null" : ver); + + CheckActivity act = (CheckActivity)mView.getContext(); + + act.runOnUiThread(new Runnable() + { + public void run() + { + Context context = mView.getContext(); + + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setTitle(compilationTitle); + builder.setMessage(compilationResult); + builder.setCancelable(true); + + builder.setOnCancelListener(new DialogInterface.OnCancelListener() + { + @Override + public void onCancel(DialogInterface dialog) + { + ((CheckActivity)mView.getContext()).finish(); + } + }); + + AlertDialog alert = builder.create(); + alert.show(); + } + }); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +} diff --git a/src/main/java/org/distorted/examples/check/CheckSurfaceView.java b/src/main/java/org/distorted/examples/check/CheckSurfaceView.java new file mode 100644 index 0000000..9426098 --- /dev/null +++ b/src/main/java/org/distorted/examples/check/CheckSurfaceView.java @@ -0,0 +1,37 @@ + +package org.distorted.examples.check; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; +import android.util.AttributeSet; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class CheckSurfaceView extends GLSurfaceView +{ + private CheckRenderer renderer; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public CheckSurfaceView(Context c, AttributeSet attrs) + { + super(c, attrs); + + if(!isInEditMode()) + { + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + renderer = new CheckRenderer(this); + setRenderer(renderer); + } + } + +} +/////////////////////////////////////////////////////////////////////////////////////////////////// + diff --git a/src/main/java/org/distorted/examples/cubes/CubesActivity.java b/src/main/java/org/distorted/examples/cubes/CubesActivity.java new file mode 100644 index 0000000..763365a --- /dev/null +++ b/src/main/java/org/distorted/examples/cubes/CubesActivity.java @@ -0,0 +1,198 @@ + +package org.distorted.examples.cubes; + +import org.distorted.library.Distorted; +import org.distorted.examples.R; + +import android.app.Activity; +import android.opengl.GLSurfaceView; +import android.os.Bundle; +import android.view.Gravity; +import android.view.View; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.NumberPicker; +import android.widget.NumberPicker.OnValueChangeListener; +import android.widget.TableRow; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class CubesActivity extends Activity implements View.OnClickListener +{ + private static int mNumCols = 3; + private static int mNumRows = 3; + + private static final int COLOR_OFF = 0xffffe81f; + private static final int COLOR_ON = 0xff0000ff; + + private NumberPicker mColsPicker, mRowsPicker; + private LinearLayout mLay; + private static boolean[] mShape; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle savedState) + { + super.onCreate(savedState); + + setContentView(R.layout.cubes1layout); + + mLay = (LinearLayout)findViewById(R.id.buttongrid); + + mColsPicker = (NumberPicker)findViewById(R.id.colsPicker); + mRowsPicker = (NumberPicker)findViewById(R.id.rowsPicker); + + mColsPicker.setMaxValue(10); + mColsPicker.setMinValue( 0); + mRowsPicker.setMaxValue(10); + mRowsPicker.setMinValue( 0); + + mColsPicker.setOnValueChangedListener(new OnValueChangeListener() + { + @Override + public void onValueChange(NumberPicker picker, int oldVal, int newVal) + { + setGrid(); + } + }); + + mRowsPicker.setOnValueChangedListener(new OnValueChangeListener() + { + @Override + public void onValueChange(NumberPicker picker, int oldVal, int newVal) + { + setGrid(); + } + }); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static int getCols() + { + return mNumCols; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static String getShape() + { + String str = ""; + + for(int i=0; i0 ? (width / mNumCols) -10 : 0; + int h = mNumRows>0 ? (height/ mNumRows) -10 : 0; + int size= w height/width ) + { + int w = (height*mRows)/mCols; + mCubes.move((width-w)/2 ,0, 0); + mCubes.scale((float)height/(mRows*SIZE)); + } + else + { + int h = (width*mRows)/mCols; + mCubes.move(0 ,(height-h)/2, 0); + mCubes.scale((float)width/(mCols*SIZE)); + } + + Float3D center = new Float3D(mCols*SIZE/2,mRows*SIZE/2, 0); + + mCubes.quaternion(center, mQuatInt1); + mCubes.quaternion(center, mQuatInt2); + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.grid); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + mCubes.setBitmap(bitmap); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Cubes", ex.getMessage() ); + } + } +} diff --git a/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java b/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java new file mode 100644 index 0000000..8964ade --- /dev/null +++ b/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java @@ -0,0 +1,109 @@ + +package org.distorted.examples.cubes; + +import org.distorted.examples.R; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.widget.Toast; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class CubesSurfaceView extends GLSurfaceView +{ + int mX, mY; + CubesRenderer mRenderer; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public CubesSurfaceView(Context c, AttributeSet attrs) + { + super(c,attrs); + + mX = -1; + mY = -1; + + if(!isInEditMode()) + { + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + mRenderer = new CubesRenderer(this); + + setRenderer(mRenderer); + + Toast.makeText(c, R.string.example_cubes_toast , Toast.LENGTH_SHORT).show(); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @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); + } + } + break; + + case MotionEvent.ACTION_UP : mX = -1; + mY = -1; + + float qx = mRenderer.mQuat1.getX(); + float qy = mRenderer.mQuat1.getY(); + float qz = mRenderer.mQuat1.getZ(); + float qw = mRenderer.mQuat1.getW(); + + float rx = mRenderer.mQuat2.getX(); + float ry = mRenderer.mQuat2.getY(); + float rz = mRenderer.mQuat2.getZ(); + float rw = mRenderer.mQuat2.getW(); + + 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); + + break; + } + + return true; + } + +} + diff --git a/src/main/java/org/distorted/examples/deform/DeformActivity.java b/src/main/java/org/distorted/examples/deform/DeformActivity.java new file mode 100644 index 0000000..d5d1322 --- /dev/null +++ b/src/main/java/org/distorted/examples/deform/DeformActivity.java @@ -0,0 +1,124 @@ + +package org.distorted.examples.deform; + +import org.distorted.library.Distorted; +import org.distorted.examples.R; + +import android.app.Activity; +import android.opengl.GLSurfaceView; +import android.os.Bundle; +import android.view.View; +import android.widget.RadioButton; +import android.widget.SeekBar; +import android.widget.TextView; +import android.widget.SeekBar.OnSeekBarChangeListener; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class DeformActivity extends Activity implements OnSeekBarChangeListener +{ + private SeekBar barR; + private TextView textR; + private RadioButton effect; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + setContentView(R.layout.deformlayout); + + barR = (SeekBar)findViewById(R.id.deformSeekRadius); + barR.setOnSeekBarChangeListener(this); + + textR = (TextView)findViewById(R.id.deformTextRadius); + + barR.setProgress(50); + + textR.setText("Radius: 50"); + + effect = (RadioButton)findViewById(R.id.deformDistortButton); + effect.setChecked(true); + DeformRenderer.setMode(DeformRenderer.MODE_DISTORT); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + DeformRenderer.onPause(); + + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView); + mView.onPause(); + + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + android.util.Log.e("activity","onDestroy"); + + Distorted.onDestroy(); + super.onDestroy(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void Distort(View v) + { + DeformRenderer.setMode(DeformRenderer.MODE_DISTORT); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void Deform(View v) + { + DeformRenderer.setMode(DeformRenderer.MODE_DEFORM); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void Shear(View v) + { + DeformRenderer.setMode(DeformRenderer.MODE_SHEAR); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) + { + switch (bar.getId()) + { + case R.id.deformSeekRadius: DeformRenderer.setRegionRadius(progress); + textR.setText("Radius: "+progress); + break; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onStartTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onStopTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +} diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java new file mode 100644 index 0000000..be9d93a --- /dev/null +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -0,0 +1,292 @@ + +package org.distorted.examples.deform; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Interpolator2D; +import org.distorted.library.Float3D; +import org.distorted.library.Float4D; + +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Paint.Style; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class DeformRenderer implements GLSurfaceView.Renderer +{ + public static final int MODE_DISTORT= 0; + public static final int MODE_DEFORM = 1; + public static final int MODE_SHEAR = 2; + + private static final int NUM_VECTORS = 8; + private static final int NUMLINES = 10; + private static final int NUMFRAMES =10; + + private GLSurfaceView mView; + private DistortedBitmap fps; + private DistortedBitmap stretch; + private Float3D touchPoint; + private static Interpolator2D di; + private static Float3D[] v; + private static Float4D dr; + private Canvas fpsCanvas; + private Bitmap fpsBitmap, stretchBitmap; + private int scrHeight, scrWidth; + private Paint mPaint; + private int fpsH, fpsW; + private String fpsString = ""; + private long lastTime=0; + private long[] durations; + private int currDuration; + private long shearID=0; + + private static int mMode = MODE_DISTORT; + private static boolean bitmapCreated = false; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public DeformRenderer(GLSurfaceView view) + { + mView = view; + + dr = new Float4D(0,0,0,0); + + di = new Interpolator2D(); + di.setMode(Interpolator2D.MODE_PATH); + di.setCount(0.5f); + di.setDuration(NUM_VECTORS*500); + + v = new Float3D[NUM_VECTORS]; + + for(int i=0; iscrWidth/2 ) xt=scrWidth/2; + if( yt<0 ) yt=0; + if( yt>scrHeight/2 ) yt=scrHeight/2; + + touchPoint.set(xt,yt,0); + + v[0].set(0,0,0); + + switch(mMode) + { + case MODE_DISTORT: stretch.distort(v[0], dr, touchPoint, 0, 0.5f); + break; + case MODE_DEFORM : stretch.deform( v[0], touchPoint); + break; + case MODE_SHEAR : shearID = stretch.shear(touchPoint,v[0]); + break; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void move(int x, int y) + { + float fx = x; + float fy = y; + + if( mMode==MODE_SHEAR ) + { + fx /= (scrWidth/2); + fy /= (scrHeight/2); + } + + v[0].set(fx,fy); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void up() + { + stretch.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + stretch.abortEffect(shearID); + + float damp = -0.65f; + + for(int i=1; i=NUMFRAMES ) currDuration = 0; + durations[NUMFRAMES] += ((currentTime-lastTime)-durations[currDuration]); + durations[currDuration] = currentTime-lastTime; + + fpsString = "" + ((int)(10000.0f*NUMFRAMES/durations[NUMFRAMES]))/10.0f; + } + + lastTime = currentTime; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +} diff --git a/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java b/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java new file mode 100644 index 0000000..09ff288 --- /dev/null +++ b/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java @@ -0,0 +1,61 @@ + +package org.distorted.examples.deform; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; +import android.util.AttributeSet; +import android.view.MotionEvent; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class DeformSurfaceView extends GLSurfaceView +{ + private DeformRenderer renderer; + private int xTouch, yTouch; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public DeformSurfaceView(Context c, AttributeSet attrs) + { + super(c, attrs); + + if(!isInEditMode()) + { + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + renderer = new DeformRenderer(this); + setRenderer(renderer); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @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: xTouch =x; + yTouch =y; + renderer.down(x,y); + break; + case MotionEvent.ACTION_MOVE: renderer.move(x-xTouch,y-yTouch); + break; + case MotionEvent.ACTION_UP : renderer.up(); + break; + } + + return true; + } + +} + diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java new file mode 100644 index 0000000..f4c36d9 --- /dev/null +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java @@ -0,0 +1,51 @@ + +package org.distorted.examples.differentbitmaps; + +import org.distorted.library.Distorted; + +import android.app.Activity; +import android.os.Bundle; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class DifferentBitmapsActivity extends Activity +{ + private DifferentBitmapsSurfaceView mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + mView = new DifferentBitmapsSurfaceView(this); + setContentView(mView); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + mView.onPause(); + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } +} diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java new file mode 100644 index 0000000..1f0fc59 --- /dev/null +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java @@ -0,0 +1,156 @@ + +package org.distorted.examples.differentbitmaps; + +import java.io.IOException; +import java.io.InputStream; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Float2D; +import org.distorted.library.Float4D; +import org.distorted.library.Interpolator2D; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class DifferentBitmapsRenderer implements GLSurfaceView.Renderer +{ + private static final int NUM = 3; + + private GLSurfaceView mView; + private DistortedBitmap[] bmp; + private Float2D point; + private Interpolator2D di; + private Float2D[] vec; + private int bmpHeight, bmpWidth; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public DifferentBitmapsRenderer(GLSurfaceView v) + { + mView = v; + + // create shared effects - enlarge the nose and keep moving the whole bitmap left and right. + di = new Interpolator2D(); + di.setCount(0.0f); + di.setDuration(3000); + vec = new Float2D[2]; + vec[0] = new Float2D( 25,0); + vec[1] = new Float2D(-25,0); + di.add(vec[0]); + di.add(vec[1]); + point = new Float2D(305, 380); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private Bitmap readBitmap(int id) + { + InputStream is = mView.getContext().getResources().openRawResource(id); + Bitmap bitmap=null; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + return bitmap; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + long time = System.currentTimeMillis(); + + for(int i=NUM-1; i>=0; i--) bmp[i].draw(time); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + for(int i=NUM-1; i>=0; i--) + { + bmp[i].abortAllEffects(Distorted.TYPE_MATR); + } + + if( bmpHeight/(NUM*bmpWidth) > height/width ) + { + int w = (height*bmpWidth)/bmpHeight; + + for(int i=NUM-1; i>=0; i--) + { + bmp[i].move( (width-NUM*w)/2 +i*w ,0,0); + bmp[i].scale((float)height/bmpHeight); + } + } + else + { + int w = width/NUM; + int h = (width*bmpHeight)/(bmpWidth*NUM); + + for(int i=NUM-1; i>=0; i--) + { + bmp[i].move(i*w, (height-h)/2, 0); + bmp[i].scale((float)width/(bmpWidth*NUM)); + } + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + Bitmap bitmap0= readBitmap(R.raw.dog); + Bitmap bitmap1= readBitmap(R.raw.face); + Bitmap bitmap2= readBitmap(R.raw.cat); + + bmpHeight = bitmap0.getHeight(); + bmpWidth = bitmap0.getWidth(); + + // create NUM DistortedBitmaps with shared effects + bmp = new DistortedBitmap[NUM]; + bmp[0] = new DistortedBitmap(bmpWidth, bmpHeight, 30); + for(int i=1; i=0; i--) bmp[i].draw(time); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + for(int i=NUM-1; i>=0; i--) + { + bmp[i].abortAllEffects(Distorted.TYPE_MATR); + } + + if( bmpHeight/(NUM*bmpWidth) > height/width ) + { + int w = (height*bmpWidth)/bmpHeight; + + for(int i=NUM-1; i>=0; i--) + { + bmp[i].move( (width-NUM*w)/2 +i*w ,0, 0); + bmp[i].scale((float)height/bmpHeight); + } + } + else + { + int w = width/NUM; + int h = (width*bmpHeight)/(bmpWidth*NUM); + + for(int i=NUM-1; i>=0; i--) + { + bmp[i].move(i*w, (height-h)/2, 0); + bmp[i].scale((float)width/(bmpWidth*NUM)); + } + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.dog); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + bmpHeight = bitmap.getHeight(); + bmpWidth = bitmap.getWidth(); + + bmp = new DistortedBitmap[NUM]; + bmp[0] = new DistortedBitmap(bmpWidth, bmpHeight, 30); + + for(int i=1; i=0 ; i-- ) + { + switch(effects[i]) + { + case MOVE : layout.addView(move , 0); break; + case SCALE : layout.addView(scale , 0); break; + case ROTATE: layout.addView(rotate , 0); break; + case SHEAR : layout.addView(shear , 0); break; + } + } + + textMove = (TextView)findViewById(R.id.matrix3dmoveText); + textScale = (TextView)findViewById(R.id.matrix3dscaleText); + textRotate= (TextView)findViewById(R.id.matrix3drotateText); + textShear = (TextView)findViewById(R.id.matrix3dshearText); + + setMoveText(); + setScaleText(); + setRotateText(); + setShearText(); + + setBar(R.id.matrix3dmoveBar1, moveX); + setBar(R.id.matrix3dmoveBar2, moveY); + setBar(R.id.matrix3dmoveBar3, moveZ); + + setBar(R.id.matrix3dscaleBar1, scaleX); + setBar(R.id.matrix3dscaleBar2, scaleY); + setBar(R.id.matrix3dscaleBar3, scaleZ); + + setBar(R.id.matrix3drotateBar1, rotateX); + setBar(R.id.matrix3drotateBar2, rotateY); + setBar(R.id.matrix3drotateBar3, rotateZ); + setBar(R.id.matrix3drotateBar4, rotateA); + + setBar(R.id.matrix3dshearBar1, shearX); + setBar(R.id.matrix3dshearBar2, shearY); + setBar(R.id.matrix3dshearBar3, shearZ); + + Effects3DRenderer.setOrder(effects); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void moveUp(int effect) + { + int len = effects.length-1; + int index = -1; + + for(int i=0; i<=len; i++) + { + if( effects[i]==effect ) + { + index=i; + break; + } + } + + if( index==0 ) + { + for(int i=0; i0 ) + { + effects[index] = effects[index-1]; + effects[index-1] = effect; + } + + addViews(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void ButtonMove(View v) + { + moveUp(MOVE); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void ButtonScale(View v) + { + moveUp(SCALE); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void ButtonRotate(View v) + { + moveUp(ROTATE); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void ButtonShear(View v) + { + moveUp(SHEAR); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setBar(int id, int value) + { + bar = (SeekBar)findViewById(id); + bar.setOnSeekBarChangeListener(this); + bar.setProgress(value); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void computeMove() + { + fmoveX = (moveX-50)*maxX/50.0f; + fmoveY = (moveY-50)*maxY/50.0f; + fmoveZ = (moveZ-50)*maxZ/50.0f; + + Effects3DRenderer.setMove( fmoveX, fmoveY, fmoveZ); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setMoveText() + { + fmoveX = ((int)(100*fmoveX))/100.0f; + fmoveY = ((int)(100*fmoveY))/100.0f; + fmoveZ = ((int)(100*fmoveZ))/100.0f; + + textMove.setText("move("+fmoveX+" , "+fmoveY+" , "+fmoveZ+")"); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void computeScale() + { + fscaleX = (scaleX>50 ? 0.18f : 0.018f)*(scaleX-50)+1; + fscaleY = (scaleY>50 ? 0.18f : 0.018f)*(scaleY-50)+1; + fscaleZ = (scaleZ>50 ? 0.18f : 0.018f)*(scaleZ-50)+1; + + Effects3DRenderer.setScale(fscaleX, fscaleY, fscaleZ); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setScaleText() + { + fscaleX = ((int)(100*fscaleX))/100.0f; + fscaleY = ((int)(100*fscaleY))/100.0f; + fscaleZ = ((int)(100*fscaleZ))/100.0f; + + textScale.setText("scale("+fscaleX+" , "+fscaleY+" , "+fscaleZ+")"); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void computeRotate() + { + frotateX = (rotateX-50)/50.0f; + frotateY = (rotateY-50)/50.0f; + frotateZ = (rotateZ-50)/50.0f; + + Effects3DRenderer.setRotate( frotateA, frotateX, frotateY, frotateZ ); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setRotateText() + { + frotateX = ((int)(100*frotateX))/100.0f; + frotateY = ((int)(100*frotateY))/100.0f; + frotateZ = ((int)(100*frotateZ))/100.0f; + + frotateA = ((rotateA-50)*180)/50; + + textRotate.setText("rotate( "+frotateA+" ("+frotateX+","+frotateY+","+frotateZ+") )"); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void computeShear() + { + fshearX = (shearX-50)/25.0f; + fshearY = (shearY-50)/25.0f; + fshearZ = (shearZ-50)/25.0f; + + Effects3DRenderer.setShear( fshearX, fshearY, fshearZ ); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setShearText() + { + fshearX = ((int)(100*fshearX))/100.0f; + fshearY = ((int)(100*fshearY))/100.0f; + fshearZ = ((int)(100*fshearZ))/100.0f; + + textShear.setText("shear("+fshearX+" , "+fshearY+" , "+fshearZ+")"); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.effects3dSurfaceView); + mView.onPause(); + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.effects3dSurfaceView); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onWindowFocusChanged(boolean hasFocus) + { + super.onWindowFocusChanged(hasFocus); + + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.effects3dSurfaceView); + + maxX = mView.getWidth(); + maxY = mView.getHeight(); + maxZ = (maxX+maxY)/2; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) + { + switch (bar.getId()) + { + case R.id.matrix3dmoveBar1 : moveX = progress; computeMove() ; setMoveText() ; break; + case R.id.matrix3dmoveBar2 : moveY = progress; computeMove() ; setMoveText() ; break; + case R.id.matrix3dmoveBar3 : moveZ = progress; computeMove() ; setMoveText() ; break; + + case R.id.matrix3dscaleBar1 : scaleX= progress; computeScale() ; setScaleText() ; break; + case R.id.matrix3dscaleBar2 : scaleY= progress; computeScale() ; setScaleText() ; break; + case R.id.matrix3dscaleBar3 : scaleZ= progress; computeScale() ; setScaleText() ; break; + + case R.id.matrix3drotateBar1: rotateX=progress; computeRotate(); setRotateText(); break; + case R.id.matrix3drotateBar2: rotateY=progress; computeRotate(); setRotateText(); break; + case R.id.matrix3drotateBar3: rotateZ=progress; computeRotate(); setRotateText(); break; + case R.id.matrix3drotateBar4: rotateA=progress; computeRotate(); setRotateText(); break; + + case R.id.matrix3dshearBar1 : shearX= progress; computeShear() ; setShearText() ; break; + case R.id.matrix3dshearBar2 : shearY= progress; computeShear() ; setShearText() ; break; + case R.id.matrix3dshearBar3 : shearZ= progress; computeShear() ; setShearText() ; break; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onStartTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onStopTrackingTouch(SeekBar bar) { } + +} diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java new file mode 100644 index 0000000..c6a1f77 --- /dev/null +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java @@ -0,0 +1,169 @@ + +package org.distorted.examples.effects3d; + +import java.io.IOException; +import java.io.InputStream; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.DistortedCubes; +import org.distorted.library.Float3D; +import org.distorted.library.Float4D; +import org.distorted.library.Interpolator3D; +import org.distorted.library.Interpolator4D; +import org.distorted.library.Distorted; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class Effects3DRenderer implements GLSurfaceView.Renderer +{ + private static final int SIZE = 100; + + private GLSurfaceView mView; + private static DistortedCubes mCube; + + private static int[] order; + + private static Interpolator3D mMoveInter, mScaleInter, mShearInter; + private static Interpolator4D mRotateInter; + + private static Float3D mZeroPoint, mMovePoint, mScalePoint, mShearPoint; + private static Float4D mRotatePoint; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setMove(float x, float y, float z) + { + mMovePoint.set(x, y, z); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setScale(float x, float y, float z) + { + mScalePoint.set(x, y, z); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setRotate(float a, float x, float y, float z) + { + mRotatePoint.set(a, x, y, z); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setShear(float x, float y, float z) + { + mShearPoint.set(x, y, z); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setOrder(int[] effects) + { + order = effects; + setMatrixEffects(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setMatrixEffects() + { + mCube.abortAllEffects(Distorted.TYPE_MATR); + + for( int i=0; i<=order.length-1 ; i++ ) + { + switch(order[i]) + { + case Effects3DActivity.MOVE : mCube.move(mMoveInter) ; break; + case Effects3DActivity.SCALE : mCube.scale(mScaleInter) ; break; + case Effects3DActivity.ROTATE: mCube.rotate(mZeroPoint,mRotateInter); break; + case Effects3DActivity.SHEAR : mCube.shear(mZeroPoint,mShearInter) ; break; + } + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public Effects3DRenderer(GLSurfaceView v) + { + mView = v; + mCube = new DistortedCubes( 1, "1", SIZE); + + mZeroPoint = new Float3D(0,0,0); + mMovePoint = new Float3D(0,0,0); + mScalePoint = new Float3D(1,1,1); + mShearPoint = new Float3D(0,0,0); + mRotatePoint= new Float4D(1,0,0,0); + + mMoveInter = new Interpolator3D(); + mScaleInter = new Interpolator3D(); + mShearInter = new Interpolator3D(); + mRotateInter= new Interpolator4D(); + + mMoveInter.add(mMovePoint); + mScaleInter.add(mScalePoint); + mShearInter.add(mShearPoint); + mRotateInter.add(mRotatePoint); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + mCube.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + setMatrixEffects(); + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.grid); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + mCube.setBitmap(bitmap); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Quaternion", ex.getMessage() ); + } + } +} diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DSurfaceView.java b/src/main/java/org/distorted/examples/effects3d/Effects3DSurfaceView.java new file mode 100644 index 0000000..b40f378 --- /dev/null +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DSurfaceView.java @@ -0,0 +1,32 @@ + +package org.distorted.examples.effects3d; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; +import android.util.AttributeSet; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class Effects3DSurfaceView extends GLSurfaceView +{ +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public Effects3DSurfaceView(Context c, AttributeSet attrs) + { + super(c, attrs); + + if(!isInEditMode()) + { + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + setRenderer(new Effects3DRenderer(this)); + } + } +} + diff --git a/src/main/java/org/distorted/examples/fbo/FBOActivity.java b/src/main/java/org/distorted/examples/fbo/FBOActivity.java new file mode 100644 index 0000000..da1976c --- /dev/null +++ b/src/main/java/org/distorted/examples/fbo/FBOActivity.java @@ -0,0 +1,52 @@ + +package org.distorted.examples.fbo; + +import org.distorted.library.Distorted; + +import android.app.Activity; +import android.os.Bundle; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class FBOActivity extends Activity +{ + private FBOSurfaceView mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + mView = new FBOSurfaceView(this); + setContentView(mView); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + mView.onPause(); + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +} diff --git a/src/main/java/org/distorted/examples/fbo/FBORenderer.java b/src/main/java/org/distorted/examples/fbo/FBORenderer.java new file mode 100644 index 0000000..ff8591a --- /dev/null +++ b/src/main/java/org/distorted/examples/fbo/FBORenderer.java @@ -0,0 +1,123 @@ + +package org.distorted.examples.fbo; + +import java.io.IOException; +import java.io.InputStream; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.DistortedNode; +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Float2D; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class FBORenderer implements GLSurfaceView.Renderer +{ + private GLSurfaceView mView; + private DistortedBitmap mLisa, mText; + private int lisaHeight, lisaWidth; + + private DistortedNode mRoot; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public FBORenderer(GLSurfaceView v) + { + mView = v; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + mRoot.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + mLisa.abortAllEffects(Distorted.TYPE_MATR); + + if( lisaHeight/lisaWidth > height/width ) + { + int w = (height*lisaWidth)/lisaHeight; + mLisa.move((width-w)/2 ,0, 0); + mLisa.scale((float)height/lisaHeight); + } + else + { + int h = (width*lisaHeight)/lisaWidth; + mLisa.move(0 ,(height-h)/2, 0); + mLisa.scale((float)width/lisaWidth); + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is1 = mView.getContext().getResources().openRawResource(R.raw.monalisa); + InputStream is2 = mView.getContext().getResources().openRawResource(R.raw.fbo); + + Bitmap bitmap1, bitmap2; + + try + { + bitmap1 = BitmapFactory.decodeStream(is1); + bitmap2 = BitmapFactory.decodeStream(is2); + } + finally + { + try + { + is1.close(); + is2.close(); + } + catch(IOException e) { } + } + + lisaHeight = bitmap1.getHeight(); + lisaWidth = bitmap1.getWidth(); + + mLisa = new DistortedBitmap(bitmap1, 20); + mText = new DistortedBitmap(bitmap2, 20); + + android.util.Log.e("FBO", "Lisa hashcode= "+bitmap1.hashCode()); + + mRoot = new DistortedNode(mLisa); + mRoot.attach(mText); + + int textWidth = mText.getWidth(); + int textHeight = mText.getHeight(); + + mText.move(lisaWidth/6 , lisaHeight/3, 0); + mText.scale(lisaWidth/(1.5f*textWidth)); + mText.sink(0.5f, new Float2D( textWidth/2, textHeight/2), 5000, 0.0f); + mLisa.macroblock(4, 10000, 0.0f); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("MonaLisa", ex.getMessage() ); + } + } +} diff --git a/src/main/java/org/distorted/examples/fbo/FBOSurfaceView.java b/src/main/java/org/distorted/examples/fbo/FBOSurfaceView.java new file mode 100644 index 0000000..d750ef7 --- /dev/null +++ b/src/main/java/org/distorted/examples/fbo/FBOSurfaceView.java @@ -0,0 +1,27 @@ + +package org.distorted.examples.fbo; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class FBOSurfaceView extends GLSurfaceView +{ +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public FBOSurfaceView(Context context) + { + super(context); + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + setRenderer(new FBORenderer(this)); + } +} + diff --git a/src/main/java/org/distorted/examples/fov/FOVActivity.java b/src/main/java/org/distorted/examples/fov/FOVActivity.java new file mode 100644 index 0000000..e67cb7d --- /dev/null +++ b/src/main/java/org/distorted/examples/fov/FOVActivity.java @@ -0,0 +1,92 @@ + +package org.distorted.examples.fov; + +import org.distorted.library.Distorted; +import org.distorted.examples.R; + +import android.app.Activity; +import android.opengl.GLSurfaceView; +import android.os.Bundle; +import android.widget.SeekBar; +import android.widget.TextView; +import android.widget.SeekBar.OnSeekBarChangeListener; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class FOVActivity extends Activity implements OnSeekBarChangeListener +{ + private SeekBar barFOV; + private TextView textFOV; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + setContentView(R.layout.fovlayout); + + barFOV = (SeekBar)findViewById(R.id.seekFOV); + barFOV.setOnSeekBarChangeListener(this); + + textFOV = (TextView)findViewById(R.id.textFOV); + + barFOV.setProgress(50); + + textFOV.setText("FOV: 50"); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.surfaceViewFOV); + mView.onPause(); + + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.surfaceViewFOV); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) + { + switch (bar.getId()) + { + case R.id.seekFOV: FOVRenderer.setFOV(progress); + textFOV.setText("FOV: "+progress); + break; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onStartTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onStopTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +} diff --git a/src/main/java/org/distorted/examples/fov/FOVRenderer.java b/src/main/java/org/distorted/examples/fov/FOVRenderer.java new file mode 100644 index 0000000..79dba2a --- /dev/null +++ b/src/main/java/org/distorted/examples/fov/FOVRenderer.java @@ -0,0 +1,116 @@ + +package org.distorted.examples.fov; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Float2D; +import org.distorted.library.Float3D; +import org.distorted.library.Float4D; + +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Paint.Style; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class FOVRenderer implements GLSurfaceView.Renderer +{ + private static final int NUMLINES = 10; + + private GLSurfaceView mView; + private DistortedBitmap fov; + private Paint mPaint; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public FOVRenderer(GLSurfaceView view) + { + mView = view; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setFOV(int fov) + { + Distorted.setFov(fov); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + fov.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + Distorted.onSurfaceChanged(width, height); + setupBitmap(width,height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("FOV", ex.getMessage() ); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setupBitmap(int w, int h) + { + mPaint = new Paint(); + fov = new DistortedBitmap(w,h, 50); + Bitmap fovBitmap = Bitmap.createBitmap(w,h, Bitmap.Config.ARGB_8888); + Canvas fovCanvas = new Canvas(fovBitmap); + + mPaint.setColor(0xff008800); + mPaint.setStyle(Style.FILL); + fovCanvas.drawRect(0, 0, w, h, mPaint); + mPaint.setColor(0xffffffff); + + for(int i=0; i<=NUMLINES ; i++ ) + { + fovCanvas.drawRect(w*i/NUMLINES - 1, 0, w*i/NUMLINES + 1, h , mPaint); + fovCanvas.drawRect( 0, h *i/NUMLINES -1, w , h*i/NUMLINES + 1, mPaint); + } + + fov.setBitmap(fovBitmap); + + int min = w 50) + { + s = (progress-50)/16.0f + 1.0f; + } + else + { + s = 0.015f*progress + 0.25f; + } + GirlRenderer.setSize(s); + textSize.setText("Size: "+(((int)(s*10))/10.0f)); + break; + case R.id.girlSeekHips : v = progress/5; + GirlRenderer.setHips(v); + textHips.setText("Hips: "+v); + break; + + } + } + +/////////////////////////////////////////////////////////////////// + + public void onStartTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////// + + public void onStopTrackingTouch(SeekBar bar) { } + +} diff --git a/src/main/java/org/distorted/examples/girl/GirlRenderer.java b/src/main/java/org/distorted/examples/girl/GirlRenderer.java new file mode 100644 index 0000000..8f5d052 --- /dev/null +++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java @@ -0,0 +1,211 @@ + +package org.distorted.examples.girl; + +import java.io.IOException; +import java.io.InputStream; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Float1D; +import org.distorted.library.Float2D; +import org.distorted.library.Float3D; +import org.distorted.library.Float4D; +import org.distorted.library.Interpolator3D; +import org.distorted.library.Interpolator1D; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class GirlRenderer implements GLSurfaceView.Renderer +{ + private GLSurfaceView mView; + private DistortedBitmap mGirl; + private Float2D pLeft, pRight, pHips; + private Float4D Region, sinkRegion, HipsRegion; + private static Interpolator3D diL, diR; + private static Interpolator1D diHips, diSink; + private static Float3D v0,v1,v2,v3; + private static Float1D d0, d1, s0; + + private int bmpHeight, bmpWidth; + + private static int boobsSwing; + private static int hipsSwirl; + private static float boobsSink; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public GirlRenderer(GLSurfaceView v) + { + mView = v; + + boobsSwing = 0; + hipsSwirl = 0; + boobsSink = 1.0f; + + pLeft = new Float2D(132, 264); + pRight= new Float2D(247, 264); + + // Make the boobs bigger + sinkRegion = new Float4D(0,0,60,60); + + s0 = new Float1D(boobsSink); + + diSink = new Interpolator1D(); + diSink.setCount(0.5f); + diSink.setDuration(0); + diSink.add(s0); + + // Boobs Movement + Region = new Float4D(0,0,45,45); + + diL = new Interpolator3D(); + diR = new Interpolator3D(); + + diL.setCount(0.0f); + diR.setCount(0.0f); + diL.setDuration(1000); + diR.setDuration(1000); + + v0 = new Float3D( 0,-boobsSwing, 0); + v1 = new Float3D( boobsSwing, 0, 0); + v2 = new Float3D( 0, boobsSwing, 0); + v3 = new Float3D(-boobsSwing, 0, 0); + + diL.add(v0); + diL.add(v1); + diL.add(v2); + diL.add(v3); + + diR.add(v0); + diR.add(v3); + diR.add(v2); + diR.add(v1); + + // Movement of the hips + pHips = new Float2D(216,505); + HipsRegion = new Float4D(0,0,120,120); + diHips = new Interpolator1D(); + + d0 = new Float1D(-hipsSwirl); + d1 = new Float1D(+hipsSwirl); + + diHips.add(d0); + diHips.add(d1); + diHips.setDuration(1000); + diHips.setCount(0.0f); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setHips(int s) + { + hipsSwirl = s; + d0.set(-hipsSwirl); + d1.set(+hipsSwirl); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setSize(float s) + { + boobsSink = s; + s0.set(boobsSink); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void setSwing(int s) + { + boobsSwing = s; + + v0.set( 0,-boobsSwing, 0); + v1.set( boobsSwing, 0, 0); + v2.set( 0, boobsSwing, 0); + v3.set(-boobsSwing, 0, 0); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + mGirl.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + mGirl.abortAllEffects(Distorted.TYPE_MATR); + + if( bmpHeight/bmpWidth > height/width ) + { + int w = (height*bmpWidth)/bmpHeight; + mGirl.move((width-w)/2 ,0, 0); + mGirl.scale((float)height/bmpHeight); + } + else + { + int h = (width*bmpHeight)/bmpWidth; + mGirl.move(0 ,(height-h)/2, 0); + mGirl.scale((float)width/bmpWidth); + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.girl); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + bmpHeight = bitmap.getHeight(); + bmpWidth = bitmap.getWidth(); + + mGirl = new DistortedBitmap(bitmap, 30); + + mGirl.sink( diSink, sinkRegion, pLeft ); + mGirl.sink( diSink, sinkRegion, pRight); + + mGirl.distort(diL, Region, pLeft ); + mGirl.distort(diR, Region, pRight); + + mGirl.swirl(diHips, HipsRegion, pHips); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Renderer", ex.getMessage() ); + } + } +} diff --git a/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java b/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java new file mode 100644 index 0000000..7eefe95 --- /dev/null +++ b/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java @@ -0,0 +1,29 @@ + +package org.distorted.examples.girl; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; +import android.util.AttributeSet; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class GirlSurfaceView extends GLSurfaceView +{ +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public GirlSurfaceView(Context c, AttributeSet attrs) + { + super(c, attrs); + + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + setRenderer(new GirlRenderer(this)); + } +} + diff --git a/src/main/java/org/distorted/examples/interpolator/InterpolatorActivity.java b/src/main/java/org/distorted/examples/interpolator/InterpolatorActivity.java new file mode 100644 index 0000000..8742a70 --- /dev/null +++ b/src/main/java/org/distorted/examples/interpolator/InterpolatorActivity.java @@ -0,0 +1,159 @@ +package org.distorted.examples.interpolator; + +import org.distorted.library.Distorted; +import org.distorted.library.Interpolator1D; +import org.distorted.examples.R; + +import android.app.Activity; +import android.opengl.GLSurfaceView; +import android.os.Bundle; +import android.view.View; +import android.widget.SeekBar; +import android.widget.TextView; +import android.widget.SeekBar.OnSeekBarChangeListener; + +/////////////////////////////////////////////////////////////////// + +public class InterpolatorActivity extends Activity implements OnSeekBarChangeListener + { + private SeekBar barD, barN; + private TextView textD, textN; + +/////////////////////////////////////////////////////////////////// + @Override + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.interpolatorlayout); + + barD = (SeekBar)findViewById(R.id.interpolatorSeekDuration); + barD.setOnSeekBarChangeListener(this); + textD = (TextView)findViewById(R.id.interpolatorTextDuration); + + barN = (SeekBar)findViewById(R.id.interpolatorSeekNoise); + barN.setOnSeekBarChangeListener(this); + textN = (TextView)findViewById(R.id.interpolatorTextNoise); + + barD.setProgress(50); + textD.setText("Duration: 10 s"); + + barN.setProgress(0); + textN.setText("Noise: 0.0"); + } + +/////////////////////////////////////////////////////////////////// + @Override + protected void onResume() + { + super.onResume(); + + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.interpolatorSurfaceView); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////// + @Override + protected void onPause() + { + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.interpolatorSurfaceView); + mView.onPause(); + + super.onPause(); + } + +/////////////////////////////////////////////////////////////////// + @Override + public void onStop() + { + super.onStop(); + } + +/////////////////////////////////////////////////////////////////// + @Override + public void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +/////////////////////////////////////////////////////////////////// + + public void Loop(View v) + { + InterpolatorSurfaceView.setMode(Interpolator1D.MODE_LOOP); + } + +/////////////////////////////////////////////////////////////////// + + public void Path(View v) + { + InterpolatorSurfaceView.setMode(Interpolator1D.MODE_PATH); + } + +/////////////////////////////////////////////////////////////////// + + public void Jump(View v) + { + InterpolatorSurfaceView.setMode(Interpolator1D.MODE_JUMP); + } + +/////////////////////////////////////////////////////////////////// + + public void Dim1D(View v) + { + InterpolatorSurfaceView.setDimension(InterpolatorSurfaceView.DIM_1D); + } + +/////////////////////////////////////////////////////////////////// + + public void Dim2D(View v) + { + InterpolatorSurfaceView.setDimension(InterpolatorSurfaceView.DIM_2D); + } + +/////////////////////////////////////////////////////////////////// + + public void Dim3DXY(View v) + { + InterpolatorSurfaceView.setDimension(InterpolatorSurfaceView.DIM_3DXY); + } + +/////////////////////////////////////////////////////////////////// + + public void Dim3DXZ(View v) + { + InterpolatorSurfaceView.setDimension(InterpolatorSurfaceView.DIM_3DXZ); + } + +/////////////////////////////////////////////////////////////////// + + public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) + { + float v, t; + int i; + + switch (bar.getId()) + { + case R.id.interpolatorSeekDuration: v = progress*200; + i = (int)(v/100); + t = i/10.0f; + InterpolatorSurfaceView.setDuration((int)v); + textD.setText("Duration: "+(int)t+" s"); + break; + case R.id.interpolatorSeekNoise : InterpolatorSurfaceView.setNoise(progress/100.0f); + textN.setText("Noise: "+(progress/100.f)); + break; + } + } + +/////////////////////////////////////////////////////////////////// + + public void onStartTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////// + + public void onStopTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////// +// end of file +} diff --git a/src/main/java/org/distorted/examples/interpolator/InterpolatorRenderer.java b/src/main/java/org/distorted/examples/interpolator/InterpolatorRenderer.java new file mode 100644 index 0000000..f9aa75d --- /dev/null +++ b/src/main/java/org/distorted/examples/interpolator/InterpolatorRenderer.java @@ -0,0 +1,89 @@ +package org.distorted.examples.interpolator; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Paint.Style; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Distorted; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class InterpolatorRenderer implements GLSurfaceView.Renderer + { + public static final int BWID = 300; + public static final int BHEI = 400; + + private GLSurfaceView mView; + private DistortedBitmap mBackground; + private Canvas mCanvas; + private Bitmap mBitmap; + private Paint mPaint; + private int texWidth, texHeight; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public InterpolatorRenderer(GLSurfaceView v) + { + mPaint = new Paint(); + mPaint.setAntiAlias(true); + mPaint.setFakeBoldText(true); + mPaint.setColor(0xff447da7); + mPaint.setStyle(Style.FILL); + + mView = v; + + texWidth = BWID; + texHeight= BHEI; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + mBackground = new DistortedBitmap(texWidth,texHeight, 2); + mBitmap = Bitmap.createBitmap(texWidth,texHeight, Bitmap.Config.ARGB_8888); + mCanvas = new Canvas(mBitmap); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Renderer", ex.getMessage() ); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + mBackground.abortAllEffects(Distorted.TYPE_MATR); + mBackground.scale((float)width/texWidth,(float)height/texHeight,1); + Distorted.onSurfaceChanged(width, height); + InterpolatorSurfaceView.setScreenSize(width,height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT); + + long time = System.currentTimeMillis(); + + mCanvas.drawRect(0, 0, texWidth, texHeight, mPaint); + InterpolatorSurfaceView.drawCurve(mCanvas,time); + mBackground.setBitmap(mBitmap); + mBackground.draw(time); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + } diff --git a/src/main/java/org/distorted/examples/interpolator/InterpolatorSurfaceView.java b/src/main/java/org/distorted/examples/interpolator/InterpolatorSurfaceView.java new file mode 100644 index 0000000..4aed3d9 --- /dev/null +++ b/src/main/java/org/distorted/examples/interpolator/InterpolatorSurfaceView.java @@ -0,0 +1,422 @@ +package org.distorted.examples.interpolator; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; +import android.view.MotionEvent; +import android.util.AttributeSet; +import android.graphics.Canvas; +import android.graphics.Paint.Style; +import android.graphics.Paint; + +import org.distorted.library.Interpolator1D; +import org.distorted.library.Interpolator2D; +import org.distorted.library.Interpolator3D; +import org.distorted.library.Float1D; +import org.distorted.library.Float2D; +import org.distorted.library.Float3D; + +/////////////////////////////////////////////////////////////////// + +public class InterpolatorSurfaceView extends GLSurfaceView + { + public static final int DIM_1D = 0; + public static final int DIM_2D = 1; + public static final int DIM_3DXY = 2; + public static final int DIM_3DXZ = 3; + + private static final int NUM_INTERPOLATIONS= 100; + private static final int MAX_VECTORS = 6; + + private InterpolatorRenderer mRenderer; + private static int xDown,yDown; + private static int mScrW, mScrH; + + private static Interpolator1D di1D; + private static Interpolator2D di2D; + private static Interpolator3D di3D; + + private static Paint mPaint; + private static int moving; + private static Object lock = new Object(); + private static long mTime = 0; + private static int mDuration; + private static float mPosition; + private static float mNoise; + + private static int currentDim = DIM_2D; + + private static Float1D p1D; + private static Float2D p2D; + private static Float3D p3D; + + private static float[] mDrawCoord = new float[3]; + +/////////////////////////////////////////////////////////////////// + + public InterpolatorSurfaceView(Context c, AttributeSet attrs) + { + super(c, attrs); + + mPaint = new Paint(); + mPaint.setStyle(Style.FILL); + mPaint.setAntiAlias(true); + + moving = -1; + mDuration = 10000; + mPosition = 0; + mNoise = 0.0f; + + di1D = new Interpolator1D(); + di1D.setDuration(mDuration); + di1D.setNoise(mNoise); + + di2D = new Interpolator2D(); + di2D.setDuration(mDuration); + di2D.setNoise(mNoise); + + di3D = new Interpolator3D(); + di3D.setDuration(mDuration); + di3D.setNoise(mNoise); + + if(!isInEditMode()) + { + setFocusable(true); + setFocusableInTouchMode(true); + + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) // when running on the emulator, insert a magic line that is + { // supposed to cure the 'no config chosen' crash on emulator startup + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + mRenderer = new InterpolatorRenderer(this); + setRenderer(mRenderer); + } + } + +/////////////////////////////////////////////////////////////////// + + public static void setMode(int mode) + { + di1D.setMode(mode); + di2D.setMode(mode); + di3D.setMode(mode); + } + +/////////////////////////////////////////////////////////////////// + + public static void setScreenSize(int width, int height) + { + mScrW = width; + mScrH = height; + } + +/////////////////////////////////////////////////////////////////// + + public static void setDuration(int duration) + { + mDuration = duration; + + di1D.setDuration(duration); + di2D.setDuration(duration); + di3D.setDuration(duration); + } + +/////////////////////////////////////////////////////////////////// + + public static void setNoise(float noise) + { + mNoise = noise; + + di1D.setNoise(noise); + di2D.setNoise(noise); + di3D.setNoise(noise); + } + +/////////////////////////////////////////////////////////////////// + + public static void setDimension(int dim) + { + if( currentDim != dim ) + { + if( !(currentDim==DIM_3DXY && dim==DIM_3DXZ) && !(currentDim==DIM_3DXZ && dim==DIM_3DXY) ) + { + synchronized(lock) + { + di1D.removeAll(); + di2D.removeAll(); + di3D.removeAll(); + } + } + + currentDim = dim; + } + } + +/////////////////////////////////////////////////////////////////// + + public static void drawCurve(Canvas c, long time) + { + mPosition += (mTime>0 && mDuration>0) ? ((float)(time-mTime)*NUM_INTERPOLATIONS/mDuration) : 0; + + synchronized(lock) + { + switch(currentDim) + { + case DIM_1D: drawCurve1D(c,time); break; + case DIM_2D: drawCurve2D(c,time); break; + default : drawCurve3D(c,time); break; + } + } + + mTime = time; + } + +/////////////////////////////////////////////////////////////////// + + private static void drawCurve1D(Canvas c, long time) + { + int len = di1D.getNumPoints(); + + mPaint.setColor(0xff000000); + + c.drawLine(0, InterpolatorRenderer.BHEI/2, InterpolatorRenderer.BWID, InterpolatorRenderer.BHEI/2, mPaint); + c.drawText("x", 0.95f*InterpolatorRenderer.BWID, 0.55f*InterpolatorRenderer.BHEI , mPaint); + + if( len>=2 ) + { + for(int i=0; i=2 ) + { + for(int i=0; i=2 ) + { + for(int i=0; i=MAX_VECTORS ) di1D.removeAll(); + di1D.add(new Float1D(xDown)); + } + } + break; + case DIM_2D: len = di2D.getNumPoints(); + + for(int g=0; g=MAX_VECTORS ) di2D.removeAll(); + di2D.add(new Float2D(xDown,yDown)); + } + } + break; + default : len = di3D.getNumPoints(); + + for(int g=0; g=MAX_VECTORS ) di3D.removeAll(); + + if( currentDim==DIM_3DXY ) + { + di3D.add(new Float3D(xDown,yDown,InterpolatorRenderer.BHEI/2)); + } + if( currentDim==DIM_3DXZ ) + { + di3D.add(new Float3D(xDown,InterpolatorRenderer.BHEI/2,yDown)); + } + } + } + break; + } + } + +/////////////////////////////////////////////////////////////////// + + @Override public boolean onTouchEvent(MotionEvent event) + { + int action = event.getAction(); + + switch(action) + { + case MotionEvent.ACTION_DOWN: xDown = (int)event.getX()*InterpolatorRenderer.BWID/mScrW; + yDown = (int)event.getY()*InterpolatorRenderer.BHEI/mScrH; + + addNewPoint(xDown,yDown); + + break; + case MotionEvent.ACTION_MOVE: if( moving>=0 ) + { + xDown = (int)event.getX()*InterpolatorRenderer.BWID/mScrW; + yDown = (int)event.getY()*InterpolatorRenderer.BHEI/mScrH; + + switch(currentDim) + { + case DIM_1D : di1D.setPoint(moving, xDown); + break; + case DIM_2D : di2D.setPoint(moving, xDown, yDown); + break; + case DIM_3DXY: di3D.setPoint(moving, xDown, yDown, (int)di3D.getPoint(moving).getZ()); + break; + case DIM_3DXZ: di3D.setPoint(moving, xDown, (int)di3D.getPoint(moving).getY(), yDown); + break; + } + } + break; + case MotionEvent.ACTION_UP : moving = -1; + break; + } + + return true; + } + +/////////////////////////////////////////////////////////////////// + } diff --git a/src/main/java/org/distorted/examples/listener/ListenerActivity.java b/src/main/java/org/distorted/examples/listener/ListenerActivity.java new file mode 100644 index 0000000..2678b33 --- /dev/null +++ b/src/main/java/org/distorted/examples/listener/ListenerActivity.java @@ -0,0 +1,52 @@ + +package org.distorted.examples.listener; + +import org.distorted.library.Distorted; + +import android.app.Activity; +import android.os.Bundle; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class ListenerActivity extends Activity +{ + private ListenerSurfaceView mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + mView = new ListenerSurfaceView(this); + setContentView(mView); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + mView.onPause(); + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +} diff --git a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java new file mode 100644 index 0000000..692dc62 --- /dev/null +++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java @@ -0,0 +1,144 @@ + +package org.distorted.examples.listener; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Random; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Float2D; +import org.distorted.library.Float3D; +import org.distorted.library.Float4D; +import org.distorted.library.EffectListener; +import org.distorted.library.EffectMessage; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener +{ + private GLSurfaceView mView; + private DistortedBitmap water; + private int bmpHeight, bmpWidth; + private Random mRnd; + + private final int NUM_BUBBLES = 12; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public ListenerRenderer(GLSurfaceView v) + { + Distorted.setMaxVertex(NUM_BUBBLES); + mView = v; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private long randomizeNewBubble() + { + int radius = (int)((0.10f + 0.70f*mRnd.nextFloat())*bmpWidth); // pop up a bubble of size (radius,height) + int height = (int)((-0.10f + 0.20f*mRnd.nextFloat())*bmpWidth); // + int pointx = mRnd.nextInt( (int)(0.8f*bmpWidth)) + (int)(0.1f*bmpWidth); // at a random place on the bitmap (but not near the edge) + int pointy = mRnd.nextInt( (int)(0.8f*bmpHeight))+ (int)(0.1f*bmpHeight); // + int duration = 1000 + mRnd.nextInt(3000); // for anytime from 3 to 4 seconds + + Float3D dp3d = new Float3D(0,0,height); + Float2D dp2d = new Float2D(pointx,pointy); + Float4D dr = new Float4D(0,0,radius,radius); + + return water.distort(dp3d, dr, dp2d, duration, 1.0f); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void effectMessage(EffectMessage em, long effectID, int effectType, long bitmapID) + { + switch(em) + { + case EFFECT_REMOVED: randomizeNewBubble(); + default : break; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + water.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + water.abortAllEffects(Distorted.TYPE_MATR); + + if( bmpHeight/bmpWidth > height/width ) + { + int w = (height*bmpWidth)/bmpHeight; + water.move((width-w)/2 ,0, 0); + water.scale((float)height/bmpHeight); + } + else + { + int h = (width*bmpHeight)/bmpWidth; + water.move(0 ,(height-h)/2, 0); + water.scale((float)width/bmpWidth); + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.water); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + mRnd = new Random(0); + + bmpHeight = bitmap.getHeight(); + bmpWidth = bitmap.getWidth(); + + water = new DistortedBitmap(bitmap, 50); + water.addEventListener(this); + + for(int i=0; i height/width ) + { + int w = (height*bmpWidth)/bmpHeight; + monaLisa.move((width-w)/2 ,0, 0); + monaLisa.scale((float)height/bmpHeight); + } + else + { + int h = (width*bmpHeight)/bmpWidth; + monaLisa.move(0 ,(height-h)/2, 0); + monaLisa.scale((float)width/bmpWidth); + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.monalisa); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + bmpHeight = bitmap.getHeight(); + bmpWidth = bitmap.getWidth(); + + monaLisa = new DistortedBitmap(bitmap, 10); + monaLisa.distort( vLeft, rLeft , pLeft, 1000, 0); + monaLisa.distort(vRight, rRight, pRight,1000, 0); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("MonaLisa", ex.getMessage() ); + } + } +} diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaSurfaceView.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaSurfaceView.java new file mode 100644 index 0000000..20e8fb5 --- /dev/null +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaSurfaceView.java @@ -0,0 +1,27 @@ + +package org.distorted.examples.monalisa; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class MonaLisaSurfaceView extends GLSurfaceView +{ +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public MonaLisaSurfaceView(Context context) + { + super(context); + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + setRenderer(new MonaLisaRenderer(this)); + } +} + diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java new file mode 100644 index 0000000..aa152ca --- /dev/null +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java @@ -0,0 +1,182 @@ +package org.distorted.examples.movingeffects; + +import org.distorted.library.Distorted; +import org.distorted.examples.R; + +import android.app.Activity; +import android.opengl.GLSurfaceView; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.Toast; + +/////////////////////////////////////////////////////////////////// + +public class MovingEffectsActivity extends Activity + { + private static final int COLOR_PRESSED = 0xff0000ff; + private static final int COLOR_UNPRESSED = 0x888888ff; + private static final String SHOWED_TOAST = "showed_toast"; + + Button mAbort, mMacro, mTrans, mSink, mBubble, mSwirl; + +/////////////////////////////////////////////////////////////////// + @Override + protected void onCreate(Bundle savedState) + { + super.onCreate(savedState); + + setContentView(R.layout.movingeffectslayout); + + mAbort = (Button)findViewById(R.id.movingeffectsAbort); + mMacro = (Button)findViewById(R.id.movingeffectsMacro); + mTrans = (Button)findViewById(R.id.movingeffectsTrans); + mSink = (Button)findViewById(R.id.movingeffectsSink); + mBubble= (Button)findViewById(R.id.movingeffectsBubble); + mSwirl= (Button)findViewById(R.id.movingeffectsSwirl); + + mAbort.setBackgroundColor(COLOR_PRESSED); + mMacro.setBackgroundColor(COLOR_UNPRESSED); + mTrans.setBackgroundColor(COLOR_UNPRESSED); + mSink.setBackgroundColor(COLOR_UNPRESSED); + mBubble.setBackgroundColor(COLOR_UNPRESSED); + mSwirl.setBackgroundColor(COLOR_UNPRESSED); + + if ( savedState== null || !savedState.getBoolean(SHOWED_TOAST, false)) + { + Toast.makeText(this, R.string.example_movingeffects_toast , Toast.LENGTH_LONG).show(); + } + } + +/////////////////////////////////////////////////////////////////// + @Override + protected void onResume() + { + super.onResume(); + + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////// + @Override + protected void onPause() + { + Abort(null); + + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView); + mView.onPause(); + + super.onPause(); + } + +/////////////////////////////////////////////////////////////////// + @Override + public void onStop() + { + super.onStop(); + } + +/////////////////////////////////////////////////////////////////// + @Override + public void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onSaveInstanceState (Bundle outState) + { + outState.putBoolean(SHOWED_TOAST, true); + } + +/////////////////////////////////////////////////////////////////// + + public void Bubble(View v) + { + MovingEffectsSurfaceView.Bubble(); + + mAbort.setBackgroundColor(COLOR_UNPRESSED); + mMacro.setBackgroundColor(COLOR_UNPRESSED); + mTrans.setBackgroundColor(COLOR_UNPRESSED); + mSink.setBackgroundColor(COLOR_UNPRESSED); + mBubble.setBackgroundColor(COLOR_PRESSED); + mSwirl.setBackgroundColor(COLOR_UNPRESSED); + } + +/////////////////////////////////////////////////////////////////// + + public void Sink(View v) + { + MovingEffectsSurfaceView.Sink(); + + mAbort.setBackgroundColor(COLOR_UNPRESSED); + mMacro.setBackgroundColor(COLOR_UNPRESSED); + mTrans.setBackgroundColor(COLOR_UNPRESSED); + mSink.setBackgroundColor(COLOR_PRESSED); + mBubble.setBackgroundColor(COLOR_UNPRESSED); + mSwirl.setBackgroundColor(COLOR_UNPRESSED); + } + +/////////////////////////////////////////////////////////////////// + + public void Transparency(View v) + { + MovingEffectsSurfaceView.Transparency(); + + mAbort.setBackgroundColor(COLOR_UNPRESSED); + mMacro.setBackgroundColor(COLOR_UNPRESSED); + mTrans.setBackgroundColor(COLOR_PRESSED); + mSink.setBackgroundColor(COLOR_UNPRESSED); + mBubble.setBackgroundColor(COLOR_UNPRESSED); + mSwirl.setBackgroundColor(COLOR_UNPRESSED); + } + +/////////////////////////////////////////////////////////////////// + + public void Macroblock(View v) + { + MovingEffectsSurfaceView.Macroblock(); + + mAbort.setBackgroundColor(COLOR_UNPRESSED); + mMacro.setBackgroundColor(COLOR_PRESSED); + mTrans.setBackgroundColor(COLOR_UNPRESSED); + mSink.setBackgroundColor(COLOR_UNPRESSED); + mBubble.setBackgroundColor(COLOR_UNPRESSED); + mSwirl.setBackgroundColor(COLOR_UNPRESSED); + } + +/////////////////////////////////////////////////////////////////// + + public void Swirl(View v) + { + MovingEffectsSurfaceView.Swirl(); + + mAbort.setBackgroundColor(COLOR_UNPRESSED); + mMacro.setBackgroundColor(COLOR_UNPRESSED); + mTrans.setBackgroundColor(COLOR_UNPRESSED); + mSink.setBackgroundColor(COLOR_UNPRESSED); + mBubble.setBackgroundColor(COLOR_UNPRESSED); + mSwirl.setBackgroundColor(COLOR_PRESSED); + } + +/////////////////////////////////////////////////////////////////// + + public void Abort(View v) + { + MovingEffectsSurfaceView.Abort(); + + mAbort.setBackgroundColor(COLOR_PRESSED); + mMacro.setBackgroundColor(COLOR_UNPRESSED); + mTrans.setBackgroundColor(COLOR_UNPRESSED); + mSink.setBackgroundColor(COLOR_UNPRESSED); + mBubble.setBackgroundColor(COLOR_UNPRESSED); + mSwirl.setBackgroundColor(COLOR_UNPRESSED); + } + +/////////////////////////////////////////////////////////////////// +// end of file +} diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java new file mode 100644 index 0000000..4278d52 --- /dev/null +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java @@ -0,0 +1,109 @@ +package org.distorted.examples.movingeffects; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Paint.Style; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Distorted; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class MovingEffectsRenderer implements GLSurfaceView.Renderer + { + public static final int NUMLINES = 10; + public static final int BWID = 300; + public static final int BHEI = 400; + + private GLSurfaceView mView; + public static DistortedBitmap mBackground; + private Canvas mCanvas; + private Bitmap mBitmap; + private Paint mPaint; + private int texWidth, texHeight; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public MovingEffectsRenderer(GLSurfaceView v) + { + mPaint = new Paint(); + mPaint.setAntiAlias(true); + mPaint.setFakeBoldText(true); + mPaint.setStyle(Style.FILL); + + mView = v; + + texWidth = BWID; + texHeight= BHEI; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void drawBackground() + { + mPaint.setColor(0xff008800); + mCanvas.drawRect(0, 0, texWidth, texHeight, mPaint); + mPaint.setColor(0xffffffff); + + for(int i=0; i<=NUMLINES ; i++ ) + { + mCanvas.drawRect(texWidth*i/NUMLINES - 2, 0, texWidth*i/NUMLINES + 2, texHeight , mPaint); + mCanvas.drawRect( 0, texHeight*i/NUMLINES -2, texWidth , texHeight*i/NUMLINES + 2, mPaint); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + mBackground = new DistortedBitmap(texWidth,texHeight, 80); + mBitmap = Bitmap.createBitmap(texWidth,texHeight, Bitmap.Config.ARGB_8888); + mCanvas = new Canvas(mBitmap); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Renderer", ex.getMessage() ); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + mBackground.abortAllEffects(Distorted.TYPE_MATR); + mBackground.scale((float)width/texWidth,(float)height/texHeight,1); + + Distorted.onSurfaceChanged(width, height); + MovingEffectsSurfaceView.setScreenSize(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT); + + long time = System.currentTimeMillis(); + + if (MovingEffectsSurfaceView.getCurrentEffect() == MovingEffectsSurfaceView.EFFECT_POINTS ) + { + drawBackground(); + MovingEffectsSurfaceView.drawCurve(mCanvas,time); + mBackground.setBitmap(mBitmap); + } + + mBackground.draw(time); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +} diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java new file mode 100644 index 0000000..7cf3a1d --- /dev/null +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java @@ -0,0 +1,271 @@ +package org.distorted.examples.movingeffects; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Paint.Style; +import android.opengl.GLSurfaceView; +import android.os.Build; +import android.view.MotionEvent; +import android.util.AttributeSet; + +import org.distorted.library.Distorted; +import org.distorted.library.Float2D; +import org.distorted.library.Float3D; +import org.distorted.library.Float4D; +import org.distorted.library.Interpolator2D; +import org.distorted.library.Interpolator3D; + +/////////////////////////////////////////////////////////////////// + +public class MovingEffectsSurfaceView extends GLSurfaceView + { + private static final int LOOP_TIME = 5000; + private static final int NUM_INTERPOLATIONS= 100; + + public static final int EFFECT_POINTS=0; + public static final int EFFECT_BUBBLE=1; + public static final int EFFECT_SINK =2; + public static final int EFFECT_TRANS =3; + public static final int EFFECT_MACRO =4; + public static final int EFFECT_SWIRL =5; + + private static MovingEffectsRenderer mRenderer; + + private static int xDown,yDown; + private static int mScrW, mScrH; + + private static Interpolator2D di2D; + private static Interpolator3D di3D; + private static Float4D dr; + + private static Paint mPaint; + private static int moving; + private static Object lock = new Object(); + private static long mTime = 0; + + private static int mCurrEffect; + +/////////////////////////////////////////////////////////////////// + + public MovingEffectsSurfaceView(Context c, AttributeSet attrs) + { + super(c, attrs); + + mCurrEffect=EFFECT_POINTS; + mPaint = new Paint(); + mPaint.setStyle(Style.FILL); + moving = -1; + + di2D = new Interpolator2D(); + di2D.setCount(0.0f); + di2D.setDuration(LOOP_TIME); + + di3D = new Interpolator3D(); + di3D.add(new Float3D(0,0, 0)); + di3D.add(new Float3D(0,0,30)); + + dr = new Float4D(0,0,60,60); + + if(!isInEditMode()) + { + setFocusable(true); + setFocusableInTouchMode(true); + + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) // when running on the emulator, insert a magic line that is + { // supposed to cure the 'no config chosen' crash on emulator startup + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + mRenderer = new MovingEffectsRenderer(this); + setRenderer(mRenderer); + } + } + +/////////////////////////////////////////////////////////////////// + + public static void setScreenSize(int width, int height) + { + mScrW = width; + mScrH = height; + } + +/////////////////////////////////////////////////////////////////// + + public static int getCurrentEffect() + { + return mCurrEffect; + } + +/////////////////////////////////////////////////////////////////// + + public static void Bubble() + { + if( mCurrEffect==EFFECT_BUBBLE ) return; + + synchronized(lock) + { + MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.distort(di3D, dr, di2D); + mCurrEffect = EFFECT_BUBBLE; + } + } + +/////////////////////////////////////////////////////////////////// + + public static void Sink() + { + if( mCurrEffect==EFFECT_SINK ) return; + + synchronized(lock) + { + MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.sink(10.0f, dr, di2D, 0, 0.5f); + mCurrEffect = EFFECT_SINK; + } + } + +/////////////////////////////////////////////////////////////////// + + public static void Macroblock() + { + if( mCurrEffect==EFFECT_MACRO ) return; + + synchronized(lock) + { + MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.macroblock(3, dr, di2D, 0, 0.5f); + mCurrEffect = EFFECT_MACRO; + } + } + +/////////////////////////////////////////////////////////////////// + + public static void Transparency() + { + if( mCurrEffect==EFFECT_TRANS ) return; + + synchronized(lock) + { + MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.smooth_alpha(0.5f, dr, di2D, 0, 0.5f); + mCurrEffect = EFFECT_TRANS; + } + } + +/////////////////////////////////////////////////////////////////// + + public static void Swirl() + { + if( mCurrEffect==EFFECT_SWIRL ) return; + + synchronized(lock) + { + MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.swirl(30, dr, di2D, 0, 0.5f); + mCurrEffect = EFFECT_SWIRL; + } + } + +/////////////////////////////////////////////////////////////////// + + public static void Abort() + { + synchronized(lock) + { + MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + di2D.removeAll(); + mCurrEffect = EFFECT_POINTS; + } + } + +/////////////////////////////////////////////////////////////////// + + public static void drawCurve(Canvas c, long time) + { + synchronized(lock) + { + int len = di2D.getNumPoints(); + float[] drawCoord = new float[2]; + Float2D cu; + int lit = mTime> 0 ? (int)((float)(time-mTime)*NUM_INTERPOLATIONS/LOOP_TIME) : 0; + + if( len>=2 ) + { + for(int i=0; i LOOP_TIME ) mTime = time; + } + } + +/////////////////////////////////////////////////////////////////// + + @Override public boolean onTouchEvent(MotionEvent event) + { + if( mCurrEffect!=EFFECT_POINTS ) return true; + + switch(event.getAction()) + { + case MotionEvent.ACTION_DOWN: xDown = (int)event.getX()*MovingEffectsRenderer.BWID/mScrW; + yDown = (int)event.getY()*MovingEffectsRenderer.BHEI/mScrH; + + float gx, gy; + Float2D dv; + int len = di2D.getNumPoints(); + + for(int g=0; g=0 ) + { + xDown = (int)event.getX()*MovingEffectsRenderer.BWID/mScrW; + yDown = (int)event.getY()*MovingEffectsRenderer.BHEI/mScrH; + di2D.setPoint(moving, xDown, yDown); + } + break; + case MotionEvent.ACTION_UP : moving = -1; + break; + } + return true; + } + +/////////////////////////////////////////////////////////////////// +// end of file + + } diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java b/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java new file mode 100644 index 0000000..32dd3e1 --- /dev/null +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java @@ -0,0 +1,51 @@ + +package org.distorted.examples.olimpic; + +import org.distorted.library.Distorted; + +import android.app.Activity; +import android.os.Bundle; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class OlimpicActivity extends Activity +{ + private OlimpicSurfaceView mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + mView = new OlimpicSurfaceView(this); + setContentView(mView); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + mView.onPause(); + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } +} diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java new file mode 100644 index 0000000..a8823bc --- /dev/null +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java @@ -0,0 +1,160 @@ + +package org.distorted.examples.olimpic; + +import java.io.IOException; +import java.io.InputStream; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.Interpolator1D; +import org.distorted.library.DistortedNode; +import org.distorted.library.Float3D; +import org.distorted.library.Float1D; +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class OlimpicRenderer implements GLSurfaceView.Renderer +{ + private static final int LEAF_SIZE = 100; + private static final int NUM_CIRCLES = 5; + private static final int NUM_LEAVES = 8; + + private GLSurfaceView mView; + private DistortedNode[] mCircleNode; + private DistortedNode mScreen; + private DistortedBitmap mLeaf; + private Interpolator1D mRot; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public OlimpicRenderer(GLSurfaceView v) + { + mView = v; + + mLeaf = new DistortedBitmap(LEAF_SIZE,LEAF_SIZE,1); + + mScreen = new DistortedNode(new DistortedBitmap(9*LEAF_SIZE,9*LEAF_SIZE,1)); + + mRot = new Interpolator1D(); + mRot.setMode(Interpolator1D.MODE_JUMP); + mRot.setCount(0.0f); + mRot.setDuration(5000); + mRot.add(new Float1D( 0)); + mRot.add(new Float1D(360)); + + mCircleNode = new DistortedNode[NUM_CIRCLES]; + + int[] colors = new int[] {0,0,1, 0,0,0, 1,0,0, 1,1,0, 0,1,0}; // blue, black, red, yellow, green + int[] positions = new int[] {0*LEAF_SIZE,2*LEAF_SIZE, 3*LEAF_SIZE,2*LEAF_SIZE, 6*LEAF_SIZE,2*LEAF_SIZE, 3*LEAF_SIZE/2,9*LEAF_SIZE/2, 9*LEAF_SIZE/2,9*LEAF_SIZE/2}; + + DistortedBitmap tmp; + Float3D center = new Float3D(3*LEAF_SIZE/2, 3*LEAF_SIZE/2, 0); + + for(int i=0; i height/width ) + { + int w = (height*bmpWidth)/bmpHeight; + bmp.move((width-w)/2 ,0, 0); + bmp.scale((float)height/bmpHeight); + } + else + { + int h = (width*bmpHeight)/bmpWidth; + bmp.move(0 ,(height-h)/2, 0); + bmp.scale((float)width/bmpWidth); + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.leaf); + Bitmap leaf; + + try + { + leaf = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + mLeaf.setBitmap(leaf); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("DifferentEffectsRenderer", ex.getMessage() ); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +} diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicSurfaceView.java b/src/main/java/org/distorted/examples/olimpic/OlimpicSurfaceView.java new file mode 100644 index 0000000..ddbf240 --- /dev/null +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicSurfaceView.java @@ -0,0 +1,27 @@ + +package org.distorted.examples.olimpic; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class OlimpicSurfaceView extends GLSurfaceView +{ +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public OlimpicSurfaceView(Context context) + { + super(context); + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + setRenderer(new OlimpicRenderer(this)); + } +} + diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java b/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java new file mode 100644 index 0000000..352fef9 --- /dev/null +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java @@ -0,0 +1,51 @@ + +package org.distorted.examples.quaternion; + +import org.distorted.library.Distorted; + +import android.app.Activity; +import android.os.Bundle; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class QuaternionActivity extends Activity +{ + private QuaternionSurfaceView mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + mView = new QuaternionSurfaceView(this); + setContentView(mView); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + mView.onPause(); + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } +} diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java new file mode 100644 index 0000000..84cbf63 --- /dev/null +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java @@ -0,0 +1,128 @@ + +package org.distorted.examples.quaternion; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Random; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.Interpolator; +import org.distorted.library.InterpolatorQuat; +import org.distorted.library.DistortedCubes; +import org.distorted.library.Float4D; +import org.distorted.library.Float3D; +import org.distorted.library.Distorted; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class QuaternionRenderer implements GLSurfaceView.Renderer +{ + private static final int NUM_QUATERNIONS = 5; + private static final int SIZE = 100; + + private GLSurfaceView mView; + private DistortedCubes mCube; + private Random mRnd = new Random(System.currentTimeMillis()); + private InterpolatorQuat mRot; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public QuaternionRenderer(GLSurfaceView v) + { + mView = v; + mCube = new DistortedCubes( 3, "000010000", SIZE); + + mRot = new InterpolatorQuat(); + + float x,y,z,w, len; + + for(int i=0; i height ) + { + mCube.move((width-height)/2 ,0, 0); + mCube.scale(height/(3.0f*SIZE)); + } + else + { + mCube.move(0 ,(height-width)/2, 0); + mCube.scale(width/(3.0f*SIZE)); + } + + mCube.quaternion( new Float3D(3*SIZE/2,3*SIZE/2,0), mRot); + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.grid); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + mCube.setBitmap(bitmap); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Quaternion", ex.getMessage() ); + } + } +} diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionSurfaceView.java b/src/main/java/org/distorted/examples/quaternion/QuaternionSurfaceView.java new file mode 100644 index 0000000..c38fc1f --- /dev/null +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionSurfaceView.java @@ -0,0 +1,31 @@ + +package org.distorted.examples.quaternion; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class QuaternionSurfaceView extends GLSurfaceView +{ +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public QuaternionSurfaceView(Context c) + { + super(c); + + if(!isInEditMode()) + { + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + setRenderer(new QuaternionRenderer(this)); + } + } +} + diff --git a/src/main/java/org/distorted/examples/scratchpad/ScratchpadActivity.java b/src/main/java/org/distorted/examples/scratchpad/ScratchpadActivity.java new file mode 100644 index 0000000..e5ba42b --- /dev/null +++ b/src/main/java/org/distorted/examples/scratchpad/ScratchpadActivity.java @@ -0,0 +1,175 @@ +package org.distorted.examples.scratchpad; + +import org.distorted.library.Distorted; +import org.distorted.examples.R; + +import android.app.Activity; +import android.opengl.GLSurfaceView; +import android.os.Bundle; +import android.view.View; +import android.widget.SeekBar.OnSeekBarChangeListener; +import android.widget.SeekBar; +import android.widget.TextView; + +/////////////////////////////////////////////////////////////////// + +public class ScratchpadActivity extends Activity implements OnSeekBarChangeListener + { + private static final float D_MULT=200.0f; + private static final float C_MULT= 0.1f; + + private long effectID; + + private SeekBar barD, barC, barI; + private TextView textD, textC, textI; + +/////////////////////////////////////////////////////////////////// + @Override + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + + setContentView(R.layout.scratchpadlayout); + + barD = (SeekBar)findViewById(R.id.scratchpadSeekDuration); + barD.setOnSeekBarChangeListener(this); + barC = (SeekBar)findViewById(R.id.scratchpadSeekCount); + barC.setOnSeekBarChangeListener(this); + barI = (SeekBar)findViewById(R.id.scratchpadSeekID); + barI.setOnSeekBarChangeListener(this); + + textD = (TextView)findViewById(R.id.scratchpadTextDuration); + textC = (TextView)findViewById(R.id.scratchpadTextCount); + textI = (TextView)findViewById(R.id.scratchpadTextID); + + barD.setProgress(100); + barC.setProgress(10); + barI.setProgress(0); + + textD.setText("Dur: 20 s"); + textC.setText("Cou: 1.0"); + textI.setText("ID: 0"); + } + +/////////////////////////////////////////////////////////////////// + @Override + protected void onResume() + { + super.onResume(); + + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.scratchpadSurfaceView); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////// + @Override + protected void onPause() + { + GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.scratchpadSurfaceView); + mView.onPause(); + + super.onPause(); + } + +/////////////////////////////////////////////////////////////////// + @Override + public void onStop() + { + super.onStop(); + } + +/////////////////////////////////////////////////////////////////// + @Override + public void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +/////////////////////////////////////////////////////////////////// + + public void Distort(View v) + { + ScratchpadSurfaceView.setEffect(0); + } + +/////////////////////////////////////////////////////////////////// + + public void Sink(View v) + { + ScratchpadSurfaceView.setEffect(1); + } + +/////////////////////////////////////////////////////////////////// + + public void Transparency(View v) + { + ScratchpadSurfaceView.setEffect(2); + } + +/////////////////////////////////////////////////////////////////// + + public void Macroblock(View v) + { + ScratchpadSurfaceView.setEffect(3); + } + +/////////////////////////////////////////////////////////////////// + + public void Brightness(View v) + { + ScratchpadSurfaceView.setEffect(4); + } + +/////////////////////////////////////////////////////////////////// + + public void Print(View v) + { + ScratchpadRenderer.mBackground.printEffect(effectID); + } + +/////////////////////////////////////////////////////////////////// + + public void Abort(View v) + { + ScratchpadRenderer.mBackground.abortEffect(effectID); + } + +/////////////////////////////////////////////////////////////////// + + public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) + { + float v, t; + int i; + + switch (bar.getId()) + { + case R.id.scratchpadSeekDuration: v = progress*D_MULT; + i = (int)(v/100); + t = i/10.0f; + ScratchpadSurfaceView.setDuration((int)v); + textD.setText("Dur: "+(int)t+" s"); + break; + case R.id.scratchpadSeekCount : v = progress*C_MULT; + i = (int)(v*10); + t = i/10.0f; + ScratchpadSurfaceView.setCount(v); + textC.setText("Cou: "+t); + break; + case R.id.scratchpadSeekID : effectID = progress; + textI.setText("ID: "+progress); + break; + } + } + +/////////////////////////////////////////////////////////////////// + + public void onStartTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////// + + public void onStopTrackingTouch(SeekBar bar) { } + +/////////////////////////////////////////////////////////////////// +// end of file +} diff --git a/src/main/java/org/distorted/examples/scratchpad/ScratchpadRenderer.java b/src/main/java/org/distorted/examples/scratchpad/ScratchpadRenderer.java new file mode 100644 index 0000000..dab3ad2 --- /dev/null +++ b/src/main/java/org/distorted/examples/scratchpad/ScratchpadRenderer.java @@ -0,0 +1,93 @@ +package org.distorted.examples.scratchpad; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Paint.Style; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Distorted; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class ScratchpadRenderer implements GLSurfaceView.Renderer + { + public static final int NUMLINES = 10; + public static final int BWID = 300; + public static final int BHEI = 400; + + private GLSurfaceView mView; + public static DistortedBitmap mBackground; + private Paint mPaint; + private int texWidth, texHeight; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public ScratchpadRenderer(GLSurfaceView v) + { + mPaint = new Paint(); + mPaint.setAntiAlias(true); + mPaint.setFakeBoldText(true); + mPaint.setStyle(Style.FILL); + + mView = v; + + texWidth = BWID; + texHeight= BHEI; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + mBackground = new DistortedBitmap(texWidth,texHeight, 80); + Bitmap bitmap = Bitmap.createBitmap(texWidth,texHeight, Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(bitmap); + + mPaint.setColor(0xff008800); + canvas.drawRect(0, 0, texWidth, texHeight, mPaint); + mPaint.setColor(0xffffffff); + + for(int i=0; i<=NUMLINES ; i++ ) + { + canvas.drawRect(texWidth*i/NUMLINES - 1, 0, texWidth*i/NUMLINES + 1, texHeight , mPaint); + canvas.drawRect( 0, texHeight*i/NUMLINES -1, texWidth , texHeight*i/NUMLINES + 1, mPaint); + } + + mBackground.setBitmap(bitmap); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Renderer", ex.getMessage() ); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + mBackground.abortAllEffects(Distorted.TYPE_MATR); + mBackground.scale((float)width/texWidth,(float)height/texHeight,1); + Distorted.onSurfaceChanged(width,height); + ScratchpadSurfaceView.setScreenSize(width,height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT); + mBackground.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +} diff --git a/src/main/java/org/distorted/examples/scratchpad/ScratchpadSurfaceView.java b/src/main/java/org/distorted/examples/scratchpad/ScratchpadSurfaceView.java new file mode 100644 index 0000000..9b07eb6 --- /dev/null +++ b/src/main/java/org/distorted/examples/scratchpad/ScratchpadSurfaceView.java @@ -0,0 +1,152 @@ +package org.distorted.examples.scratchpad; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; +import android.view.MotionEvent; +import android.util.AttributeSet; + +import org.distorted.library.Float2D; +import org.distorted.library.Float3D; +import org.distorted.library.Float4D; +import org.distorted.library.Interpolator3D; + +/////////////////////////////////////////////////////////////////// + +public class ScratchpadSurfaceView extends GLSurfaceView + { + private ScratchpadRenderer mRenderer; + private static int mCurrentEffect; + private static int mDuration; + private static float mCount; + private static int mScrW, mScrH; + + private static Float4D region; + private static Float2D point; + + private static Interpolator3D di; + private static Float3D v0, v1, v2, v3; + +/////////////////////////////////////////////////////////////////// + + public ScratchpadSurfaceView(Context c, AttributeSet attrs) + { + super(c, attrs); + + mDuration = 10000; + mCount = 1.0f; + + di = new Interpolator3D(); + + di.setDuration(mDuration); + di.setCount(mCount); + + if(!isInEditMode()) + { + setFocusable(true); + setFocusableInTouchMode(true); + + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) // when running on the emulator, insert a magic line that is + { // supposed to cure the 'no config chosen' crash on emulator startup + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + mRenderer = new ScratchpadRenderer(this); + setRenderer(mRenderer); + + point = new Float2D(0,0); + region= new Float4D(0,0,60,60); + + int h = 30; + int r = 20; + + v0 = new Float3D( 0, r, h ); + v1 = new Float3D(-r, 0, h ); + v2 = new Float3D( 0,-r, h ); + v3 = new Float3D( r, 0, h ); + + di.add(v0); + di.add(v1); + di.add(v2); + di.add(v3); + + setEffect(0); + } + } + +/////////////////////////////////////////////////////////////////// + + public static void setScreenSize(int width, int height) + { + mScrW = width; + mScrH = height; + } + +/////////////////////////////////////////////////////////////////// + + public static int getEffect() + { + return mCurrentEffect; + } + +/////////////////////////////////////////////////////////////////// + + public static void setEffect(int effect) + { + mCurrentEffect = effect; + } + +/////////////////////////////////////////////////////////////////// + + public static void setDuration(int duration) + { + mDuration = duration; + di.setDuration(duration); + } + +/////////////////////////////////////////////////////////////////// + + public static void setCount(float count) + { + mCount = count; + di.setCount(count); + } + +/////////////////////////////////////////////////////////////////// + + @Override public boolean onTouchEvent(MotionEvent event) + { + int action = event.getAction(); + int x, y; + + switch(action) + { + case MotionEvent.ACTION_DOWN: x = (int)event.getX()*ScratchpadRenderer.BWID/mScrW; + y = (int)event.getY()*ScratchpadRenderer.BHEI/mScrH; + point.set(x,y); + + switch(mCurrentEffect) + { + case 0: ScratchpadRenderer.mBackground.distort(di, region, point); + break; + case 1: ScratchpadRenderer.mBackground.sink(0.3f, region, point, mDuration, mCount); + break; + case 2: ScratchpadRenderer.mBackground.alpha(0.0f, region, point, mDuration, mCount); + break; + case 3: ScratchpadRenderer.mBackground.macroblock(10, region, point, mDuration, mCount); + break; + case 4: ScratchpadRenderer.mBackground.brightness(0.0f, region, point, mDuration, mCount); + break; + } + break; + } + + return true; + } + +/////////////////////////////////////////////////////////////////// +// end of file + + } diff --git a/src/main/java/org/distorted/examples/sink/SinkActivity.java b/src/main/java/org/distorted/examples/sink/SinkActivity.java new file mode 100644 index 0000000..0a2e456 --- /dev/null +++ b/src/main/java/org/distorted/examples/sink/SinkActivity.java @@ -0,0 +1,51 @@ + +package org.distorted.examples.sink; + +import org.distorted.library.Distorted; + +import android.app.Activity; +import android.os.Bundle; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class SinkActivity extends Activity +{ + private SinkSurfaceView mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + mView = new SinkSurfaceView(this); + setContentView(mView); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + mView.onPause(); + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } +} diff --git a/src/main/java/org/distorted/examples/sink/SinkRenderer.java b/src/main/java/org/distorted/examples/sink/SinkRenderer.java new file mode 100644 index 0000000..2d80813 --- /dev/null +++ b/src/main/java/org/distorted/examples/sink/SinkRenderer.java @@ -0,0 +1,111 @@ + +package org.distorted.examples.sink; + +import java.io.IOException; +import java.io.InputStream; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; +import org.distorted.library.Float2D; +import org.distorted.library.Float4D; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SinkRenderer implements GLSurfaceView.Renderer +{ + private GLSurfaceView mView; + private DistortedBitmap sinkBmp; + private Float2D pLeft, pRight; + private Float4D Region; + private int bmpHeight, bmpWidth; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public SinkRenderer(GLSurfaceView v) + { + mView = v; + + pLeft = new Float2D(214, 206); + pRight= new Float2D(390, 212); + Region= new Float4D(0,0,60,60); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + sinkBmp.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + sinkBmp.abortAllEffects(Distorted.TYPE_MATR); + + if( bmpHeight/bmpWidth > height/width ) + { + int w = (height*bmpWidth)/bmpHeight; + sinkBmp.move((width-w)/2 ,0, 0); + sinkBmp.scale((float)height/bmpHeight); + } + else + { + int h = (width*bmpHeight)/bmpWidth; + sinkBmp.move(0 ,(height-h)/2, 0); + sinkBmp.scale((float)width/bmpWidth); + } + + Distorted.onSurfaceChanged(width, height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + InputStream is = mView.getContext().getResources().openRawResource(R.raw.dog); + Bitmap bitmap; + + try + { + bitmap = BitmapFactory.decodeStream(is); + } + finally + { + try + { + is.close(); + } + catch(IOException e) { } + } + + bmpHeight = bitmap.getHeight(); + bmpWidth = bitmap.getWidth(); + + sinkBmp = new DistortedBitmap(bitmap, 30); + sinkBmp.sink( 10.0f, Region, pLeft, 2000, 0.0f); + sinkBmp.sink(10.0f, Region, pRight,2000, 0.0f); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Sink", ex.getMessage() ); + } + } +} diff --git a/src/main/java/org/distorted/examples/sink/SinkSurfaceView.java b/src/main/java/org/distorted/examples/sink/SinkSurfaceView.java new file mode 100644 index 0000000..63f6091 --- /dev/null +++ b/src/main/java/org/distorted/examples/sink/SinkSurfaceView.java @@ -0,0 +1,27 @@ + +package org.distorted.examples.sink; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SinkSurfaceView extends GLSurfaceView +{ +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public SinkSurfaceView(Context context) + { + super(context); + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + setRenderer(new SinkRenderer(this)); + } +} + diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java b/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java new file mode 100644 index 0000000..6577601 --- /dev/null +++ b/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java @@ -0,0 +1,52 @@ + +package org.distorted.examples.starwars; + +import org.distorted.library.Distorted; + +import android.app.Activity; +import android.os.Bundle; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class StarWarsActivity extends Activity +{ + private StarWarsSurfaceView mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onCreate(Bundle icicle) + { + super.onCreate(icicle); + mView = new StarWarsSurfaceView(this); + setContentView(mView); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + mView.onPause(); + super.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + mView.onResume(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + Distorted.onDestroy(); + super.onDestroy(); + } + +} diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java new file mode 100644 index 0000000..a20bc11 --- /dev/null +++ b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java @@ -0,0 +1,388 @@ + +package org.distorted.examples.starwars; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Random; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import org.distorted.examples.R; + +import org.distorted.library.Interpolator1D; +import org.distorted.library.Interpolator3D; +import org.distorted.library.DistortedNode; +import org.distorted.library.Float1D; +import org.distorted.library.Float2D; +import org.distorted.library.Float3D; +import org.distorted.library.Float4D; +import org.distorted.library.EffectListener; +import org.distorted.library.EffectMessage; +import org.distorted.library.Distorted; +import org.distorted.library.DistortedBitmap; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Typeface; +import android.opengl.GLES20; +import android.opengl.GLSurfaceView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener +{ + private final String[] mGFFAString = + + { "A long time ago, in a galaxy far,", + "far away...." }; // yes, there really was a four-dot ellipsis + + private final String[] mCRAWLString = + + { "It is a period of civil war.", // in the original 1977 version, there was no + "Rebel spaceships, striking", // 'Episode IV New Hope' subtitle line before + "from a hidden base, have", // the crawl. Lets keep to the classic. + "won their first victory", + "against the evil Galactic", + "Empire.", + "", + "During the battle, rebel", + "spies managed to steal", + "secret plans to the Empire's", + "ultimate weapon, the", + "DEATH STAR, an armored", + "space station with enough", + "power to destroy an entire", + "planet.", + "", + "Pursued by the Empire's", + "sinister agents, Princess", + "Leia races home aboard her", + "starship, custodian of the", + "stolen plans that can save", + "her people and restore", + "freedom to the galaxy...." }; // four-dot. + + private final int NUM_STARS = 40; + + private final int CRAWL_COLOR = 0xffffe81f; + private final int GFFA_COLOR = 0xff0000ff; + private final int FONT_HEIGHT = 40; + private final int VERTICAL_SPACING = 10; + private final String CRAWL_TYPEFACE = "News Gothic"; + + private final int CRAWL_WIDTH = 500; + private final int CRAWL_HEIGHT= (FONT_HEIGHT+VERTICAL_SPACING)*(mCRAWLString.length+1); + + private final int GFFA_WIDTH = 600; + private final int GFFA_HEIGHT= (FONT_HEIGHT+VERTICAL_SPACING)*(mGFFAString.length+1); + + private final float CRAWL_ANGLE = -30.0f; + + private GLSurfaceView mView; + private DistortedBitmap mScreen, mGFFA, mLogo, mCrawl, mCrawlBackground; + private DistortedBitmap[] mStars; + private long gffaID, logoID, crawlID; + + private Random mRnd = new Random(0); + private DistortedNode mRoot, mBackground; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public StarWarsRenderer(GLSurfaceView v) + { + mView = v; + + Distorted.setFov(60.0f); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onDrawFrame(GL10 glUnused) + { + GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); + + mRoot.draw(System.currentTimeMillis()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + Distorted.onSurfaceChanged(width, height); + setupScreen(width,height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + setupBitmaps(); + + try + { + Distorted.onSurfaceCreated(mView); + } + catch(Exception ex) + { + android.util.Log.e("Star Wars", ex.getMessage() ); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setupScreen(int w, int h) + { + mScreen = new DistortedBitmap(w,h,1); + mRoot = new DistortedNode(mScreen); + + mCrawlBackground = new DistortedBitmap(w,(int)(Math.sqrt(3.0)*h),1); + + int randomA, randomX, randomY, randomTime; + float randomS, randomAlpha1, randomAlpha2; + + Float3D rot = new Float3D(0,0,0); + + for(int i=0; i0 && str.charAt(len-1) == ' ' ) numspaces--; + + float left=x,w = (numspaces>0 ? (float)(length-paint.measureText(str))/numspaces : 0); + String tmp; + int begin,end=0; + + while( end0 ) ret++; + else break; + } + + return ret; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void effectMessage(EffectMessage em, long effectID, int effectType, long bitmapID) + { + if( em==EffectMessage.EFFECT_FINISHED ) + { + if( bitmapID == gffaID ) + { + mRoot.detach(mGFFA); + mGFFA.removeEventListener(this); + + int screenW=mScreen.getWidth(); + int screenH=mScreen.getHeight(); + + int logoW = mLogo.getWidth(); + int logoH = mLogo.getHeight(); + + int initSize= (int)(3.0f*screenW/logoW); + int finaSize= (int)(0.1f*screenW/logoW); + + Interpolator3D di = new Interpolator3D(); + + di.add(new Float3D(initSize,initSize,1)); + di.add(new Float3D(finaSize,finaSize,1)); + di.setCount(0.5f); + di.setDuration(10000); + + mLogo.move( screenW/2, screenH/2, 0); + mLogo.scale(di); + mLogo.move( -logoW/2, -logoH/2, 0); + + mRoot.attach(mLogo); + mLogo.addEventListener(this); + } + else if( bitmapID==logoID ) + { + mRoot.detach(mLogo); + mLogo.removeEventListener(this); + + int crawlW = mCrawl.getWidth(); + int crawlH = mCrawl.getHeight(); + int screenW= mScreen.getWidth(); + int screenH= mScreen.getHeight(); + int backH = mCrawlBackground.getHeight(); + float scale= (float)screenW/crawlW; + + Interpolator3D di = new Interpolator3D(); + di.setCount(0.5f); + di.setDuration(60000); + di.add(new Float3D(screenW/2,+backH , 0)); + di.add(new Float3D(screenW/2,-scale*crawlH, 0)); + + mCrawlBackground.move(0,screenH-backH,0); + mCrawlBackground.rotate(new Float3D(screenW/2,backH,0), CRAWL_ANGLE, 1.0f, 0.0f, 0.0f); + + final int transpDistance = 5; + mCrawlBackground.smooth_alpha((1-transpDistance/2)*1.0f, new Float4D(0,0,transpDistance*backH,transpDistance*backH), new Float2D(screenW/2,(1-transpDistance)*backH)); + + mCrawl.move(di); + mCrawl.scale(scale); + mCrawl.move(-crawlW/2,0,0); + + mBackground = mRoot.attach(mCrawlBackground); + mBackground.attach(mCrawl); + mCrawl.addEventListener(this); + } + else if( bitmapID==crawlID ) + { + mRoot.detach(mBackground); + mBackground.detach(mCrawl); + mCrawl.removeEventListener(this); + } + } + } +} +/////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsSurfaceView.java b/src/main/java/org/distorted/examples/starwars/StarWarsSurfaceView.java new file mode 100644 index 0000000..3098bdb --- /dev/null +++ b/src/main/java/org/distorted/examples/starwars/StarWarsSurfaceView.java @@ -0,0 +1,27 @@ + +package org.distorted.examples.starwars; + +import android.content.Context; +import android.opengl.GLSurfaceView; +import android.os.Build; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class StarWarsSurfaceView extends GLSurfaceView +{ +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public StarWarsSurfaceView(Context context) + { + super(context); + setEGLContextClientVersion(2); + + if( Build.FINGERPRINT.startsWith("generic") ) + { + setEGLConfigChooser(8, 8, 8, 8, 16, 0); + } + + setRenderer(new StarWarsRenderer(this)); + } +} + diff --git a/src/main/java/org/distortedandroid/examples/TableOfContents.java b/src/main/java/org/distortedandroid/examples/TableOfContents.java deleted file mode 100644 index 2c4e16e..0000000 --- a/src/main/java/org/distortedandroid/examples/TableOfContents.java +++ /dev/null @@ -1,262 +0,0 @@ -package org.distortedandroid.examples; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import android.app.Activity; -import android.app.ListActivity; -import android.content.Intent; -import android.os.Bundle; -import android.util.SparseArray; -import android.view.View; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; -import android.widget.SimpleAdapter; - -import org.distortedandroid.examples.R; -import org.distortedandroid.examples.monalisa.MonaLisaActivity; -import org.distortedandroid.examples.sink.SinkActivity; -import org.distortedandroid.examples.fov.FOVActivity; -import org.distortedandroid.examples.deform.DeformActivity; -import org.distortedandroid.examples.listener.ListenerActivity; -import org.distortedandroid.examples.interpolator.InterpolatorActivity; -import org.distortedandroid.examples.girl.GirlActivity; -import org.distortedandroid.examples.macroblock.MacroblockActivity; -import org.distortedandroid.examples.movingeffects.MovingEffectsActivity; -import org.distortedandroid.examples.olimpic.OlimpicActivity; -import org.distortedandroid.examples.differenteffects.DifferentEffectsActivity; -import org.distortedandroid.examples.differentbitmaps.DifferentBitmapsActivity; -import org.distortedandroid.examples.scratchpad.ScratchpadActivity; -import org.distortedandroid.examples.check.CheckActivity; -import org.distortedandroid.examples.bean.BeanActivity; -import org.distortedandroid.examples.fbo.FBOActivity; -import org.distortedandroid.examples.starwars.StarWarsActivity; -import org.distortedandroid.examples.cubes.CubesActivity; -import org.distortedandroid.examples.quaternion.QuaternionActivity; -import org.distortedandroid.examples.effects3d.Effects3DActivity; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class TableOfContents extends ListActivity - { - private static final String ITEM_IMAGE = "item_image"; - private static final String ITEM_TITLE = "item_title"; - private static final String ITEM_SUBTITLE = "item_subtitle"; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setTitle(R.string.toc); - setContentView(R.layout.table_of_contents); - - final List> data = new ArrayList>(); - final SparseArray> activityMapping = new SparseArray>(); - - int i = 0; - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_monalisa); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_monalisa)); - item.put(ITEM_SUBTITLE, getText(R.string.example_monalisa_subtitle)); - data.add(item); - activityMapping.put(i++, MonaLisaActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_sink); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_sink)); - item.put(ITEM_SUBTITLE, getText(R.string.example_sink_subtitle)); - data.add(item); - activityMapping.put(i++, SinkActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_bean); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_bean)); - item.put(ITEM_SUBTITLE, getText(R.string.example_bean_subtitle)); - data.add(item); - activityMapping.put(i++, BeanActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_fov); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_fov)); - item.put(ITEM_SUBTITLE, getText(R.string.example_fov_subtitle)); - data.add(item); - activityMapping.put(i++, FOVActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_deform); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_deform)); - item.put(ITEM_SUBTITLE, getText(R.string.example_deform_subtitle)); - data.add(item); - activityMapping.put(i++, DeformActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_listener); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_listener)); - item.put(ITEM_SUBTITLE, getText(R.string.example_listener_subtitle)); - data.add(item); - activityMapping.put(i++, ListenerActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_interpolator); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_interpolator)); - item.put(ITEM_SUBTITLE, getText(R.string.example_interpolator_subtitle)); - data.add(item); - activityMapping.put(i++, InterpolatorActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_girl); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_girl)); - item.put(ITEM_SUBTITLE, getText(R.string.example_girl_subtitle)); - data.add(item); - activityMapping.put(i++, GirlActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_macroblock); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_macroblock)); - item.put(ITEM_SUBTITLE, getText(R.string.example_macroblock_subtitle)); - data.add(item); - activityMapping.put(i++, MacroblockActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_movingeffects); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_movingeffects)); - item.put(ITEM_SUBTITLE, getText(R.string.example_movingeffects_subtitle)); - data.add(item); - activityMapping.put(i++, MovingEffectsActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_differenteffects); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_differenteffects)); - item.put(ITEM_SUBTITLE, getText(R.string.example_differenteffects_subtitle)); - data.add(item); - activityMapping.put(i++, DifferentEffectsActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_differentbitmaps); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_differentbitmaps)); - item.put(ITEM_SUBTITLE, getText(R.string.example_differentbitmaps_subtitle)); - data.add(item); - activityMapping.put(i++, DifferentBitmapsActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_scratchpad); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_scratchpad)); - item.put(ITEM_SUBTITLE, getText(R.string.example_scratchpad_subtitle)); - data.add(item); - activityMapping.put(i++, ScratchpadActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_check); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_check)); - item.put(ITEM_SUBTITLE, getText(R.string.example_check_subtitle)); - data.add(item); - activityMapping.put(i++, CheckActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_fbo); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_fbo)); - item.put(ITEM_SUBTITLE, getText(R.string.example_fbo_subtitle)); - data.add(item); - activityMapping.put(i++, FBOActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_starwars); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_starwars)); - item.put(ITEM_SUBTITLE, getText(R.string.example_starwars_subtitle)); - data.add(item); - activityMapping.put(i++, StarWarsActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_olimpic); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_olimpic)); - item.put(ITEM_SUBTITLE, getText(R.string.example_olimpic_subtitle)); - data.add(item); - activityMapping.put(i++, OlimpicActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_quaternion); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_quaternion)); - item.put(ITEM_SUBTITLE, getText(R.string.example_quaternion_subtitle)); - data.add(item); - activityMapping.put(i++, QuaternionActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_cubes); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_cubes)); - item.put(ITEM_SUBTITLE, getText(R.string.example_cubes_subtitle)); - data.add(item); - activityMapping.put(i++, CubesActivity.class); - } - - { - final Map item = new HashMap(); - item.put(ITEM_IMAGE, R.drawable.icon_example_matrix3d); - item.put(ITEM_TITLE, (i+1)+". "+getText(R.string.example_effects3d)); - item.put(ITEM_SUBTITLE, getText(R.string.example_effects3d_subtitle)); - data.add(item); - activityMapping.put(i++, Effects3DActivity.class); - } - - final SimpleAdapter dataAdapter = new SimpleAdapter(this, data, R.layout.toc_item, new String[] {ITEM_IMAGE, ITEM_TITLE, ITEM_SUBTITLE}, new int[] {R.id.Image, R.id.Title, R.id.SubTitle}); - setListAdapter(dataAdapter); - - getListView().setOnItemClickListener(new OnItemClickListener() - { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) - { - final Class activityToLaunch = activityMapping.get(position); - - if (activityToLaunch != null) - { - final Intent launchIntent = new Intent(TableOfContents.this, activityToLaunch); - startActivity(launchIntent); - } - } - }); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distortedandroid/examples/bean/BeanActivity.java b/src/main/java/org/distortedandroid/examples/bean/BeanActivity.java deleted file mode 100644 index fb247be..0000000 --- a/src/main/java/org/distortedandroid/examples/bean/BeanActivity.java +++ /dev/null @@ -1,52 +0,0 @@ - -package org.distortedandroid.examples.bean; - -import org.distortedandroid.library.Distorted; - -import android.app.Activity; -import android.os.Bundle; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class BeanActivity extends Activity -{ - private BeanSurfaceView mView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - mView = new BeanSurfaceView(this); - setContentView(mView); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - mView.onPause(); - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -} diff --git a/src/main/java/org/distortedandroid/examples/bean/BeanRenderer.java b/src/main/java/org/distortedandroid/examples/bean/BeanRenderer.java deleted file mode 100644 index fb00191..0000000 --- a/src/main/java/org/distortedandroid/examples/bean/BeanRenderer.java +++ /dev/null @@ -1,140 +0,0 @@ - -package org.distortedandroid.examples.bean; - -import java.io.IOException; -import java.io.InputStream; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.Interpolator2D; -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float4D; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class BeanRenderer implements GLSurfaceView.Renderer -{ - private GLSurfaceView mView; - private DistortedBitmap mBean; - private Float2D pLeft, pRight; - private Interpolator2D iLeft, iRight; - private Float4D rLeft, rRight; - private int bmpHeight, bmpWidth; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public BeanRenderer(GLSurfaceView v) - { - mView = v; - - pLeft = new Float2D(100, 199); - pRight= new Float2D(230, 150); - - rLeft = new Float4D(-9,-31,35,35); - rRight= new Float4D(-9,-31,35,35); - - iLeft = new Interpolator2D(); - iRight= new Interpolator2D(); - - iLeft.setCount(0.0f); - iRight.setCount(0.0f); - iLeft.setDuration(1500); - iRight.setDuration(1500); - - Float2D p1 = new Float2D(0,0); - Float2D p2 = new Float2D(-10,-34); - - iLeft.add(p1); - iLeft.add(p1); - iLeft.add(p1); - iLeft.add(p1); - iLeft.add(p2); - iLeft.add(p2); - - iRight.add(p1); - iRight.add(p2); - iRight.add(p2); - iRight.add(p1); - iRight.add(p1); - iRight.add(p1); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - mBean.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - mBean.abortAllEffects(Distorted.TYPE_MATR); - - if( bmpHeight/bmpWidth > height/width ) - { - int w = (height*bmpWidth)/bmpHeight; - mBean.move((width-w)/2 ,0, 0); - mBean.scale((float)height/bmpHeight); - } - else - { - int h = (width*bmpHeight)/bmpWidth; - mBean.move(0 ,(height-h)/2, 0); - mBean.scale((float)width/bmpWidth); - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.bean); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - bmpHeight = bitmap.getHeight(); - bmpWidth = bitmap.getWidth(); - - mBean = new DistortedBitmap(bitmap, 10); - mBean.distort(iLeft , rLeft , pLeft ); - mBean.distort(iRight, rRight, pRight); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Bean", ex.getMessage() ); - } - } -} diff --git a/src/main/java/org/distortedandroid/examples/bean/BeanSurfaceView.java b/src/main/java/org/distortedandroid/examples/bean/BeanSurfaceView.java deleted file mode 100644 index 0ad5e55..0000000 --- a/src/main/java/org/distortedandroid/examples/bean/BeanSurfaceView.java +++ /dev/null @@ -1,27 +0,0 @@ - -package org.distortedandroid.examples.bean; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class BeanSurfaceView extends GLSurfaceView -{ -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public BeanSurfaceView(Context context) - { - super(context); - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - setRenderer(new BeanRenderer(this)); - } -} - diff --git a/src/main/java/org/distortedandroid/examples/check/CheckActivity.java b/src/main/java/org/distortedandroid/examples/check/CheckActivity.java deleted file mode 100644 index cc9b8ab..0000000 --- a/src/main/java/org/distortedandroid/examples/check/CheckActivity.java +++ /dev/null @@ -1,121 +0,0 @@ - -package org.distortedandroid.examples.check; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.examples.R; - -import android.app.Activity; -import android.opengl.GLSurfaceView; -import android.os.Bundle; -import android.widget.NumberPicker; -import android.widget.NumberPicker.OnValueChangeListener; -import android.view.View; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class CheckActivity extends Activity -{ - private NumberPicker mVPicker, mFPicker; - private static int maxV, maxF; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - setContentView(R.layout.check1layout); - - mVPicker = (NumberPicker)findViewById(R.id.check1NumberPickerVertex); - mFPicker = (NumberPicker)findViewById(R.id.check1NumberPickerFragment); - - mVPicker.setMaxValue(1000); - mVPicker.setMinValue( 0); - mFPicker.setMaxValue(1000); - mFPicker.setMinValue( 0); - - mVPicker.setOnValueChangedListener(new OnValueChangeListener() - { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) - { - maxV = newVal; - } - }); - - mFPicker.setOnValueChangedListener(new OnValueChangeListener() - { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) - { - maxF = newVal; - } - }); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.checkSurfaceView); - if( mView!=null ) mView.onPause(); - - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.checkSurfaceView); - if( mView!=null ) mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - public void onWindowFocusChanged(boolean hasFocus) - { - super.onWindowFocusChanged(hasFocus); - - mVPicker.setValue(1); - mFPicker.setValue(1); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static int getMaxV() - { - return maxV; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static int getMaxF() - { - return maxF; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void Check(View v) - { - setContentView(R.layout.check2layout); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -} diff --git a/src/main/java/org/distortedandroid/examples/check/CheckRenderer.java b/src/main/java/org/distortedandroid/examples/check/CheckRenderer.java deleted file mode 100644 index fff846e..0000000 --- a/src/main/java/org/distortedandroid/examples/check/CheckRenderer.java +++ /dev/null @@ -1,165 +0,0 @@ - -package org.distortedandroid.examples.check; - -import java.io.IOException; -import java.io.InputStream; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float3D; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class CheckRenderer implements GLSurfaceView.Renderer -{ - private GLSurfaceView mView; - private DistortedBitmap mSuccess; - private Float2D pUp, pDown; - private Float3D vUp, vDown; - - private int bmpHeight, bmpWidth; - - public static String compilationResult; - public static String compilationTitle; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public CheckRenderer(GLSurfaceView view) - { - mView = view; - - Distorted.setMaxVertex(CheckActivity.getMaxV()); - Distorted.setMaxFragment(CheckActivity.getMaxF()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - mSuccess.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - mSuccess.abortAllEffects(Distorted.TYPE_MATR); - - if( bmpHeight/bmpWidth > height/width ) - { - int w = (height*bmpWidth)/bmpHeight; - mSuccess.move((width-w)/2 ,0, 0); - mSuccess.scale((float)height/bmpHeight); - } - else - { - int h = (width*bmpHeight)/bmpWidth; - mSuccess.move(0 ,(height-h)/2, 0); - mSuccess.scale((float)width/bmpWidth); - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.success); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - bmpHeight = bitmap.getHeight(); - bmpWidth = bitmap.getWidth(); - - pDown = new Float2D(bmpWidth/2, 0); - pUp = new Float2D(bmpWidth/2,bmpHeight); - - vUp = new Float3D( 0,+bmpHeight,0); - vDown = new Float3D( 0,-bmpHeight,0); - - mSuccess = new DistortedBitmap(bitmap, 30); - mSuccess.deform( vUp, pUp, 2000, 0.0f); - mSuccess.deform(vDown, pDown, 2000, 0.0f); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - compilationTitle = ex.getClass().getSimpleName(); - compilationResult= ex.getMessage(); - - String ver; - - ver = GLES20.glGetString(GLES20.GL_SHADING_LANGUAGE_VERSION); - compilationResult += "\n\nGLSL version: "+(ver==null ? "null" : ver); - ver = GLES20.glGetString(GLES20.GL_VERSION); - compilationResult += "\nGL version: "+(ver==null ? "null" : ver); - ver = GLES20.glGetString(GLES20.GL_VENDOR); - compilationResult += "\nGL vendor: "+(ver==null ? "null" : ver); - ver = GLES20.glGetString(GLES20.GL_RENDERER); - compilationResult += "\nGL renderer: "+(ver==null ? "null" : ver); - - CheckActivity act = (CheckActivity)mView.getContext(); - - act.runOnUiThread(new Runnable() - { - public void run() - { - Context context = mView.getContext(); - - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle(compilationTitle); - builder.setMessage(compilationResult); - builder.setCancelable(true); - - builder.setOnCancelListener(new DialogInterface.OnCancelListener() - { - @Override - public void onCancel(DialogInterface dialog) - { - ((CheckActivity)mView.getContext()).finish(); - } - }); - - AlertDialog alert = builder.create(); - alert.show(); - } - }); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -} diff --git a/src/main/java/org/distortedandroid/examples/check/CheckSurfaceView.java b/src/main/java/org/distortedandroid/examples/check/CheckSurfaceView.java deleted file mode 100644 index 67213e3..0000000 --- a/src/main/java/org/distortedandroid/examples/check/CheckSurfaceView.java +++ /dev/null @@ -1,37 +0,0 @@ - -package org.distortedandroid.examples.check; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; -import android.util.AttributeSet; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class CheckSurfaceView extends GLSurfaceView -{ - private CheckRenderer renderer; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public CheckSurfaceView(Context c, AttributeSet attrs) - { - super(c, attrs); - - if(!isInEditMode()) - { - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - renderer = new CheckRenderer(this); - setRenderer(renderer); - } - } - -} -/////////////////////////////////////////////////////////////////////////////////////////////////// - diff --git a/src/main/java/org/distortedandroid/examples/cubes/CubesActivity.java b/src/main/java/org/distortedandroid/examples/cubes/CubesActivity.java deleted file mode 100644 index c0e6941..0000000 --- a/src/main/java/org/distortedandroid/examples/cubes/CubesActivity.java +++ /dev/null @@ -1,198 +0,0 @@ - -package org.distortedandroid.examples.cubes; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.examples.R; - -import android.app.Activity; -import android.opengl.GLSurfaceView; -import android.os.Bundle; -import android.view.Gravity; -import android.view.View; -import android.widget.Button; -import android.widget.LinearLayout; -import android.widget.NumberPicker; -import android.widget.NumberPicker.OnValueChangeListener; -import android.widget.TableRow; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class CubesActivity extends Activity implements View.OnClickListener -{ - private static int mNumCols = 3; - private static int mNumRows = 3; - - private static final int COLOR_OFF = 0xffffe81f; - private static final int COLOR_ON = 0xff0000ff; - - private NumberPicker mColsPicker, mRowsPicker; - private LinearLayout mLay; - private static boolean[] mShape; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle savedState) - { - super.onCreate(savedState); - - setContentView(R.layout.cubes1layout); - - mLay = (LinearLayout)findViewById(R.id.buttongrid); - - mColsPicker = (NumberPicker)findViewById(R.id.colsPicker); - mRowsPicker = (NumberPicker)findViewById(R.id.rowsPicker); - - mColsPicker.setMaxValue(10); - mColsPicker.setMinValue( 0); - mRowsPicker.setMaxValue(10); - mRowsPicker.setMinValue( 0); - - mColsPicker.setOnValueChangedListener(new OnValueChangeListener() - { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) - { - setGrid(); - } - }); - - mRowsPicker.setOnValueChangedListener(new OnValueChangeListener() - { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) - { - setGrid(); - } - }); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static int getCols() - { - return mNumCols; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static String getShape() - { - String str = ""; - - for(int i=0; i0 ? (width / mNumCols) -10 : 0; - int h = mNumRows>0 ? (height/ mNumRows) -10 : 0; - int size= w height/width ) - { - int w = (height*mRows)/mCols; - mCubes.move((width-w)/2 ,0, 0); - mCubes.scale((float)height/(mRows*SIZE)); - } - else - { - int h = (width*mRows)/mCols; - mCubes.move(0 ,(height-h)/2, 0); - mCubes.scale((float)width/(mCols*SIZE)); - } - - Float3D center = new Float3D(mCols*SIZE/2,mRows*SIZE/2, 0); - - mCubes.quaternion(center, mQuatInt1); - mCubes.quaternion(center, mQuatInt2); - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.grid); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - mCubes.setBitmap(bitmap); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Cubes", ex.getMessage() ); - } - } -} diff --git a/src/main/java/org/distortedandroid/examples/cubes/CubesSurfaceView.java b/src/main/java/org/distortedandroid/examples/cubes/CubesSurfaceView.java deleted file mode 100644 index 99c9df6..0000000 --- a/src/main/java/org/distortedandroid/examples/cubes/CubesSurfaceView.java +++ /dev/null @@ -1,109 +0,0 @@ - -package org.distortedandroid.examples.cubes; - -import org.distortedandroid.examples.R; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.widget.Toast; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class CubesSurfaceView extends GLSurfaceView -{ - int mX, mY; - CubesRenderer mRenderer; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public CubesSurfaceView(Context c, AttributeSet attrs) - { - super(c,attrs); - - mX = -1; - mY = -1; - - if(!isInEditMode()) - { - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - mRenderer = new CubesRenderer(this); - - setRenderer(mRenderer); - - Toast.makeText(c, R.string.example_cubes_toast , Toast.LENGTH_SHORT).show(); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @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); - } - } - break; - - case MotionEvent.ACTION_UP : mX = -1; - mY = -1; - - float qx = mRenderer.mQuat1.getX(); - float qy = mRenderer.mQuat1.getY(); - float qz = mRenderer.mQuat1.getZ(); - float qw = mRenderer.mQuat1.getW(); - - float rx = mRenderer.mQuat2.getX(); - float ry = mRenderer.mQuat2.getY(); - float rz = mRenderer.mQuat2.getZ(); - float rw = mRenderer.mQuat2.getW(); - - 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); - - break; - } - - return true; - } - -} - diff --git a/src/main/java/org/distortedandroid/examples/deform/DeformActivity.java b/src/main/java/org/distortedandroid/examples/deform/DeformActivity.java deleted file mode 100644 index c569864..0000000 --- a/src/main/java/org/distortedandroid/examples/deform/DeformActivity.java +++ /dev/null @@ -1,124 +0,0 @@ - -package org.distortedandroid.examples.deform; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.examples.R; - -import android.app.Activity; -import android.opengl.GLSurfaceView; -import android.os.Bundle; -import android.view.View; -import android.widget.RadioButton; -import android.widget.SeekBar; -import android.widget.TextView; -import android.widget.SeekBar.OnSeekBarChangeListener; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class DeformActivity extends Activity implements OnSeekBarChangeListener -{ - private SeekBar barR; - private TextView textR; - private RadioButton effect; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - setContentView(R.layout.deformlayout); - - barR = (SeekBar)findViewById(R.id.deformSeekRadius); - barR.setOnSeekBarChangeListener(this); - - textR = (TextView)findViewById(R.id.deformTextRadius); - - barR.setProgress(50); - - textR.setText("Radius: 50"); - - effect = (RadioButton)findViewById(R.id.deformDistortButton); - effect.setChecked(true); - DeformRenderer.setMode(DeformRenderer.MODE_DISTORT); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - DeformRenderer.onPause(); - - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView); - mView.onPause(); - - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - android.util.Log.e("activity","onDestroy"); - - Distorted.onDestroy(); - super.onDestroy(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void Distort(View v) - { - DeformRenderer.setMode(DeformRenderer.MODE_DISTORT); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void Deform(View v) - { - DeformRenderer.setMode(DeformRenderer.MODE_DEFORM); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void Shear(View v) - { - DeformRenderer.setMode(DeformRenderer.MODE_SHEAR); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) - { - switch (bar.getId()) - { - case R.id.deformSeekRadius: DeformRenderer.setRegionRadius(progress); - textR.setText("Radius: "+progress); - break; - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onStartTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onStopTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -} diff --git a/src/main/java/org/distortedandroid/examples/deform/DeformRenderer.java b/src/main/java/org/distortedandroid/examples/deform/DeformRenderer.java deleted file mode 100644 index 8bf698b..0000000 --- a/src/main/java/org/distortedandroid/examples/deform/DeformRenderer.java +++ /dev/null @@ -1,292 +0,0 @@ - -package org.distortedandroid.examples.deform; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Interpolator2D; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Float4D; - -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class DeformRenderer implements GLSurfaceView.Renderer -{ - public static final int MODE_DISTORT= 0; - public static final int MODE_DEFORM = 1; - public static final int MODE_SHEAR = 2; - - private static final int NUM_VECTORS = 8; - private static final int NUMLINES = 10; - private static final int NUMFRAMES =10; - - private GLSurfaceView mView; - private DistortedBitmap fps; - private DistortedBitmap stretch; - private Float3D touchPoint; - private static Interpolator2D di; - private static Float3D[] v; - private static Float4D dr; - private Canvas fpsCanvas; - private Bitmap fpsBitmap, stretchBitmap; - private int scrHeight, scrWidth; - private Paint mPaint; - private int fpsH, fpsW; - private String fpsString = ""; - private long lastTime=0; - private long[] durations; - private int currDuration; - private long shearID=0; - - private static int mMode = MODE_DISTORT; - private static boolean bitmapCreated = false; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public DeformRenderer(GLSurfaceView view) - { - mView = view; - - dr = new Float4D(0,0,0,0); - - di = new Interpolator2D(); - di.setMode(Interpolator2D.MODE_PATH); - di.setCount(0.5f); - di.setDuration(NUM_VECTORS*500); - - v = new Float3D[NUM_VECTORS]; - - for(int i=0; iscrWidth/2 ) xt=scrWidth/2; - if( yt<0 ) yt=0; - if( yt>scrHeight/2 ) yt=scrHeight/2; - - touchPoint.set(xt,yt,0); - - v[0].set(0,0,0); - - switch(mMode) - { - case MODE_DISTORT: stretch.distort(v[0], dr, touchPoint, 0, 0.5f); - break; - case MODE_DEFORM : stretch.deform( v[0], touchPoint); - break; - case MODE_SHEAR : shearID = stretch.shear(touchPoint,v[0]); - break; - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void move(int x, int y) - { - float fx = x; - float fy = y; - - if( mMode==MODE_SHEAR ) - { - fx /= (scrWidth/2); - fy /= (scrHeight/2); - } - - v[0].set(fx,fy); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void up() - { - stretch.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); - stretch.abortEffect(shearID); - - float damp = -0.65f; - - for(int i=1; i=NUMFRAMES ) currDuration = 0; - durations[NUMFRAMES] += ((currentTime-lastTime)-durations[currDuration]); - durations[currDuration] = currentTime-lastTime; - - fpsString = "" + ((int)(10000.0f*NUMFRAMES/durations[NUMFRAMES]))/10.0f; - } - - lastTime = currentTime; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -} diff --git a/src/main/java/org/distortedandroid/examples/deform/DeformSurfaceView.java b/src/main/java/org/distortedandroid/examples/deform/DeformSurfaceView.java deleted file mode 100644 index 6847cfd..0000000 --- a/src/main/java/org/distortedandroid/examples/deform/DeformSurfaceView.java +++ /dev/null @@ -1,61 +0,0 @@ - -package org.distortedandroid.examples.deform; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; -import android.util.AttributeSet; -import android.view.MotionEvent; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class DeformSurfaceView extends GLSurfaceView -{ - private DeformRenderer renderer; - private int xTouch, yTouch; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public DeformSurfaceView(Context c, AttributeSet attrs) - { - super(c, attrs); - - if(!isInEditMode()) - { - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - renderer = new DeformRenderer(this); - setRenderer(renderer); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @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: xTouch =x; - yTouch =y; - renderer.down(x,y); - break; - case MotionEvent.ACTION_MOVE: renderer.move(x-xTouch,y-yTouch); - break; - case MotionEvent.ACTION_UP : renderer.up(); - break; - } - - return true; - } - -} - diff --git a/src/main/java/org/distortedandroid/examples/differentbitmaps/DifferentBitmapsActivity.java b/src/main/java/org/distortedandroid/examples/differentbitmaps/DifferentBitmapsActivity.java deleted file mode 100644 index ed8d479..0000000 --- a/src/main/java/org/distortedandroid/examples/differentbitmaps/DifferentBitmapsActivity.java +++ /dev/null @@ -1,51 +0,0 @@ - -package org.distortedandroid.examples.differentbitmaps; - -import org.distortedandroid.library.Distorted; - -import android.app.Activity; -import android.os.Bundle; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class DifferentBitmapsActivity extends Activity -{ - private DifferentBitmapsSurfaceView mView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - mView = new DifferentBitmapsSurfaceView(this); - setContentView(mView); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - mView.onPause(); - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } -} diff --git a/src/main/java/org/distortedandroid/examples/differentbitmaps/DifferentBitmapsRenderer.java b/src/main/java/org/distortedandroid/examples/differentbitmaps/DifferentBitmapsRenderer.java deleted file mode 100644 index d0ab74a..0000000 --- a/src/main/java/org/distortedandroid/examples/differentbitmaps/DifferentBitmapsRenderer.java +++ /dev/null @@ -1,156 +0,0 @@ - -package org.distortedandroid.examples.differentbitmaps; - -import java.io.IOException; -import java.io.InputStream; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float4D; -import org.distortedandroid.library.Interpolator2D; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class DifferentBitmapsRenderer implements GLSurfaceView.Renderer -{ - private static final int NUM = 3; - - private GLSurfaceView mView; - private DistortedBitmap[] bmp; - private Float2D point; - private Interpolator2D di; - private Float2D[] vec; - private int bmpHeight, bmpWidth; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public DifferentBitmapsRenderer(GLSurfaceView v) - { - mView = v; - - // create shared effects - enlarge the nose and keep moving the whole bitmap left and right. - di = new Interpolator2D(); - di.setCount(0.0f); - di.setDuration(3000); - vec = new Float2D[2]; - vec[0] = new Float2D( 25,0); - vec[1] = new Float2D(-25,0); - di.add(vec[0]); - di.add(vec[1]); - point = new Float2D(305, 380); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private Bitmap readBitmap(int id) - { - InputStream is = mView.getContext().getResources().openRawResource(id); - Bitmap bitmap=null; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - return bitmap; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - long time = System.currentTimeMillis(); - - for(int i=NUM-1; i>=0; i--) bmp[i].draw(time); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - for(int i=NUM-1; i>=0; i--) - { - bmp[i].abortAllEffects(Distorted.TYPE_MATR); - } - - if( bmpHeight/(NUM*bmpWidth) > height/width ) - { - int w = (height*bmpWidth)/bmpHeight; - - for(int i=NUM-1; i>=0; i--) - { - bmp[i].move( (width-NUM*w)/2 +i*w ,0,0); - bmp[i].scale((float)height/bmpHeight); - } - } - else - { - int w = width/NUM; - int h = (width*bmpHeight)/(bmpWidth*NUM); - - for(int i=NUM-1; i>=0; i--) - { - bmp[i].move(i*w, (height-h)/2, 0); - bmp[i].scale((float)width/(bmpWidth*NUM)); - } - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - Bitmap bitmap0= readBitmap(R.raw.dog); - Bitmap bitmap1= readBitmap(R.raw.face); - Bitmap bitmap2= readBitmap(R.raw.cat); - - bmpHeight = bitmap0.getHeight(); - bmpWidth = bitmap0.getWidth(); - - // create NUM DistortedBitmaps with shared effects - bmp = new DistortedBitmap[NUM]; - bmp[0] = new DistortedBitmap(bmpWidth, bmpHeight, 30); - for(int i=1; i=0; i--) bmp[i].draw(time); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - for(int i=NUM-1; i>=0; i--) - { - bmp[i].abortAllEffects(Distorted.TYPE_MATR); - } - - if( bmpHeight/(NUM*bmpWidth) > height/width ) - { - int w = (height*bmpWidth)/bmpHeight; - - for(int i=NUM-1; i>=0; i--) - { - bmp[i].move( (width-NUM*w)/2 +i*w ,0, 0); - bmp[i].scale((float)height/bmpHeight); - } - } - else - { - int w = width/NUM; - int h = (width*bmpHeight)/(bmpWidth*NUM); - - for(int i=NUM-1; i>=0; i--) - { - bmp[i].move(i*w, (height-h)/2, 0); - bmp[i].scale((float)width/(bmpWidth*NUM)); - } - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.dog); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - bmpHeight = bitmap.getHeight(); - bmpWidth = bitmap.getWidth(); - - bmp = new DistortedBitmap[NUM]; - bmp[0] = new DistortedBitmap(bmpWidth, bmpHeight, 30); - - for(int i=1; i=0 ; i-- ) - { - switch(effects[i]) - { - case MOVE : layout.addView(move , 0); break; - case SCALE : layout.addView(scale , 0); break; - case ROTATE: layout.addView(rotate , 0); break; - case SHEAR : layout.addView(shear , 0); break; - } - } - - textMove = (TextView)findViewById(R.id.matrix3dmoveText); - textScale = (TextView)findViewById(R.id.matrix3dscaleText); - textRotate= (TextView)findViewById(R.id.matrix3drotateText); - textShear = (TextView)findViewById(R.id.matrix3dshearText); - - setMoveText(); - setScaleText(); - setRotateText(); - setShearText(); - - setBar(R.id.matrix3dmoveBar1, moveX); - setBar(R.id.matrix3dmoveBar2, moveY); - setBar(R.id.matrix3dmoveBar3, moveZ); - - setBar(R.id.matrix3dscaleBar1, scaleX); - setBar(R.id.matrix3dscaleBar2, scaleY); - setBar(R.id.matrix3dscaleBar3, scaleZ); - - setBar(R.id.matrix3drotateBar1, rotateX); - setBar(R.id.matrix3drotateBar2, rotateY); - setBar(R.id.matrix3drotateBar3, rotateZ); - setBar(R.id.matrix3drotateBar4, rotateA); - - setBar(R.id.matrix3dshearBar1, shearX); - setBar(R.id.matrix3dshearBar2, shearY); - setBar(R.id.matrix3dshearBar3, shearZ); - - Effects3DRenderer.setOrder(effects); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void moveUp(int effect) - { - int len = effects.length-1; - int index = -1; - - for(int i=0; i<=len; i++) - { - if( effects[i]==effect ) - { - index=i; - break; - } - } - - if( index==0 ) - { - for(int i=0; i0 ) - { - effects[index] = effects[index-1]; - effects[index-1] = effect; - } - - addViews(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void ButtonMove(View v) - { - moveUp(MOVE); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void ButtonScale(View v) - { - moveUp(SCALE); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void ButtonRotate(View v) - { - moveUp(ROTATE); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void ButtonShear(View v) - { - moveUp(SHEAR); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void setBar(int id, int value) - { - bar = (SeekBar)findViewById(id); - bar.setOnSeekBarChangeListener(this); - bar.setProgress(value); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void computeMove() - { - fmoveX = (moveX-50)*maxX/50.0f; - fmoveY = (moveY-50)*maxY/50.0f; - fmoveZ = (moveZ-50)*maxZ/50.0f; - - Effects3DRenderer.setMove( fmoveX, fmoveY, fmoveZ); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void setMoveText() - { - fmoveX = ((int)(100*fmoveX))/100.0f; - fmoveY = ((int)(100*fmoveY))/100.0f; - fmoveZ = ((int)(100*fmoveZ))/100.0f; - - textMove.setText("move("+fmoveX+" , "+fmoveY+" , "+fmoveZ+")"); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void computeScale() - { - fscaleX = (scaleX>50 ? 0.18f : 0.018f)*(scaleX-50)+1; - fscaleY = (scaleY>50 ? 0.18f : 0.018f)*(scaleY-50)+1; - fscaleZ = (scaleZ>50 ? 0.18f : 0.018f)*(scaleZ-50)+1; - - Effects3DRenderer.setScale(fscaleX, fscaleY, fscaleZ); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void setScaleText() - { - fscaleX = ((int)(100*fscaleX))/100.0f; - fscaleY = ((int)(100*fscaleY))/100.0f; - fscaleZ = ((int)(100*fscaleZ))/100.0f; - - textScale.setText("scale("+fscaleX+" , "+fscaleY+" , "+fscaleZ+")"); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void computeRotate() - { - frotateX = (rotateX-50)/50.0f; - frotateY = (rotateY-50)/50.0f; - frotateZ = (rotateZ-50)/50.0f; - - Effects3DRenderer.setRotate( frotateA, frotateX, frotateY, frotateZ ); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void setRotateText() - { - frotateX = ((int)(100*frotateX))/100.0f; - frotateY = ((int)(100*frotateY))/100.0f; - frotateZ = ((int)(100*frotateZ))/100.0f; - - frotateA = ((rotateA-50)*180)/50; - - textRotate.setText("rotate( "+frotateA+" ("+frotateX+","+frotateY+","+frotateZ+") )"); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void computeShear() - { - fshearX = (shearX-50)/25.0f; - fshearY = (shearY-50)/25.0f; - fshearZ = (shearZ-50)/25.0f; - - Effects3DRenderer.setShear( fshearX, fshearY, fshearZ ); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void setShearText() - { - fshearX = ((int)(100*fshearX))/100.0f; - fshearY = ((int)(100*fshearY))/100.0f; - fshearZ = ((int)(100*fshearZ))/100.0f; - - textShear.setText("shear("+fshearX+" , "+fshearY+" , "+fshearZ+")"); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.effects3dSurfaceView); - mView.onPause(); - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.effects3dSurfaceView); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - public void onWindowFocusChanged(boolean hasFocus) - { - super.onWindowFocusChanged(hasFocus); - - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.effects3dSurfaceView); - - maxX = mView.getWidth(); - maxY = mView.getHeight(); - maxZ = (maxX+maxY)/2; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) - { - switch (bar.getId()) - { - case R.id.matrix3dmoveBar1 : moveX = progress; computeMove() ; setMoveText() ; break; - case R.id.matrix3dmoveBar2 : moveY = progress; computeMove() ; setMoveText() ; break; - case R.id.matrix3dmoveBar3 : moveZ = progress; computeMove() ; setMoveText() ; break; - - case R.id.matrix3dscaleBar1 : scaleX= progress; computeScale() ; setScaleText() ; break; - case R.id.matrix3dscaleBar2 : scaleY= progress; computeScale() ; setScaleText() ; break; - case R.id.matrix3dscaleBar3 : scaleZ= progress; computeScale() ; setScaleText() ; break; - - case R.id.matrix3drotateBar1: rotateX=progress; computeRotate(); setRotateText(); break; - case R.id.matrix3drotateBar2: rotateY=progress; computeRotate(); setRotateText(); break; - case R.id.matrix3drotateBar3: rotateZ=progress; computeRotate(); setRotateText(); break; - case R.id.matrix3drotateBar4: rotateA=progress; computeRotate(); setRotateText(); break; - - case R.id.matrix3dshearBar1 : shearX= progress; computeShear() ; setShearText() ; break; - case R.id.matrix3dshearBar2 : shearY= progress; computeShear() ; setShearText() ; break; - case R.id.matrix3dshearBar3 : shearZ= progress; computeShear() ; setShearText() ; break; - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onStartTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onStopTrackingTouch(SeekBar bar) { } - -} diff --git a/src/main/java/org/distortedandroid/examples/effects3d/Effects3DRenderer.java b/src/main/java/org/distortedandroid/examples/effects3d/Effects3DRenderer.java deleted file mode 100644 index 21c99d8..0000000 --- a/src/main/java/org/distortedandroid/examples/effects3d/Effects3DRenderer.java +++ /dev/null @@ -1,169 +0,0 @@ - -package org.distortedandroid.examples.effects3d; - -import java.io.IOException; -import java.io.InputStream; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.DistortedCubes; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Float4D; -import org.distortedandroid.library.Interpolator3D; -import org.distortedandroid.library.Interpolator4D; -import org.distortedandroid.library.Distorted; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class Effects3DRenderer implements GLSurfaceView.Renderer -{ - private static final int SIZE = 100; - - private GLSurfaceView mView; - private static DistortedCubes mCube; - - private static int[] order; - - private static Interpolator3D mMoveInter, mScaleInter, mShearInter; - private static Interpolator4D mRotateInter; - - private static Float3D mZeroPoint, mMovePoint, mScalePoint, mShearPoint; - private static Float4D mRotatePoint; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setMove(float x, float y, float z) - { - mMovePoint.set(x, y, z); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setScale(float x, float y, float z) - { - mScalePoint.set(x, y, z); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setRotate(float a, float x, float y, float z) - { - mRotatePoint.set(a, x, y, z); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setShear(float x, float y, float z) - { - mShearPoint.set(x, y, z); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setOrder(int[] effects) - { - order = effects; - setMatrixEffects(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setMatrixEffects() - { - mCube.abortAllEffects(Distorted.TYPE_MATR); - - for( int i=0; i<=order.length-1 ; i++ ) - { - switch(order[i]) - { - case Effects3DActivity.MOVE : mCube.move(mMoveInter) ; break; - case Effects3DActivity.SCALE : mCube.scale(mScaleInter) ; break; - case Effects3DActivity.ROTATE: mCube.rotate(mZeroPoint,mRotateInter); break; - case Effects3DActivity.SHEAR : mCube.shear(mZeroPoint,mShearInter) ; break; - } - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public Effects3DRenderer(GLSurfaceView v) - { - mView = v; - mCube = new DistortedCubes( 1, "1", SIZE); - - mZeroPoint = new Float3D(0,0,0); - mMovePoint = new Float3D(0,0,0); - mScalePoint = new Float3D(1,1,1); - mShearPoint = new Float3D(0,0,0); - mRotatePoint= new Float4D(1,0,0,0); - - mMoveInter = new Interpolator3D(); - mScaleInter = new Interpolator3D(); - mShearInter = new Interpolator3D(); - mRotateInter= new Interpolator4D(); - - mMoveInter.add(mMovePoint); - mScaleInter.add(mScalePoint); - mShearInter.add(mShearPoint); - mRotateInter.add(mRotatePoint); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - mCube.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - setMatrixEffects(); - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.grid); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - mCube.setBitmap(bitmap); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Quaternion", ex.getMessage() ); - } - } -} diff --git a/src/main/java/org/distortedandroid/examples/effects3d/Effects3DSurfaceView.java b/src/main/java/org/distortedandroid/examples/effects3d/Effects3DSurfaceView.java deleted file mode 100644 index 4d7ebdf..0000000 --- a/src/main/java/org/distortedandroid/examples/effects3d/Effects3DSurfaceView.java +++ /dev/null @@ -1,32 +0,0 @@ - -package org.distortedandroid.examples.effects3d; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; -import android.util.AttributeSet; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class Effects3DSurfaceView extends GLSurfaceView -{ -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public Effects3DSurfaceView(Context c, AttributeSet attrs) - { - super(c, attrs); - - if(!isInEditMode()) - { - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - setRenderer(new Effects3DRenderer(this)); - } - } -} - diff --git a/src/main/java/org/distortedandroid/examples/fbo/FBOActivity.java b/src/main/java/org/distortedandroid/examples/fbo/FBOActivity.java deleted file mode 100644 index eb74013..0000000 --- a/src/main/java/org/distortedandroid/examples/fbo/FBOActivity.java +++ /dev/null @@ -1,52 +0,0 @@ - -package org.distortedandroid.examples.fbo; - -import org.distortedandroid.library.Distorted; - -import android.app.Activity; -import android.os.Bundle; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class FBOActivity extends Activity -{ - private FBOSurfaceView mView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - mView = new FBOSurfaceView(this); - setContentView(mView); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - mView.onPause(); - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -} diff --git a/src/main/java/org/distortedandroid/examples/fbo/FBORenderer.java b/src/main/java/org/distortedandroid/examples/fbo/FBORenderer.java deleted file mode 100644 index 68b819e..0000000 --- a/src/main/java/org/distortedandroid/examples/fbo/FBORenderer.java +++ /dev/null @@ -1,123 +0,0 @@ - -package org.distortedandroid.examples.fbo; - -import java.io.IOException; -import java.io.InputStream; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.DistortedNode; -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Float2D; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class FBORenderer implements GLSurfaceView.Renderer -{ - private GLSurfaceView mView; - private DistortedBitmap mLisa, mText; - private int lisaHeight, lisaWidth; - - private DistortedNode mRoot; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public FBORenderer(GLSurfaceView v) - { - mView = v; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - mRoot.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - mLisa.abortAllEffects(Distorted.TYPE_MATR); - - if( lisaHeight/lisaWidth > height/width ) - { - int w = (height*lisaWidth)/lisaHeight; - mLisa.move((width-w)/2 ,0, 0); - mLisa.scale((float)height/lisaHeight); - } - else - { - int h = (width*lisaHeight)/lisaWidth; - mLisa.move(0 ,(height-h)/2, 0); - mLisa.scale((float)width/lisaWidth); - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is1 = mView.getContext().getResources().openRawResource(R.raw.monalisa); - InputStream is2 = mView.getContext().getResources().openRawResource(R.raw.fbo); - - Bitmap bitmap1, bitmap2; - - try - { - bitmap1 = BitmapFactory.decodeStream(is1); - bitmap2 = BitmapFactory.decodeStream(is2); - } - finally - { - try - { - is1.close(); - is2.close(); - } - catch(IOException e) { } - } - - lisaHeight = bitmap1.getHeight(); - lisaWidth = bitmap1.getWidth(); - - mLisa = new DistortedBitmap(bitmap1, 20); - mText = new DistortedBitmap(bitmap2, 20); - - android.util.Log.e("FBO", "Lisa hashcode= "+bitmap1.hashCode()); - - mRoot = new DistortedNode(mLisa); - mRoot.attach(mText); - - int textWidth = mText.getWidth(); - int textHeight = mText.getHeight(); - - mText.move(lisaWidth/6 , lisaHeight/3, 0); - mText.scale(lisaWidth/(1.5f*textWidth)); - mText.sink(0.5f, new Float2D( textWidth/2, textHeight/2), 5000, 0.0f); - mLisa.macroblock(4, 10000, 0.0f); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("MonaLisa", ex.getMessage() ); - } - } -} diff --git a/src/main/java/org/distortedandroid/examples/fbo/FBOSurfaceView.java b/src/main/java/org/distortedandroid/examples/fbo/FBOSurfaceView.java deleted file mode 100644 index 0a39591..0000000 --- a/src/main/java/org/distortedandroid/examples/fbo/FBOSurfaceView.java +++ /dev/null @@ -1,27 +0,0 @@ - -package org.distortedandroid.examples.fbo; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class FBOSurfaceView extends GLSurfaceView -{ -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public FBOSurfaceView(Context context) - { - super(context); - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - setRenderer(new FBORenderer(this)); - } -} - diff --git a/src/main/java/org/distortedandroid/examples/fov/FOVActivity.java b/src/main/java/org/distortedandroid/examples/fov/FOVActivity.java deleted file mode 100644 index 89b450c..0000000 --- a/src/main/java/org/distortedandroid/examples/fov/FOVActivity.java +++ /dev/null @@ -1,92 +0,0 @@ - -package org.distortedandroid.examples.fov; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.examples.R; - -import android.app.Activity; -import android.opengl.GLSurfaceView; -import android.os.Bundle; -import android.widget.SeekBar; -import android.widget.TextView; -import android.widget.SeekBar.OnSeekBarChangeListener; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class FOVActivity extends Activity implements OnSeekBarChangeListener -{ - private SeekBar barFOV; - private TextView textFOV; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - setContentView(R.layout.fovlayout); - - barFOV = (SeekBar)findViewById(R.id.seekFOV); - barFOV.setOnSeekBarChangeListener(this); - - textFOV = (TextView)findViewById(R.id.textFOV); - - barFOV.setProgress(50); - - textFOV.setText("FOV: 50"); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.surfaceViewFOV); - mView.onPause(); - - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.surfaceViewFOV); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) - { - switch (bar.getId()) - { - case R.id.seekFOV: FOVRenderer.setFOV(progress); - textFOV.setText("FOV: "+progress); - break; - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onStartTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onStopTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -} diff --git a/src/main/java/org/distortedandroid/examples/fov/FOVRenderer.java b/src/main/java/org/distortedandroid/examples/fov/FOVRenderer.java deleted file mode 100644 index d7abdd2..0000000 --- a/src/main/java/org/distortedandroid/examples/fov/FOVRenderer.java +++ /dev/null @@ -1,116 +0,0 @@ - -package org.distortedandroid.examples.fov; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Float4D; - -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class FOVRenderer implements GLSurfaceView.Renderer -{ - private static final int NUMLINES = 10; - - private GLSurfaceView mView; - private DistortedBitmap fov; - private Paint mPaint; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public FOVRenderer(GLSurfaceView view) - { - mView = view; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setFOV(int fov) - { - Distorted.setFov(fov); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - fov.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - Distorted.onSurfaceChanged(width, height); - setupBitmap(width,height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("FOV", ex.getMessage() ); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void setupBitmap(int w, int h) - { - mPaint = new Paint(); - fov = new DistortedBitmap(w,h, 50); - Bitmap fovBitmap = Bitmap.createBitmap(w,h, Bitmap.Config.ARGB_8888); - Canvas fovCanvas = new Canvas(fovBitmap); - - mPaint.setColor(0xff008800); - mPaint.setStyle(Style.FILL); - fovCanvas.drawRect(0, 0, w, h, mPaint); - mPaint.setColor(0xffffffff); - - for(int i=0; i<=NUMLINES ; i++ ) - { - fovCanvas.drawRect(w*i/NUMLINES - 1, 0, w*i/NUMLINES + 1, h , mPaint); - fovCanvas.drawRect( 0, h *i/NUMLINES -1, w , h*i/NUMLINES + 1, mPaint); - } - - fov.setBitmap(fovBitmap); - - int min = w 50) - { - s = (progress-50)/16.0f + 1.0f; - } - else - { - s = 0.015f*progress + 0.25f; - } - GirlRenderer.setSize(s); - textSize.setText("Size: "+(((int)(s*10))/10.0f)); - break; - case R.id.girlSeekHips : v = progress/5; - GirlRenderer.setHips(v); - textHips.setText("Hips: "+v); - break; - - } - } - -/////////////////////////////////////////////////////////////////// - - public void onStartTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////// - - public void onStopTrackingTouch(SeekBar bar) { } - -} diff --git a/src/main/java/org/distortedandroid/examples/girl/GirlRenderer.java b/src/main/java/org/distortedandroid/examples/girl/GirlRenderer.java deleted file mode 100644 index 50cdd1f..0000000 --- a/src/main/java/org/distortedandroid/examples/girl/GirlRenderer.java +++ /dev/null @@ -1,211 +0,0 @@ - -package org.distortedandroid.examples.girl; - -import java.io.IOException; -import java.io.InputStream; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Float1D; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Float4D; -import org.distortedandroid.library.Interpolator3D; -import org.distortedandroid.library.Interpolator1D; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class GirlRenderer implements GLSurfaceView.Renderer -{ - private GLSurfaceView mView; - private DistortedBitmap mGirl; - private Float2D pLeft, pRight, pHips; - private Float4D Region, sinkRegion, HipsRegion; - private static Interpolator3D diL, diR; - private static Interpolator1D diHips, diSink; - private static Float3D v0,v1,v2,v3; - private static Float1D d0, d1, s0; - - private int bmpHeight, bmpWidth; - - private static int boobsSwing; - private static int hipsSwirl; - private static float boobsSink; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public GirlRenderer(GLSurfaceView v) - { - mView = v; - - boobsSwing = 0; - hipsSwirl = 0; - boobsSink = 1.0f; - - pLeft = new Float2D(132, 264); - pRight= new Float2D(247, 264); - - // Make the boobs bigger - sinkRegion = new Float4D(0,0,60,60); - - s0 = new Float1D(boobsSink); - - diSink = new Interpolator1D(); - diSink.setCount(0.5f); - diSink.setDuration(0); - diSink.add(s0); - - // Boobs Movement - Region = new Float4D(0,0,45,45); - - diL = new Interpolator3D(); - diR = new Interpolator3D(); - - diL.setCount(0.0f); - diR.setCount(0.0f); - diL.setDuration(1000); - diR.setDuration(1000); - - v0 = new Float3D( 0,-boobsSwing, 0); - v1 = new Float3D( boobsSwing, 0, 0); - v2 = new Float3D( 0, boobsSwing, 0); - v3 = new Float3D(-boobsSwing, 0, 0); - - diL.add(v0); - diL.add(v1); - diL.add(v2); - diL.add(v3); - - diR.add(v0); - diR.add(v3); - diR.add(v2); - diR.add(v1); - - // Movement of the hips - pHips = new Float2D(216,505); - HipsRegion = new Float4D(0,0,120,120); - diHips = new Interpolator1D(); - - d0 = new Float1D(-hipsSwirl); - d1 = new Float1D(+hipsSwirl); - - diHips.add(d0); - diHips.add(d1); - diHips.setDuration(1000); - diHips.setCount(0.0f); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setHips(int s) - { - hipsSwirl = s; - d0.set(-hipsSwirl); - d1.set(+hipsSwirl); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setSize(float s) - { - boobsSink = s; - s0.set(boobsSink); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static void setSwing(int s) - { - boobsSwing = s; - - v0.set( 0,-boobsSwing, 0); - v1.set( boobsSwing, 0, 0); - v2.set( 0, boobsSwing, 0); - v3.set(-boobsSwing, 0, 0); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - mGirl.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - mGirl.abortAllEffects(Distorted.TYPE_MATR); - - if( bmpHeight/bmpWidth > height/width ) - { - int w = (height*bmpWidth)/bmpHeight; - mGirl.move((width-w)/2 ,0, 0); - mGirl.scale((float)height/bmpHeight); - } - else - { - int h = (width*bmpHeight)/bmpWidth; - mGirl.move(0 ,(height-h)/2, 0); - mGirl.scale((float)width/bmpWidth); - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.girl); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - bmpHeight = bitmap.getHeight(); - bmpWidth = bitmap.getWidth(); - - mGirl = new DistortedBitmap(bitmap, 30); - - mGirl.sink( diSink, sinkRegion, pLeft ); - mGirl.sink( diSink, sinkRegion, pRight); - - mGirl.distort(diL, Region, pLeft ); - mGirl.distort(diR, Region, pRight); - - mGirl.swirl(diHips, HipsRegion, pHips); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Renderer", ex.getMessage() ); - } - } -} diff --git a/src/main/java/org/distortedandroid/examples/girl/GirlSurfaceView.java b/src/main/java/org/distortedandroid/examples/girl/GirlSurfaceView.java deleted file mode 100644 index c033a08..0000000 --- a/src/main/java/org/distortedandroid/examples/girl/GirlSurfaceView.java +++ /dev/null @@ -1,29 +0,0 @@ - -package org.distortedandroid.examples.girl; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; -import android.util.AttributeSet; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class GirlSurfaceView extends GLSurfaceView -{ -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public GirlSurfaceView(Context c, AttributeSet attrs) - { - super(c, attrs); - - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - setRenderer(new GirlRenderer(this)); - } -} - diff --git a/src/main/java/org/distortedandroid/examples/interpolator/InterpolatorActivity.java b/src/main/java/org/distortedandroid/examples/interpolator/InterpolatorActivity.java deleted file mode 100644 index a80a5d4..0000000 --- a/src/main/java/org/distortedandroid/examples/interpolator/InterpolatorActivity.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.distortedandroid.examples.interpolator; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.Interpolator1D; -import org.distortedandroid.examples.R; - -import android.app.Activity; -import android.opengl.GLSurfaceView; -import android.os.Bundle; -import android.view.View; -import android.widget.SeekBar; -import android.widget.TextView; -import android.widget.SeekBar.OnSeekBarChangeListener; - -/////////////////////////////////////////////////////////////////// - -public class InterpolatorActivity extends Activity implements OnSeekBarChangeListener - { - private SeekBar barD, barN; - private TextView textD, textN; - -/////////////////////////////////////////////////////////////////// - @Override - protected void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.interpolatorlayout); - - barD = (SeekBar)findViewById(R.id.interpolatorSeekDuration); - barD.setOnSeekBarChangeListener(this); - textD = (TextView)findViewById(R.id.interpolatorTextDuration); - - barN = (SeekBar)findViewById(R.id.interpolatorSeekNoise); - barN.setOnSeekBarChangeListener(this); - textN = (TextView)findViewById(R.id.interpolatorTextNoise); - - barD.setProgress(50); - textD.setText("Duration: 10 s"); - - barN.setProgress(0); - textN.setText("Noise: 0.0"); - } - -/////////////////////////////////////////////////////////////////// - @Override - protected void onResume() - { - super.onResume(); - - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.interpolatorSurfaceView); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////// - @Override - protected void onPause() - { - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.interpolatorSurfaceView); - mView.onPause(); - - super.onPause(); - } - -/////////////////////////////////////////////////////////////////// - @Override - public void onStop() - { - super.onStop(); - } - -/////////////////////////////////////////////////////////////////// - @Override - public void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -/////////////////////////////////////////////////////////////////// - - public void Loop(View v) - { - InterpolatorSurfaceView.setMode(Interpolator1D.MODE_LOOP); - } - -/////////////////////////////////////////////////////////////////// - - public void Path(View v) - { - InterpolatorSurfaceView.setMode(Interpolator1D.MODE_PATH); - } - -/////////////////////////////////////////////////////////////////// - - public void Jump(View v) - { - InterpolatorSurfaceView.setMode(Interpolator1D.MODE_JUMP); - } - -/////////////////////////////////////////////////////////////////// - - public void Dim1D(View v) - { - InterpolatorSurfaceView.setDimension(InterpolatorSurfaceView.DIM_1D); - } - -/////////////////////////////////////////////////////////////////// - - public void Dim2D(View v) - { - InterpolatorSurfaceView.setDimension(InterpolatorSurfaceView.DIM_2D); - } - -/////////////////////////////////////////////////////////////////// - - public void Dim3DXY(View v) - { - InterpolatorSurfaceView.setDimension(InterpolatorSurfaceView.DIM_3DXY); - } - -/////////////////////////////////////////////////////////////////// - - public void Dim3DXZ(View v) - { - InterpolatorSurfaceView.setDimension(InterpolatorSurfaceView.DIM_3DXZ); - } - -/////////////////////////////////////////////////////////////////// - - public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) - { - float v, t; - int i; - - switch (bar.getId()) - { - case R.id.interpolatorSeekDuration: v = progress*200; - i = (int)(v/100); - t = i/10.0f; - InterpolatorSurfaceView.setDuration((int)v); - textD.setText("Duration: "+(int)t+" s"); - break; - case R.id.interpolatorSeekNoise : InterpolatorSurfaceView.setNoise(progress/100.0f); - textN.setText("Noise: "+(progress/100.f)); - break; - } - } - -/////////////////////////////////////////////////////////////////// - - public void onStartTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////// - - public void onStopTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////// -// end of file -} diff --git a/src/main/java/org/distortedandroid/examples/interpolator/InterpolatorRenderer.java b/src/main/java/org/distortedandroid/examples/interpolator/InterpolatorRenderer.java deleted file mode 100644 index d152740..0000000 --- a/src/main/java/org/distortedandroid/examples/interpolator/InterpolatorRenderer.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.distortedandroid.examples.interpolator; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Distorted; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class InterpolatorRenderer implements GLSurfaceView.Renderer - { - public static final int BWID = 300; - public static final int BHEI = 400; - - private GLSurfaceView mView; - private DistortedBitmap mBackground; - private Canvas mCanvas; - private Bitmap mBitmap; - private Paint mPaint; - private int texWidth, texHeight; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public InterpolatorRenderer(GLSurfaceView v) - { - mPaint = new Paint(); - mPaint.setAntiAlias(true); - mPaint.setFakeBoldText(true); - mPaint.setColor(0xff447da7); - mPaint.setStyle(Style.FILL); - - mView = v; - - texWidth = BWID; - texHeight= BHEI; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - mBackground = new DistortedBitmap(texWidth,texHeight, 2); - mBitmap = Bitmap.createBitmap(texWidth,texHeight, Bitmap.Config.ARGB_8888); - mCanvas = new Canvas(mBitmap); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Renderer", ex.getMessage() ); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - mBackground.abortAllEffects(Distorted.TYPE_MATR); - mBackground.scale((float)width/texWidth,(float)height/texHeight,1); - Distorted.onSurfaceChanged(width, height); - InterpolatorSurfaceView.setScreenSize(width,height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT); - - long time = System.currentTimeMillis(); - - mCanvas.drawRect(0, 0, texWidth, texHeight, mPaint); - InterpolatorSurfaceView.drawCurve(mCanvas,time); - mBackground.setBitmap(mBitmap); - mBackground.draw(time); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - } diff --git a/src/main/java/org/distortedandroid/examples/interpolator/InterpolatorSurfaceView.java b/src/main/java/org/distortedandroid/examples/interpolator/InterpolatorSurfaceView.java deleted file mode 100644 index 177ddaf..0000000 --- a/src/main/java/org/distortedandroid/examples/interpolator/InterpolatorSurfaceView.java +++ /dev/null @@ -1,422 +0,0 @@ -package org.distortedandroid.examples.interpolator; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; -import android.view.MotionEvent; -import android.util.AttributeSet; -import android.graphics.Canvas; -import android.graphics.Paint.Style; -import android.graphics.Paint; - -import org.distortedandroid.library.Interpolator1D; -import org.distortedandroid.library.Interpolator2D; -import org.distortedandroid.library.Interpolator3D; -import org.distortedandroid.library.Float1D; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float3D; - -/////////////////////////////////////////////////////////////////// - -public class InterpolatorSurfaceView extends GLSurfaceView - { - public static final int DIM_1D = 0; - public static final int DIM_2D = 1; - public static final int DIM_3DXY = 2; - public static final int DIM_3DXZ = 3; - - private static final int NUM_INTERPOLATIONS= 100; - private static final int MAX_VECTORS = 6; - - private InterpolatorRenderer mRenderer; - private static int xDown,yDown; - private static int mScrW, mScrH; - - private static Interpolator1D di1D; - private static Interpolator2D di2D; - private static Interpolator3D di3D; - - private static Paint mPaint; - private static int moving; - private static Object lock = new Object(); - private static long mTime = 0; - private static int mDuration; - private static float mPosition; - private static float mNoise; - - private static int currentDim = DIM_2D; - - private static Float1D p1D; - private static Float2D p2D; - private static Float3D p3D; - - private static float[] mDrawCoord = new float[3]; - -/////////////////////////////////////////////////////////////////// - - public InterpolatorSurfaceView(Context c, AttributeSet attrs) - { - super(c, attrs); - - mPaint = new Paint(); - mPaint.setStyle(Style.FILL); - mPaint.setAntiAlias(true); - - moving = -1; - mDuration = 10000; - mPosition = 0; - mNoise = 0.0f; - - di1D = new Interpolator1D(); - di1D.setDuration(mDuration); - di1D.setNoise(mNoise); - - di2D = new Interpolator2D(); - di2D.setDuration(mDuration); - di2D.setNoise(mNoise); - - di3D = new Interpolator3D(); - di3D.setDuration(mDuration); - di3D.setNoise(mNoise); - - if(!isInEditMode()) - { - setFocusable(true); - setFocusableInTouchMode(true); - - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) // when running on the emulator, insert a magic line that is - { // supposed to cure the 'no config chosen' crash on emulator startup - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - mRenderer = new InterpolatorRenderer(this); - setRenderer(mRenderer); - } - } - -/////////////////////////////////////////////////////////////////// - - public static void setMode(int mode) - { - di1D.setMode(mode); - di2D.setMode(mode); - di3D.setMode(mode); - } - -/////////////////////////////////////////////////////////////////// - - public static void setScreenSize(int width, int height) - { - mScrW = width; - mScrH = height; - } - -/////////////////////////////////////////////////////////////////// - - public static void setDuration(int duration) - { - mDuration = duration; - - di1D.setDuration(duration); - di2D.setDuration(duration); - di3D.setDuration(duration); - } - -/////////////////////////////////////////////////////////////////// - - public static void setNoise(float noise) - { - mNoise = noise; - - di1D.setNoise(noise); - di2D.setNoise(noise); - di3D.setNoise(noise); - } - -/////////////////////////////////////////////////////////////////// - - public static void setDimension(int dim) - { - if( currentDim != dim ) - { - if( !(currentDim==DIM_3DXY && dim==DIM_3DXZ) && !(currentDim==DIM_3DXZ && dim==DIM_3DXY) ) - { - synchronized(lock) - { - di1D.removeAll(); - di2D.removeAll(); - di3D.removeAll(); - } - } - - currentDim = dim; - } - } - -/////////////////////////////////////////////////////////////////// - - public static void drawCurve(Canvas c, long time) - { - mPosition += (mTime>0 && mDuration>0) ? ((float)(time-mTime)*NUM_INTERPOLATIONS/mDuration) : 0; - - synchronized(lock) - { - switch(currentDim) - { - case DIM_1D: drawCurve1D(c,time); break; - case DIM_2D: drawCurve2D(c,time); break; - default : drawCurve3D(c,time); break; - } - } - - mTime = time; - } - -/////////////////////////////////////////////////////////////////// - - private static void drawCurve1D(Canvas c, long time) - { - int len = di1D.getNumPoints(); - - mPaint.setColor(0xff000000); - - c.drawLine(0, InterpolatorRenderer.BHEI/2, InterpolatorRenderer.BWID, InterpolatorRenderer.BHEI/2, mPaint); - c.drawText("x", 0.95f*InterpolatorRenderer.BWID, 0.55f*InterpolatorRenderer.BHEI , mPaint); - - if( len>=2 ) - { - for(int i=0; i=2 ) - { - for(int i=0; i=2 ) - { - for(int i=0; i=MAX_VECTORS ) di1D.removeAll(); - di1D.add(new Float1D(xDown)); - } - } - break; - case DIM_2D: len = di2D.getNumPoints(); - - for(int g=0; g=MAX_VECTORS ) di2D.removeAll(); - di2D.add(new Float2D(xDown,yDown)); - } - } - break; - default : len = di3D.getNumPoints(); - - for(int g=0; g=MAX_VECTORS ) di3D.removeAll(); - - if( currentDim==DIM_3DXY ) - { - di3D.add(new Float3D(xDown,yDown,InterpolatorRenderer.BHEI/2)); - } - if( currentDim==DIM_3DXZ ) - { - di3D.add(new Float3D(xDown,InterpolatorRenderer.BHEI/2,yDown)); - } - } - } - break; - } - } - -/////////////////////////////////////////////////////////////////// - - @Override public boolean onTouchEvent(MotionEvent event) - { - int action = event.getAction(); - - switch(action) - { - case MotionEvent.ACTION_DOWN: xDown = (int)event.getX()*InterpolatorRenderer.BWID/mScrW; - yDown = (int)event.getY()*InterpolatorRenderer.BHEI/mScrH; - - addNewPoint(xDown,yDown); - - break; - case MotionEvent.ACTION_MOVE: if( moving>=0 ) - { - xDown = (int)event.getX()*InterpolatorRenderer.BWID/mScrW; - yDown = (int)event.getY()*InterpolatorRenderer.BHEI/mScrH; - - switch(currentDim) - { - case DIM_1D : di1D.setPoint(moving, xDown); - break; - case DIM_2D : di2D.setPoint(moving, xDown, yDown); - break; - case DIM_3DXY: di3D.setPoint(moving, xDown, yDown, (int)di3D.getPoint(moving).getZ()); - break; - case DIM_3DXZ: di3D.setPoint(moving, xDown, (int)di3D.getPoint(moving).getY(), yDown); - break; - } - } - break; - case MotionEvent.ACTION_UP : moving = -1; - break; - } - - return true; - } - -/////////////////////////////////////////////////////////////////// - } diff --git a/src/main/java/org/distortedandroid/examples/listener/ListenerActivity.java b/src/main/java/org/distortedandroid/examples/listener/ListenerActivity.java deleted file mode 100644 index b0c7210..0000000 --- a/src/main/java/org/distortedandroid/examples/listener/ListenerActivity.java +++ /dev/null @@ -1,52 +0,0 @@ - -package org.distortedandroid.examples.listener; - -import org.distortedandroid.library.Distorted; - -import android.app.Activity; -import android.os.Bundle; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class ListenerActivity extends Activity -{ - private ListenerSurfaceView mView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - mView = new ListenerSurfaceView(this); - setContentView(mView); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - mView.onPause(); - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -} diff --git a/src/main/java/org/distortedandroid/examples/listener/ListenerRenderer.java b/src/main/java/org/distortedandroid/examples/listener/ListenerRenderer.java deleted file mode 100644 index 367ac6a..0000000 --- a/src/main/java/org/distortedandroid/examples/listener/ListenerRenderer.java +++ /dev/null @@ -1,144 +0,0 @@ - -package org.distortedandroid.examples.listener; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Random; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Float4D; -import org.distortedandroid.library.EffectListener; -import org.distortedandroid.library.EffectMessage; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener -{ - private GLSurfaceView mView; - private DistortedBitmap water; - private int bmpHeight, bmpWidth; - private Random mRnd; - - private final int NUM_BUBBLES = 12; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public ListenerRenderer(GLSurfaceView v) - { - Distorted.setMaxVertex(NUM_BUBBLES); - mView = v; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private long randomizeNewBubble() - { - int radius = (int)((0.10f + 0.70f*mRnd.nextFloat())*bmpWidth); // pop up a bubble of size (radius,height) - int height = (int)((-0.10f + 0.20f*mRnd.nextFloat())*bmpWidth); // - int pointx = mRnd.nextInt( (int)(0.8f*bmpWidth)) + (int)(0.1f*bmpWidth); // at a random place on the bitmap (but not near the edge) - int pointy = mRnd.nextInt( (int)(0.8f*bmpHeight))+ (int)(0.1f*bmpHeight); // - int duration = 1000 + mRnd.nextInt(3000); // for anytime from 3 to 4 seconds - - Float3D dp3d = new Float3D(0,0,height); - Float2D dp2d = new Float2D(pointx,pointy); - Float4D dr = new Float4D(0,0,radius,radius); - - return water.distort(dp3d, dr, dp2d, duration, 1.0f); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void effectMessage(EffectMessage em, long effectID, int effectType, long bitmapID) - { - switch(em) - { - case EFFECT_REMOVED: randomizeNewBubble(); - default : break; - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - water.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - water.abortAllEffects(Distorted.TYPE_MATR); - - if( bmpHeight/bmpWidth > height/width ) - { - int w = (height*bmpWidth)/bmpHeight; - water.move((width-w)/2 ,0, 0); - water.scale((float)height/bmpHeight); - } - else - { - int h = (width*bmpHeight)/bmpWidth; - water.move(0 ,(height-h)/2, 0); - water.scale((float)width/bmpWidth); - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.water); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - mRnd = new Random(0); - - bmpHeight = bitmap.getHeight(); - bmpWidth = bitmap.getWidth(); - - water = new DistortedBitmap(bitmap, 50); - water.addEventListener(this); - - for(int i=0; i height/width ) - { - int w = (height*bmpWidth)/bmpHeight; - monaLisa.move((width-w)/2 ,0, 0); - monaLisa.scale((float)height/bmpHeight); - } - else - { - int h = (width*bmpHeight)/bmpWidth; - monaLisa.move(0 ,(height-h)/2, 0); - monaLisa.scale((float)width/bmpWidth); - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.monalisa); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - bmpHeight = bitmap.getHeight(); - bmpWidth = bitmap.getWidth(); - - monaLisa = new DistortedBitmap(bitmap, 10); - monaLisa.distort( vLeft, rLeft , pLeft, 1000, 0); - monaLisa.distort(vRight, rRight, pRight,1000, 0); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("MonaLisa", ex.getMessage() ); - } - } -} diff --git a/src/main/java/org/distortedandroid/examples/monalisa/MonaLisaSurfaceView.java b/src/main/java/org/distortedandroid/examples/monalisa/MonaLisaSurfaceView.java deleted file mode 100644 index 6ca748a..0000000 --- a/src/main/java/org/distortedandroid/examples/monalisa/MonaLisaSurfaceView.java +++ /dev/null @@ -1,27 +0,0 @@ - -package org.distortedandroid.examples.monalisa; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class MonaLisaSurfaceView extends GLSurfaceView -{ -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public MonaLisaSurfaceView(Context context) - { - super(context); - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - setRenderer(new MonaLisaRenderer(this)); - } -} - diff --git a/src/main/java/org/distortedandroid/examples/movingeffects/MovingEffectsActivity.java b/src/main/java/org/distortedandroid/examples/movingeffects/MovingEffectsActivity.java deleted file mode 100644 index 1c45a49..0000000 --- a/src/main/java/org/distortedandroid/examples/movingeffects/MovingEffectsActivity.java +++ /dev/null @@ -1,182 +0,0 @@ -package org.distortedandroid.examples.movingeffects; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.examples.R; - -import android.app.Activity; -import android.opengl.GLSurfaceView; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.Toast; - -/////////////////////////////////////////////////////////////////// - -public class MovingEffectsActivity extends Activity - { - private static final int COLOR_PRESSED = 0xff0000ff; - private static final int COLOR_UNPRESSED = 0x888888ff; - private static final String SHOWED_TOAST = "showed_toast"; - - Button mAbort, mMacro, mTrans, mSink, mBubble, mSwirl; - -/////////////////////////////////////////////////////////////////// - @Override - protected void onCreate(Bundle savedState) - { - super.onCreate(savedState); - - setContentView(R.layout.movingeffectslayout); - - mAbort = (Button)findViewById(R.id.movingeffectsAbort); - mMacro = (Button)findViewById(R.id.movingeffectsMacro); - mTrans = (Button)findViewById(R.id.movingeffectsTrans); - mSink = (Button)findViewById(R.id.movingeffectsSink); - mBubble= (Button)findViewById(R.id.movingeffectsBubble); - mSwirl= (Button)findViewById(R.id.movingeffectsSwirl); - - mAbort.setBackgroundColor(COLOR_PRESSED); - mMacro.setBackgroundColor(COLOR_UNPRESSED); - mTrans.setBackgroundColor(COLOR_UNPRESSED); - mSink.setBackgroundColor(COLOR_UNPRESSED); - mBubble.setBackgroundColor(COLOR_UNPRESSED); - mSwirl.setBackgroundColor(COLOR_UNPRESSED); - - if ( savedState== null || !savedState.getBoolean(SHOWED_TOAST, false)) - { - Toast.makeText(this, R.string.example_movingeffects_toast , Toast.LENGTH_LONG).show(); - } - } - -/////////////////////////////////////////////////////////////////// - @Override - protected void onResume() - { - super.onResume(); - - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////// - @Override - protected void onPause() - { - Abort(null); - - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView); - mView.onPause(); - - super.onPause(); - } - -/////////////////////////////////////////////////////////////////// - @Override - public void onStop() - { - super.onStop(); - } - -/////////////////////////////////////////////////////////////////// - @Override - public void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onSaveInstanceState (Bundle outState) - { - outState.putBoolean(SHOWED_TOAST, true); - } - -/////////////////////////////////////////////////////////////////// - - public void Bubble(View v) - { - MovingEffectsSurfaceView.Bubble(); - - mAbort.setBackgroundColor(COLOR_UNPRESSED); - mMacro.setBackgroundColor(COLOR_UNPRESSED); - mTrans.setBackgroundColor(COLOR_UNPRESSED); - mSink.setBackgroundColor(COLOR_UNPRESSED); - mBubble.setBackgroundColor(COLOR_PRESSED); - mSwirl.setBackgroundColor(COLOR_UNPRESSED); - } - -/////////////////////////////////////////////////////////////////// - - public void Sink(View v) - { - MovingEffectsSurfaceView.Sink(); - - mAbort.setBackgroundColor(COLOR_UNPRESSED); - mMacro.setBackgroundColor(COLOR_UNPRESSED); - mTrans.setBackgroundColor(COLOR_UNPRESSED); - mSink.setBackgroundColor(COLOR_PRESSED); - mBubble.setBackgroundColor(COLOR_UNPRESSED); - mSwirl.setBackgroundColor(COLOR_UNPRESSED); - } - -/////////////////////////////////////////////////////////////////// - - public void Transparency(View v) - { - MovingEffectsSurfaceView.Transparency(); - - mAbort.setBackgroundColor(COLOR_UNPRESSED); - mMacro.setBackgroundColor(COLOR_UNPRESSED); - mTrans.setBackgroundColor(COLOR_PRESSED); - mSink.setBackgroundColor(COLOR_UNPRESSED); - mBubble.setBackgroundColor(COLOR_UNPRESSED); - mSwirl.setBackgroundColor(COLOR_UNPRESSED); - } - -/////////////////////////////////////////////////////////////////// - - public void Macroblock(View v) - { - MovingEffectsSurfaceView.Macroblock(); - - mAbort.setBackgroundColor(COLOR_UNPRESSED); - mMacro.setBackgroundColor(COLOR_PRESSED); - mTrans.setBackgroundColor(COLOR_UNPRESSED); - mSink.setBackgroundColor(COLOR_UNPRESSED); - mBubble.setBackgroundColor(COLOR_UNPRESSED); - mSwirl.setBackgroundColor(COLOR_UNPRESSED); - } - -/////////////////////////////////////////////////////////////////// - - public void Swirl(View v) - { - MovingEffectsSurfaceView.Swirl(); - - mAbort.setBackgroundColor(COLOR_UNPRESSED); - mMacro.setBackgroundColor(COLOR_UNPRESSED); - mTrans.setBackgroundColor(COLOR_UNPRESSED); - mSink.setBackgroundColor(COLOR_UNPRESSED); - mBubble.setBackgroundColor(COLOR_UNPRESSED); - mSwirl.setBackgroundColor(COLOR_PRESSED); - } - -/////////////////////////////////////////////////////////////////// - - public void Abort(View v) - { - MovingEffectsSurfaceView.Abort(); - - mAbort.setBackgroundColor(COLOR_PRESSED); - mMacro.setBackgroundColor(COLOR_UNPRESSED); - mTrans.setBackgroundColor(COLOR_UNPRESSED); - mSink.setBackgroundColor(COLOR_UNPRESSED); - mBubble.setBackgroundColor(COLOR_UNPRESSED); - mSwirl.setBackgroundColor(COLOR_UNPRESSED); - } - -/////////////////////////////////////////////////////////////////// -// end of file -} diff --git a/src/main/java/org/distortedandroid/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distortedandroid/examples/movingeffects/MovingEffectsRenderer.java deleted file mode 100644 index 0f544c3..0000000 --- a/src/main/java/org/distortedandroid/examples/movingeffects/MovingEffectsRenderer.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.distortedandroid.examples.movingeffects; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Distorted; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class MovingEffectsRenderer implements GLSurfaceView.Renderer - { - public static final int NUMLINES = 10; - public static final int BWID = 300; - public static final int BHEI = 400; - - private GLSurfaceView mView; - public static DistortedBitmap mBackground; - private Canvas mCanvas; - private Bitmap mBitmap; - private Paint mPaint; - private int texWidth, texHeight; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public MovingEffectsRenderer(GLSurfaceView v) - { - mPaint = new Paint(); - mPaint.setAntiAlias(true); - mPaint.setFakeBoldText(true); - mPaint.setStyle(Style.FILL); - - mView = v; - - texWidth = BWID; - texHeight= BHEI; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void drawBackground() - { - mPaint.setColor(0xff008800); - mCanvas.drawRect(0, 0, texWidth, texHeight, mPaint); - mPaint.setColor(0xffffffff); - - for(int i=0; i<=NUMLINES ; i++ ) - { - mCanvas.drawRect(texWidth*i/NUMLINES - 2, 0, texWidth*i/NUMLINES + 2, texHeight , mPaint); - mCanvas.drawRect( 0, texHeight*i/NUMLINES -2, texWidth , texHeight*i/NUMLINES + 2, mPaint); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - mBackground = new DistortedBitmap(texWidth,texHeight, 80); - mBitmap = Bitmap.createBitmap(texWidth,texHeight, Bitmap.Config.ARGB_8888); - mCanvas = new Canvas(mBitmap); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Renderer", ex.getMessage() ); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - mBackground.abortAllEffects(Distorted.TYPE_MATR); - mBackground.scale((float)width/texWidth,(float)height/texHeight,1); - - Distorted.onSurfaceChanged(width, height); - MovingEffectsSurfaceView.setScreenSize(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT); - - long time = System.currentTimeMillis(); - - if (MovingEffectsSurfaceView.getCurrentEffect() == MovingEffectsSurfaceView.EFFECT_POINTS ) - { - drawBackground(); - MovingEffectsSurfaceView.drawCurve(mCanvas,time); - mBackground.setBitmap(mBitmap); - } - - mBackground.draw(time); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -} diff --git a/src/main/java/org/distortedandroid/examples/movingeffects/MovingEffectsSurfaceView.java b/src/main/java/org/distortedandroid/examples/movingeffects/MovingEffectsSurfaceView.java deleted file mode 100644 index 1418a63..0000000 --- a/src/main/java/org/distortedandroid/examples/movingeffects/MovingEffectsSurfaceView.java +++ /dev/null @@ -1,271 +0,0 @@ -package org.distortedandroid.examples.movingeffects; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.opengl.GLSurfaceView; -import android.os.Build; -import android.view.MotionEvent; -import android.util.AttributeSet; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Float4D; -import org.distortedandroid.library.Interpolator2D; -import org.distortedandroid.library.Interpolator3D; - -/////////////////////////////////////////////////////////////////// - -public class MovingEffectsSurfaceView extends GLSurfaceView - { - private static final int LOOP_TIME = 5000; - private static final int NUM_INTERPOLATIONS= 100; - - public static final int EFFECT_POINTS=0; - public static final int EFFECT_BUBBLE=1; - public static final int EFFECT_SINK =2; - public static final int EFFECT_TRANS =3; - public static final int EFFECT_MACRO =4; - public static final int EFFECT_SWIRL =5; - - private static MovingEffectsRenderer mRenderer; - - private static int xDown,yDown; - private static int mScrW, mScrH; - - private static Interpolator2D di2D; - private static Interpolator3D di3D; - private static Float4D dr; - - private static Paint mPaint; - private static int moving; - private static Object lock = new Object(); - private static long mTime = 0; - - private static int mCurrEffect; - -/////////////////////////////////////////////////////////////////// - - public MovingEffectsSurfaceView(Context c, AttributeSet attrs) - { - super(c, attrs); - - mCurrEffect=EFFECT_POINTS; - mPaint = new Paint(); - mPaint.setStyle(Style.FILL); - moving = -1; - - di2D = new Interpolator2D(); - di2D.setCount(0.0f); - di2D.setDuration(LOOP_TIME); - - di3D = new Interpolator3D(); - di3D.add(new Float3D(0,0, 0)); - di3D.add(new Float3D(0,0,30)); - - dr = new Float4D(0,0,60,60); - - if(!isInEditMode()) - { - setFocusable(true); - setFocusableInTouchMode(true); - - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) // when running on the emulator, insert a magic line that is - { // supposed to cure the 'no config chosen' crash on emulator startup - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - mRenderer = new MovingEffectsRenderer(this); - setRenderer(mRenderer); - } - } - -/////////////////////////////////////////////////////////////////// - - public static void setScreenSize(int width, int height) - { - mScrW = width; - mScrH = height; - } - -/////////////////////////////////////////////////////////////////// - - public static int getCurrentEffect() - { - return mCurrEffect; - } - -/////////////////////////////////////////////////////////////////// - - public static void Bubble() - { - if( mCurrEffect==EFFECT_BUBBLE ) return; - - synchronized(lock) - { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); - MovingEffectsRenderer.mBackground.distort(di3D, dr, di2D); - mCurrEffect = EFFECT_BUBBLE; - } - } - -/////////////////////////////////////////////////////////////////// - - public static void Sink() - { - if( mCurrEffect==EFFECT_SINK ) return; - - synchronized(lock) - { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); - MovingEffectsRenderer.mBackground.sink(10.0f, dr, di2D, 0, 0.5f); - mCurrEffect = EFFECT_SINK; - } - } - -/////////////////////////////////////////////////////////////////// - - public static void Macroblock() - { - if( mCurrEffect==EFFECT_MACRO ) return; - - synchronized(lock) - { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); - MovingEffectsRenderer.mBackground.macroblock(3, dr, di2D, 0, 0.5f); - mCurrEffect = EFFECT_MACRO; - } - } - -/////////////////////////////////////////////////////////////////// - - public static void Transparency() - { - if( mCurrEffect==EFFECT_TRANS ) return; - - synchronized(lock) - { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); - MovingEffectsRenderer.mBackground.smooth_alpha(0.5f, dr, di2D, 0, 0.5f); - mCurrEffect = EFFECT_TRANS; - } - } - -/////////////////////////////////////////////////////////////////// - - public static void Swirl() - { - if( mCurrEffect==EFFECT_SWIRL ) return; - - synchronized(lock) - { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); - MovingEffectsRenderer.mBackground.swirl(30, dr, di2D, 0, 0.5f); - mCurrEffect = EFFECT_SWIRL; - } - } - -/////////////////////////////////////////////////////////////////// - - public static void Abort() - { - synchronized(lock) - { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); - di2D.removeAll(); - mCurrEffect = EFFECT_POINTS; - } - } - -/////////////////////////////////////////////////////////////////// - - public static void drawCurve(Canvas c, long time) - { - synchronized(lock) - { - int len = di2D.getNumPoints(); - float[] drawCoord = new float[2]; - Float2D cu; - int lit = mTime> 0 ? (int)((float)(time-mTime)*NUM_INTERPOLATIONS/LOOP_TIME) : 0; - - if( len>=2 ) - { - for(int i=0; i LOOP_TIME ) mTime = time; - } - } - -/////////////////////////////////////////////////////////////////// - - @Override public boolean onTouchEvent(MotionEvent event) - { - if( mCurrEffect!=EFFECT_POINTS ) return true; - - switch(event.getAction()) - { - case MotionEvent.ACTION_DOWN: xDown = (int)event.getX()*MovingEffectsRenderer.BWID/mScrW; - yDown = (int)event.getY()*MovingEffectsRenderer.BHEI/mScrH; - - float gx, gy; - Float2D dv; - int len = di2D.getNumPoints(); - - for(int g=0; g=0 ) - { - xDown = (int)event.getX()*MovingEffectsRenderer.BWID/mScrW; - yDown = (int)event.getY()*MovingEffectsRenderer.BHEI/mScrH; - di2D.setPoint(moving, xDown, yDown); - } - break; - case MotionEvent.ACTION_UP : moving = -1; - break; - } - return true; - } - -/////////////////////////////////////////////////////////////////// -// end of file - - } diff --git a/src/main/java/org/distortedandroid/examples/olimpic/OlimpicActivity.java b/src/main/java/org/distortedandroid/examples/olimpic/OlimpicActivity.java deleted file mode 100644 index 5e4d901..0000000 --- a/src/main/java/org/distortedandroid/examples/olimpic/OlimpicActivity.java +++ /dev/null @@ -1,51 +0,0 @@ - -package org.distortedandroid.examples.olimpic; - -import org.distortedandroid.library.Distorted; - -import android.app.Activity; -import android.os.Bundle; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class OlimpicActivity extends Activity -{ - private OlimpicSurfaceView mView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - mView = new OlimpicSurfaceView(this); - setContentView(mView); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - mView.onPause(); - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } -} diff --git a/src/main/java/org/distortedandroid/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distortedandroid/examples/olimpic/OlimpicRenderer.java deleted file mode 100644 index 917757a..0000000 --- a/src/main/java/org/distortedandroid/examples/olimpic/OlimpicRenderer.java +++ /dev/null @@ -1,160 +0,0 @@ - -package org.distortedandroid.examples.olimpic; - -import java.io.IOException; -import java.io.InputStream; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.Interpolator1D; -import org.distortedandroid.library.DistortedNode; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Float1D; -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class OlimpicRenderer implements GLSurfaceView.Renderer -{ - private static final int LEAF_SIZE = 100; - private static final int NUM_CIRCLES = 5; - private static final int NUM_LEAVES = 8; - - private GLSurfaceView mView; - private DistortedNode[] mCircleNode; - private DistortedNode mScreen; - private DistortedBitmap mLeaf; - private Interpolator1D mRot; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public OlimpicRenderer(GLSurfaceView v) - { - mView = v; - - mLeaf = new DistortedBitmap(LEAF_SIZE,LEAF_SIZE,1); - - mScreen = new DistortedNode(new DistortedBitmap(9*LEAF_SIZE,9*LEAF_SIZE,1)); - - mRot = new Interpolator1D(); - mRot.setMode(Interpolator1D.MODE_JUMP); - mRot.setCount(0.0f); - mRot.setDuration(5000); - mRot.add(new Float1D( 0)); - mRot.add(new Float1D(360)); - - mCircleNode = new DistortedNode[NUM_CIRCLES]; - - int[] colors = new int[] {0,0,1, 0,0,0, 1,0,0, 1,1,0, 0,1,0}; // blue, black, red, yellow, green - int[] positions = new int[] {0*LEAF_SIZE,2*LEAF_SIZE, 3*LEAF_SIZE,2*LEAF_SIZE, 6*LEAF_SIZE,2*LEAF_SIZE, 3*LEAF_SIZE/2,9*LEAF_SIZE/2, 9*LEAF_SIZE/2,9*LEAF_SIZE/2}; - - DistortedBitmap tmp; - Float3D center = new Float3D(3*LEAF_SIZE/2, 3*LEAF_SIZE/2, 0); - - for(int i=0; i height/width ) - { - int w = (height*bmpWidth)/bmpHeight; - bmp.move((width-w)/2 ,0, 0); - bmp.scale((float)height/bmpHeight); - } - else - { - int h = (width*bmpHeight)/bmpWidth; - bmp.move(0 ,(height-h)/2, 0); - bmp.scale((float)width/bmpWidth); - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.leaf); - Bitmap leaf; - - try - { - leaf = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - mLeaf.setBitmap(leaf); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("DifferentEffectsRenderer", ex.getMessage() ); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -} diff --git a/src/main/java/org/distortedandroid/examples/olimpic/OlimpicSurfaceView.java b/src/main/java/org/distortedandroid/examples/olimpic/OlimpicSurfaceView.java deleted file mode 100644 index 7d5f9ce..0000000 --- a/src/main/java/org/distortedandroid/examples/olimpic/OlimpicSurfaceView.java +++ /dev/null @@ -1,27 +0,0 @@ - -package org.distortedandroid.examples.olimpic; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class OlimpicSurfaceView extends GLSurfaceView -{ -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public OlimpicSurfaceView(Context context) - { - super(context); - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - setRenderer(new OlimpicRenderer(this)); - } -} - diff --git a/src/main/java/org/distortedandroid/examples/quaternion/QuaternionActivity.java b/src/main/java/org/distortedandroid/examples/quaternion/QuaternionActivity.java deleted file mode 100644 index 4f774fa..0000000 --- a/src/main/java/org/distortedandroid/examples/quaternion/QuaternionActivity.java +++ /dev/null @@ -1,51 +0,0 @@ - -package org.distortedandroid.examples.quaternion; - -import org.distortedandroid.library.Distorted; - -import android.app.Activity; -import android.os.Bundle; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class QuaternionActivity extends Activity -{ - private QuaternionSurfaceView mView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - mView = new QuaternionSurfaceView(this); - setContentView(mView); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - mView.onPause(); - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } -} diff --git a/src/main/java/org/distortedandroid/examples/quaternion/QuaternionRenderer.java b/src/main/java/org/distortedandroid/examples/quaternion/QuaternionRenderer.java deleted file mode 100644 index d18774e..0000000 --- a/src/main/java/org/distortedandroid/examples/quaternion/QuaternionRenderer.java +++ /dev/null @@ -1,128 +0,0 @@ - -package org.distortedandroid.examples.quaternion; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Random; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.Interpolator; -import org.distortedandroid.library.InterpolatorQuat; -import org.distortedandroid.library.DistortedCubes; -import org.distortedandroid.library.Float4D; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Distorted; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class QuaternionRenderer implements GLSurfaceView.Renderer -{ - private static final int NUM_QUATERNIONS = 5; - private static final int SIZE = 100; - - private GLSurfaceView mView; - private DistortedCubes mCube; - private Random mRnd = new Random(System.currentTimeMillis()); - private InterpolatorQuat mRot; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public QuaternionRenderer(GLSurfaceView v) - { - mView = v; - mCube = new DistortedCubes( 3, "000010000", SIZE); - - mRot = new InterpolatorQuat(); - - float x,y,z,w, len; - - for(int i=0; i height ) - { - mCube.move((width-height)/2 ,0, 0); - mCube.scale(height/(3.0f*SIZE)); - } - else - { - mCube.move(0 ,(height-width)/2, 0); - mCube.scale(width/(3.0f*SIZE)); - } - - mCube.quaternion( new Float3D(3*SIZE/2,3*SIZE/2,0), mRot); - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.grid); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - mCube.setBitmap(bitmap); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Quaternion", ex.getMessage() ); - } - } -} diff --git a/src/main/java/org/distortedandroid/examples/quaternion/QuaternionSurfaceView.java b/src/main/java/org/distortedandroid/examples/quaternion/QuaternionSurfaceView.java deleted file mode 100644 index 1553215..0000000 --- a/src/main/java/org/distortedandroid/examples/quaternion/QuaternionSurfaceView.java +++ /dev/null @@ -1,31 +0,0 @@ - -package org.distortedandroid.examples.quaternion; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class QuaternionSurfaceView extends GLSurfaceView -{ -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public QuaternionSurfaceView(Context c) - { - super(c); - - if(!isInEditMode()) - { - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - setRenderer(new QuaternionRenderer(this)); - } - } -} - diff --git a/src/main/java/org/distortedandroid/examples/scratchpad/ScratchpadActivity.java b/src/main/java/org/distortedandroid/examples/scratchpad/ScratchpadActivity.java deleted file mode 100644 index 68f152b..0000000 --- a/src/main/java/org/distortedandroid/examples/scratchpad/ScratchpadActivity.java +++ /dev/null @@ -1,175 +0,0 @@ -package org.distortedandroid.examples.scratchpad; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.examples.R; - -import android.app.Activity; -import android.opengl.GLSurfaceView; -import android.os.Bundle; -import android.view.View; -import android.widget.SeekBar.OnSeekBarChangeListener; -import android.widget.SeekBar; -import android.widget.TextView; - -/////////////////////////////////////////////////////////////////// - -public class ScratchpadActivity extends Activity implements OnSeekBarChangeListener - { - private static final float D_MULT=200.0f; - private static final float C_MULT= 0.1f; - - private long effectID; - - private SeekBar barD, barC, barI; - private TextView textD, textC, textI; - -/////////////////////////////////////////////////////////////////// - @Override - protected void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - - setContentView(R.layout.scratchpadlayout); - - barD = (SeekBar)findViewById(R.id.scratchpadSeekDuration); - barD.setOnSeekBarChangeListener(this); - barC = (SeekBar)findViewById(R.id.scratchpadSeekCount); - barC.setOnSeekBarChangeListener(this); - barI = (SeekBar)findViewById(R.id.scratchpadSeekID); - barI.setOnSeekBarChangeListener(this); - - textD = (TextView)findViewById(R.id.scratchpadTextDuration); - textC = (TextView)findViewById(R.id.scratchpadTextCount); - textI = (TextView)findViewById(R.id.scratchpadTextID); - - barD.setProgress(100); - barC.setProgress(10); - barI.setProgress(0); - - textD.setText("Dur: 20 s"); - textC.setText("Cou: 1.0"); - textI.setText("ID: 0"); - } - -/////////////////////////////////////////////////////////////////// - @Override - protected void onResume() - { - super.onResume(); - - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.scratchpadSurfaceView); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////// - @Override - protected void onPause() - { - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.scratchpadSurfaceView); - mView.onPause(); - - super.onPause(); - } - -/////////////////////////////////////////////////////////////////// - @Override - public void onStop() - { - super.onStop(); - } - -/////////////////////////////////////////////////////////////////// - @Override - public void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -/////////////////////////////////////////////////////////////////// - - public void Distort(View v) - { - ScratchpadSurfaceView.setEffect(0); - } - -/////////////////////////////////////////////////////////////////// - - public void Sink(View v) - { - ScratchpadSurfaceView.setEffect(1); - } - -/////////////////////////////////////////////////////////////////// - - public void Transparency(View v) - { - ScratchpadSurfaceView.setEffect(2); - } - -/////////////////////////////////////////////////////////////////// - - public void Macroblock(View v) - { - ScratchpadSurfaceView.setEffect(3); - } - -/////////////////////////////////////////////////////////////////// - - public void Brightness(View v) - { - ScratchpadSurfaceView.setEffect(4); - } - -/////////////////////////////////////////////////////////////////// - - public void Print(View v) - { - ScratchpadRenderer.mBackground.printEffect(effectID); - } - -/////////////////////////////////////////////////////////////////// - - public void Abort(View v) - { - ScratchpadRenderer.mBackground.abortEffect(effectID); - } - -/////////////////////////////////////////////////////////////////// - - public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) - { - float v, t; - int i; - - switch (bar.getId()) - { - case R.id.scratchpadSeekDuration: v = progress*D_MULT; - i = (int)(v/100); - t = i/10.0f; - ScratchpadSurfaceView.setDuration((int)v); - textD.setText("Dur: "+(int)t+" s"); - break; - case R.id.scratchpadSeekCount : v = progress*C_MULT; - i = (int)(v*10); - t = i/10.0f; - ScratchpadSurfaceView.setCount(v); - textC.setText("Cou: "+t); - break; - case R.id.scratchpadSeekID : effectID = progress; - textI.setText("ID: "+progress); - break; - } - } - -/////////////////////////////////////////////////////////////////// - - public void onStartTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////// - - public void onStopTrackingTouch(SeekBar bar) { } - -/////////////////////////////////////////////////////////////////// -// end of file -} diff --git a/src/main/java/org/distortedandroid/examples/scratchpad/ScratchpadRenderer.java b/src/main/java/org/distortedandroid/examples/scratchpad/ScratchpadRenderer.java deleted file mode 100644 index ec390e6..0000000 --- a/src/main/java/org/distortedandroid/examples/scratchpad/ScratchpadRenderer.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.distortedandroid.examples.scratchpad; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Distorted; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class ScratchpadRenderer implements GLSurfaceView.Renderer - { - public static final int NUMLINES = 10; - public static final int BWID = 300; - public static final int BHEI = 400; - - private GLSurfaceView mView; - public static DistortedBitmap mBackground; - private Paint mPaint; - private int texWidth, texHeight; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public ScratchpadRenderer(GLSurfaceView v) - { - mPaint = new Paint(); - mPaint.setAntiAlias(true); - mPaint.setFakeBoldText(true); - mPaint.setStyle(Style.FILL); - - mView = v; - - texWidth = BWID; - texHeight= BHEI; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - mBackground = new DistortedBitmap(texWidth,texHeight, 80); - Bitmap bitmap = Bitmap.createBitmap(texWidth,texHeight, Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(bitmap); - - mPaint.setColor(0xff008800); - canvas.drawRect(0, 0, texWidth, texHeight, mPaint); - mPaint.setColor(0xffffffff); - - for(int i=0; i<=NUMLINES ; i++ ) - { - canvas.drawRect(texWidth*i/NUMLINES - 1, 0, texWidth*i/NUMLINES + 1, texHeight , mPaint); - canvas.drawRect( 0, texHeight*i/NUMLINES -1, texWidth , texHeight*i/NUMLINES + 1, mPaint); - } - - mBackground.setBitmap(bitmap); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Renderer", ex.getMessage() ); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - mBackground.abortAllEffects(Distorted.TYPE_MATR); - mBackground.scale((float)width/texWidth,(float)height/texHeight,1); - Distorted.onSurfaceChanged(width,height); - ScratchpadSurfaceView.setScreenSize(width,height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT); - mBackground.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -} diff --git a/src/main/java/org/distortedandroid/examples/scratchpad/ScratchpadSurfaceView.java b/src/main/java/org/distortedandroid/examples/scratchpad/ScratchpadSurfaceView.java deleted file mode 100644 index 458ac25..0000000 --- a/src/main/java/org/distortedandroid/examples/scratchpad/ScratchpadSurfaceView.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.distortedandroid.examples.scratchpad; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; -import android.view.MotionEvent; -import android.util.AttributeSet; - -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Float4D; -import org.distortedandroid.library.Interpolator3D; - -/////////////////////////////////////////////////////////////////// - -public class ScratchpadSurfaceView extends GLSurfaceView - { - private ScratchpadRenderer mRenderer; - private static int mCurrentEffect; - private static int mDuration; - private static float mCount; - private static int mScrW, mScrH; - - private static Float4D region; - private static Float2D point; - - private static Interpolator3D di; - private static Float3D v0, v1, v2, v3; - -/////////////////////////////////////////////////////////////////// - - public ScratchpadSurfaceView(Context c, AttributeSet attrs) - { - super(c, attrs); - - mDuration = 10000; - mCount = 1.0f; - - di = new Interpolator3D(); - - di.setDuration(mDuration); - di.setCount(mCount); - - if(!isInEditMode()) - { - setFocusable(true); - setFocusableInTouchMode(true); - - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) // when running on the emulator, insert a magic line that is - { // supposed to cure the 'no config chosen' crash on emulator startup - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - mRenderer = new ScratchpadRenderer(this); - setRenderer(mRenderer); - - point = new Float2D(0,0); - region= new Float4D(0,0,60,60); - - int h = 30; - int r = 20; - - v0 = new Float3D( 0, r, h ); - v1 = new Float3D(-r, 0, h ); - v2 = new Float3D( 0,-r, h ); - v3 = new Float3D( r, 0, h ); - - di.add(v0); - di.add(v1); - di.add(v2); - di.add(v3); - - setEffect(0); - } - } - -/////////////////////////////////////////////////////////////////// - - public static void setScreenSize(int width, int height) - { - mScrW = width; - mScrH = height; - } - -/////////////////////////////////////////////////////////////////// - - public static int getEffect() - { - return mCurrentEffect; - } - -/////////////////////////////////////////////////////////////////// - - public static void setEffect(int effect) - { - mCurrentEffect = effect; - } - -/////////////////////////////////////////////////////////////////// - - public static void setDuration(int duration) - { - mDuration = duration; - di.setDuration(duration); - } - -/////////////////////////////////////////////////////////////////// - - public static void setCount(float count) - { - mCount = count; - di.setCount(count); - } - -/////////////////////////////////////////////////////////////////// - - @Override public boolean onTouchEvent(MotionEvent event) - { - int action = event.getAction(); - int x, y; - - switch(action) - { - case MotionEvent.ACTION_DOWN: x = (int)event.getX()*ScratchpadRenderer.BWID/mScrW; - y = (int)event.getY()*ScratchpadRenderer.BHEI/mScrH; - point.set(x,y); - - switch(mCurrentEffect) - { - case 0: ScratchpadRenderer.mBackground.distort(di, region, point); - break; - case 1: ScratchpadRenderer.mBackground.sink(0.3f, region, point, mDuration, mCount); - break; - case 2: ScratchpadRenderer.mBackground.alpha(0.0f, region, point, mDuration, mCount); - break; - case 3: ScratchpadRenderer.mBackground.macroblock(10, region, point, mDuration, mCount); - break; - case 4: ScratchpadRenderer.mBackground.brightness(0.0f, region, point, mDuration, mCount); - break; - } - break; - } - - return true; - } - -/////////////////////////////////////////////////////////////////// -// end of file - - } diff --git a/src/main/java/org/distortedandroid/examples/sink/SinkActivity.java b/src/main/java/org/distortedandroid/examples/sink/SinkActivity.java deleted file mode 100644 index b169640..0000000 --- a/src/main/java/org/distortedandroid/examples/sink/SinkActivity.java +++ /dev/null @@ -1,51 +0,0 @@ - -package org.distortedandroid.examples.sink; - -import org.distortedandroid.library.Distorted; - -import android.app.Activity; -import android.os.Bundle; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class SinkActivity extends Activity -{ - private SinkSurfaceView mView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - mView = new SinkSurfaceView(this); - setContentView(mView); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - mView.onPause(); - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } -} diff --git a/src/main/java/org/distortedandroid/examples/sink/SinkRenderer.java b/src/main/java/org/distortedandroid/examples/sink/SinkRenderer.java deleted file mode 100644 index 4152757..0000000 --- a/src/main/java/org/distortedandroid/examples/sink/SinkRenderer.java +++ /dev/null @@ -1,111 +0,0 @@ - -package org.distortedandroid.examples.sink; - -import java.io.IOException; -import java.io.InputStream; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float4D; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class SinkRenderer implements GLSurfaceView.Renderer -{ - private GLSurfaceView mView; - private DistortedBitmap sinkBmp; - private Float2D pLeft, pRight; - private Float4D Region; - private int bmpHeight, bmpWidth; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public SinkRenderer(GLSurfaceView v) - { - mView = v; - - pLeft = new Float2D(214, 206); - pRight= new Float2D(390, 212); - Region= new Float4D(0,0,60,60); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - sinkBmp.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - sinkBmp.abortAllEffects(Distorted.TYPE_MATR); - - if( bmpHeight/bmpWidth > height/width ) - { - int w = (height*bmpWidth)/bmpHeight; - sinkBmp.move((width-w)/2 ,0, 0); - sinkBmp.scale((float)height/bmpHeight); - } - else - { - int h = (width*bmpHeight)/bmpWidth; - sinkBmp.move(0 ,(height-h)/2, 0); - sinkBmp.scale((float)width/bmpWidth); - } - - Distorted.onSurfaceChanged(width, height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - InputStream is = mView.getContext().getResources().openRawResource(R.raw.dog); - Bitmap bitmap; - - try - { - bitmap = BitmapFactory.decodeStream(is); - } - finally - { - try - { - is.close(); - } - catch(IOException e) { } - } - - bmpHeight = bitmap.getHeight(); - bmpWidth = bitmap.getWidth(); - - sinkBmp = new DistortedBitmap(bitmap, 30); - sinkBmp.sink( 10.0f, Region, pLeft, 2000, 0.0f); - sinkBmp.sink(10.0f, Region, pRight,2000, 0.0f); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Sink", ex.getMessage() ); - } - } -} diff --git a/src/main/java/org/distortedandroid/examples/sink/SinkSurfaceView.java b/src/main/java/org/distortedandroid/examples/sink/SinkSurfaceView.java deleted file mode 100644 index ff4de18..0000000 --- a/src/main/java/org/distortedandroid/examples/sink/SinkSurfaceView.java +++ /dev/null @@ -1,27 +0,0 @@ - -package org.distortedandroid.examples.sink; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class SinkSurfaceView extends GLSurfaceView -{ -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public SinkSurfaceView(Context context) - { - super(context); - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - setRenderer(new SinkRenderer(this)); - } -} - diff --git a/src/main/java/org/distortedandroid/examples/starwars/StarWarsActivity.java b/src/main/java/org/distortedandroid/examples/starwars/StarWarsActivity.java deleted file mode 100644 index 1db2a7d..0000000 --- a/src/main/java/org/distortedandroid/examples/starwars/StarWarsActivity.java +++ /dev/null @@ -1,52 +0,0 @@ - -package org.distortedandroid.examples.starwars; - -import org.distortedandroid.library.Distorted; - -import android.app.Activity; -import android.os.Bundle; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class StarWarsActivity extends Activity -{ - private StarWarsSurfaceView mView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle icicle) - { - super.onCreate(icicle); - mView = new StarWarsSurfaceView(this); - setContentView(mView); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onPause() - { - mView.onPause(); - super.onPause(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onResume() - { - super.onResume(); - mView.onResume(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onDestroy() - { - Distorted.onDestroy(); - super.onDestroy(); - } - -} diff --git a/src/main/java/org/distortedandroid/examples/starwars/StarWarsRenderer.java b/src/main/java/org/distortedandroid/examples/starwars/StarWarsRenderer.java deleted file mode 100644 index a88ad04..0000000 --- a/src/main/java/org/distortedandroid/examples/starwars/StarWarsRenderer.java +++ /dev/null @@ -1,388 +0,0 @@ - -package org.distortedandroid.examples.starwars; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Random; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import org.distortedandroid.examples.R; - -import org.distortedandroid.library.Interpolator1D; -import org.distortedandroid.library.Interpolator3D; -import org.distortedandroid.library.DistortedNode; -import org.distortedandroid.library.Float1D; -import org.distortedandroid.library.Float2D; -import org.distortedandroid.library.Float3D; -import org.distortedandroid.library.Float4D; -import org.distortedandroid.library.EffectListener; -import org.distortedandroid.library.EffectMessage; -import org.distortedandroid.library.Distorted; -import org.distortedandroid.library.DistortedBitmap; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Typeface; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener -{ - private final String[] mGFFAString = - - { "A long time ago, in a galaxy far,", - "far away...." }; // yes, there really was a four-dot ellipsis - - private final String[] mCRAWLString = - - { "It is a period of civil war.", // in the original 1977 version, there was no - "Rebel spaceships, striking", // 'Episode IV New Hope' subtitle line before - "from a hidden base, have", // the crawl. Lets keep to the classic. - "won their first victory", - "against the evil Galactic", - "Empire.", - "", - "During the battle, rebel", - "spies managed to steal", - "secret plans to the Empire's", - "ultimate weapon, the", - "DEATH STAR, an armored", - "space station with enough", - "power to destroy an entire", - "planet.", - "", - "Pursued by the Empire's", - "sinister agents, Princess", - "Leia races home aboard her", - "starship, custodian of the", - "stolen plans that can save", - "her people and restore", - "freedom to the galaxy...." }; // four-dot. - - private final int NUM_STARS = 40; - - private final int CRAWL_COLOR = 0xffffe81f; - private final int GFFA_COLOR = 0xff0000ff; - private final int FONT_HEIGHT = 40; - private final int VERTICAL_SPACING = 10; - private final String CRAWL_TYPEFACE = "News Gothic"; - - private final int CRAWL_WIDTH = 500; - private final int CRAWL_HEIGHT= (FONT_HEIGHT+VERTICAL_SPACING)*(mCRAWLString.length+1); - - private final int GFFA_WIDTH = 600; - private final int GFFA_HEIGHT= (FONT_HEIGHT+VERTICAL_SPACING)*(mGFFAString.length+1); - - private final float CRAWL_ANGLE = -30.0f; - - private GLSurfaceView mView; - private DistortedBitmap mScreen, mGFFA, mLogo, mCrawl, mCrawlBackground; - private DistortedBitmap[] mStars; - private long gffaID, logoID, crawlID; - - private Random mRnd = new Random(0); - private DistortedNode mRoot, mBackground; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public StarWarsRenderer(GLSurfaceView v) - { - mView = v; - - Distorted.setFov(60.0f); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onDrawFrame(GL10 glUnused) - { - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - - mRoot.draw(System.currentTimeMillis()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceChanged(GL10 glUnused, int width, int height) - { - Distorted.onSurfaceChanged(width, height); - setupScreen(width,height); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onSurfaceCreated(GL10 glUnused, EGLConfig config) - { - setupBitmaps(); - - try - { - Distorted.onSurfaceCreated(mView); - } - catch(Exception ex) - { - android.util.Log.e("Star Wars", ex.getMessage() ); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void setupScreen(int w, int h) - { - mScreen = new DistortedBitmap(w,h,1); - mRoot = new DistortedNode(mScreen); - - mCrawlBackground = new DistortedBitmap(w,(int)(Math.sqrt(3.0)*h),1); - - int randomA, randomX, randomY, randomTime; - float randomS, randomAlpha1, randomAlpha2; - - Float3D rot = new Float3D(0,0,0); - - for(int i=0; i0 && str.charAt(len-1) == ' ' ) numspaces--; - - float left=x,w = (numspaces>0 ? (float)(length-paint.measureText(str))/numspaces : 0); - String tmp; - int begin,end=0; - - while( end0 ) ret++; - else break; - } - - return ret; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void effectMessage(EffectMessage em, long effectID, int effectType, long bitmapID) - { - if( em==EffectMessage.EFFECT_FINISHED ) - { - if( bitmapID == gffaID ) - { - mRoot.detach(mGFFA); - mGFFA.removeEventListener(this); - - int screenW=mScreen.getWidth(); - int screenH=mScreen.getHeight(); - - int logoW = mLogo.getWidth(); - int logoH = mLogo.getHeight(); - - int initSize= (int)(3.0f*screenW/logoW); - int finaSize= (int)(0.1f*screenW/logoW); - - Interpolator3D di = new Interpolator3D(); - - di.add(new Float3D(initSize,initSize,1)); - di.add(new Float3D(finaSize,finaSize,1)); - di.setCount(0.5f); - di.setDuration(10000); - - mLogo.move( screenW/2, screenH/2, 0); - mLogo.scale(di); - mLogo.move( -logoW/2, -logoH/2, 0); - - mRoot.attach(mLogo); - mLogo.addEventListener(this); - } - else if( bitmapID==logoID ) - { - mRoot.detach(mLogo); - mLogo.removeEventListener(this); - - int crawlW = mCrawl.getWidth(); - int crawlH = mCrawl.getHeight(); - int screenW= mScreen.getWidth(); - int screenH= mScreen.getHeight(); - int backH = mCrawlBackground.getHeight(); - float scale= (float)screenW/crawlW; - - Interpolator3D di = new Interpolator3D(); - di.setCount(0.5f); - di.setDuration(60000); - di.add(new Float3D(screenW/2,+backH , 0)); - di.add(new Float3D(screenW/2,-scale*crawlH, 0)); - - mCrawlBackground.move(0,screenH-backH,0); - mCrawlBackground.rotate(new Float3D(screenW/2,backH,0), CRAWL_ANGLE, 1.0f, 0.0f, 0.0f); - - final int transpDistance = 5; - mCrawlBackground.smooth_alpha((1-transpDistance/2)*1.0f, new Float4D(0,0,transpDistance*backH,transpDistance*backH), new Float2D(screenW/2,(1-transpDistance)*backH)); - - mCrawl.move(di); - mCrawl.scale(scale); - mCrawl.move(-crawlW/2,0,0); - - mBackground = mRoot.attach(mCrawlBackground); - mBackground.attach(mCrawl); - mCrawl.addEventListener(this); - } - else if( bitmapID==crawlID ) - { - mRoot.detach(mBackground); - mBackground.detach(mCrawl); - mCrawl.removeEventListener(this); - } - } - } -} -/////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distortedandroid/examples/starwars/StarWarsSurfaceView.java b/src/main/java/org/distortedandroid/examples/starwars/StarWarsSurfaceView.java deleted file mode 100644 index c62ebbc..0000000 --- a/src/main/java/org/distortedandroid/examples/starwars/StarWarsSurfaceView.java +++ /dev/null @@ -1,27 +0,0 @@ - -package org.distortedandroid.examples.starwars; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.os.Build; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class StarWarsSurfaceView extends GLSurfaceView -{ -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public StarWarsSurfaceView(Context context) - { - super(context); - setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - - setRenderer(new StarWarsRenderer(this)); - } -} - diff --git a/src/main/res/layout/check2layout.xml b/src/main/res/layout/check2layout.xml index 47df922..b819fdf 100644 --- a/src/main/res/layout/check2layout.xml +++ b/src/main/res/layout/check2layout.xml @@ -6,7 +6,7 @@ android:onClick="Check" android:orientation="vertical" > - - - - - - - - -