commit e8b6aa957edc8609da8072aae335ce57a036b903 Author: Leszek Koltunski Date: Mon Dec 12 16:47:53 2016 +0000 Major change in API: separate the GRID from DistortedObject; completely remove classes derived from DistortedObject. diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java index 21d9333..63e66f6 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java @@ -26,7 +26,7 @@ import android.opengl.GLSurfaceView; import org.distorted.examples.R; import org.distorted.library.Distorted; -import org.distorted.library.DistortedBitmap; +import org.distorted.library.DistortedBitmapGrid; import org.distorted.library.DistortedObject; import org.distorted.library.EffectTypes; import org.distorted.library.type.Static3D; @@ -43,6 +43,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; private DistortedObject mObject; + private DistortedBitmapGrid mGrid; private AroundTheWorldEffectsManager mEffects; private int mObjWidth, mObjHeight; @@ -69,7 +70,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mObject.draw(System.currentTimeMillis()); + mObject.draw(System.currentTimeMillis(), mGrid); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -118,14 +119,16 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer catch(IOException e) { } } - mObject = new DistortedBitmap(bitmap.getWidth(),bitmap.getHeight(),30); mObjWidth = mObject.getWidth(); mObjHeight= mObject.getHeight(); - mObject.setBitmap(bitmap); + mObject = new DistortedObject(mObjWidth,mObjHeight,1); + mObject.setTexture(bitmap); mEffects.apply(mObject); + mGrid = new DistortedBitmapGrid(30,30*mObjHeight/mObjWidth); + try { Distorted.onSurfaceCreated(mView.getContext()); diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java index c2290c9..6577e90 100644 --- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java +++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java @@ -29,7 +29,8 @@ import org.distorted.examples.R; import org.distorted.library.EffectTypes; import org.distorted.library.Distorted; -import org.distorted.library.DistortedBitmap; +import org.distorted.library.DistortedObject; +import org.distorted.library.DistortedBitmapGrid; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -44,7 +45,8 @@ import android.opengl.GLSurfaceView; class BeanRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; - private DistortedBitmap mBean; + private DistortedObject mBean; + private DistortedBitmapGrid mGrid; private Static3D pLeft, pRight; private Dynamic3D dLeft, dRight; private Static4D rLeft, rRight; @@ -88,7 +90,7 @@ class BeanRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mBean.draw(System.currentTimeMillis()); + mBean.draw(System.currentTimeMillis(), mGrid); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -142,10 +144,13 @@ class BeanRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mBean = new DistortedBitmap(bitmap, 25); + mBean = new DistortedObject(bmpWidth, bmpHeight, 1); + mBean.setTexture(bitmap); mBean.distort(dLeft , pLeft , rLeft ); mBean.distort(dRight, pRight, rRight); - + + mGrid = new DistortedBitmapGrid(25,25*bmpHeight/bmpWidth); + try { Distorted.onSurfaceCreated(mView.getContext()); diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java index 9119ace..5475650 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java @@ -27,7 +27,8 @@ 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.DistortedObject; +import org.distorted.library.DistortedBitmapGrid; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; @@ -45,7 +46,8 @@ import android.opengl.GLSurfaceView; class CatAndDogRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; - private DistortedBitmap catanddog; + private DistortedObject mObject; + private DistortedBitmapGrid mGrid; private Static4D chromaRegion, alphaRegion; private int bmpHeight, bmpWidth; @@ -64,7 +66,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - catanddog.draw(System.currentTimeMillis()); + mObject.draw(System.currentTimeMillis(), mGrid); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -91,20 +93,23 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - - catanddog = new DistortedBitmap(bitmap, 30); + + mGrid = new DistortedBitmapGrid(1,1); // no vertex effects, grid can be a (1x1) quad. + + mObject = new DistortedObject(bmpWidth,bmpHeight,1); + mObject.setTexture(bitmap); Dynamic1D chromaDyn = new Dynamic1D(3000,0.0f); chromaDyn.add(new Static1D(1)); chromaDyn.add(new Static1D(0)); - catanddog.chroma(chromaDyn, new Static3D(1,0,0), chromaRegion ,true); + mObject.chroma(chromaDyn, new Static3D(1,0,0), chromaRegion ,true); Dynamic1D alphaDyn = new Dynamic1D(3000,0.0f); alphaDyn.add(new Static1D(1)); alphaDyn.add(new Static1D(0)); - catanddog.alpha( alphaDyn, alphaRegion, false ); + mObject.alpha( alphaDyn, alphaRegion, false ); try { @@ -134,11 +139,11 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer diRotate.add(new Static1D( 0)); diRotate.add(new Static1D(360)); - catanddog.abortEffects(EffectTypes.MATRIX); + mObject.abortEffects(EffectTypes.MATRIX); - catanddog.move(diMove); - catanddog.scale(diScale); - catanddog.rotate( diRotate, new Static3D(0,0,1), new Static3D(bmpWidth/2,bmpHeight/2,0) ); + mObject.move(diMove); + mObject.scale(diScale); + mObject.rotate( diRotate, new Static3D(0,0,1), new Static3D(bmpWidth/2,bmpHeight/2,0) ); Distorted.onSurfaceChanged(width, height); } diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java index cc58b3d..e8809f4 100644 --- a/src/main/java/org/distorted/examples/check/CheckRenderer.java +++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java @@ -28,15 +28,14 @@ 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.DistortedObject; +import org.distorted.library.DistortedBitmapGrid; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; -import org.distorted.library.type.Static2D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; import org.distorted.library.type.Dynamic1D; -import org.distorted.library.type.Dynamic2D; import android.app.AlertDialog; import android.content.Context; @@ -55,7 +54,8 @@ class CheckRenderer implements GLSurfaceView.Renderer private static String compilationTitle; private GLSurfaceView mView; - private DistortedBitmap mSuccess; + private DistortedObject mSuccess; + private DistortedBitmapGrid mGrid; private int bmpHeight, bmpWidth; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -75,7 +75,7 @@ class CheckRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mSuccess.draw(System.currentTimeMillis()); + mSuccess.draw(System.currentTimeMillis(), mGrid); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -126,11 +126,13 @@ class CheckRenderer implements GLSurfaceView.Renderer catch(IOException e) { } } - mSuccess = new DistortedBitmap(bitmap, 30); - bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); + mSuccess = new DistortedObject(bmpWidth,bmpHeight,1); + mSuccess.setTexture(bitmap); + mGrid = new DistortedBitmapGrid(30,30*bmpHeight/bmpWidth); + // Try adding 2 Vertex Effects to the Bitmap. // This will fail if we have set maxVertexEffects to something < 2. // diff --git a/src/main/java/org/distorted/examples/cubes/CubesActivity.java b/src/main/java/org/distorted/examples/cubes/CubesActivity.java index 6c9ea03..baf64a0 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesActivity.java +++ b/src/main/java/org/distorted/examples/cubes/CubesActivity.java @@ -21,8 +21,9 @@ package org.distorted.examples.cubes; import org.distorted.library.Distorted; import org.distorted.examples.R; -import org.distorted.library.DistortedCubes; import org.distorted.library.DistortedObject; +import org.distorted.library.DistortedObjectGrid; +import org.distorted.library.DistortedCubesGrid; import android.app.Activity; import android.opengl.GLSurfaceView; @@ -48,6 +49,7 @@ public class CubesActivity extends Activity implements View.OnClickListener private LinearLayout mLay; private boolean[] mShape; private DistortedObject mObject; + private DistortedObjectGrid mGrid; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -197,7 +199,8 @@ public class CubesActivity extends Activity implements View.OnClickListener for(int i=0; i=0; i--) bmp[i].draw(time); + for(int i=NUM-1; i>=0; i--) mObj[i].draw(time, mGrid); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +107,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer { for(int i=NUM-1; i>=0; i--) { - bmp[i].abortEffects(EffectTypes.MATRIX); + mObj[i].abortEffects(EffectTypes.MATRIX); } if( (float)bmpHeight/(NUM*bmpWidth) > (float)height/width ) @@ -116,8 +117,8 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer for(int i=NUM-1; i>=0; i--) { - bmp[i].move( new Static3D((width-NUM*w)/2 +i*w ,0,0) ); - bmp[i].scale(factor); + mObj[i].move( new Static3D((width-NUM*w)/2 +i*w ,0,0) ); + mObj[i].scale(factor); } } else @@ -128,8 +129,8 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer for(int i=NUM-1; i>=0; i--) { - bmp[i].move( new Static3D(i*w,(height-h)/2,0) ); - bmp[i].scale(factor); + mObj[i].move( new Static3D(i*w,(height-h)/2,0) ); + mObj[i].scale(factor); } } @@ -150,18 +151,20 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer bmpWidth = bitmap0.getWidth(); // create NUM DistortedBitmaps with shared effects - bmp = new DistortedBitmap[NUM]; - bmp[0] = new DistortedBitmap(bmpWidth, bmpHeight, 30); + mObj = new DistortedObject[NUM]; + mObj[0] = new DistortedObject(bmpWidth, bmpHeight, 1); for(int i=1; i=0; i--) bmp[i].draw(time); + for(int i=NUM-1; i>=0; i--) mObj[i].draw(time, mGrid); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -92,7 +93,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer { for(int i=NUM-1; i>=0; i--) { - bmp[i].abortEffects(EffectTypes.MATRIX); + mObj[i].abortEffects(EffectTypes.MATRIX); } if( (float)bmpHeight/(NUM*bmpWidth) > (float)height/width ) @@ -102,8 +103,8 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer for(int i=NUM-1; i>=0; i--) { - bmp[i].move( new Static3D((width-NUM*w)/2 +i*w , 0, 0) ); - bmp[i].scale(factor); + mObj[i].move( new Static3D((width-NUM*w)/2 +i*w , 0, 0) ); + mObj[i].scale(factor); } } else @@ -114,8 +115,8 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer for(int i=NUM-1; i>=0; i--) { - bmp[i].move( new Static3D(i*w, (height-h)/2, 0) ); - bmp[i].scale(factor); + mObj[i].move( new Static3D(i*w, (height-h)/2, 0) ); + mObj[i].scale(factor); } } @@ -146,28 +147,30 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); + + mGrid = new DistortedBitmapGrid(30,30*bmpHeight/bmpWidth); + + mObj = new DistortedObject[NUM]; + mObj[0] = new DistortedObject(bmpWidth, bmpHeight, 1); - bmp = new DistortedBitmap[NUM]; - bmp[0] = new DistortedBitmap(bmpWidth, bmpHeight, 30); - - for(int i=1; i (float)height/width ) { int w = (height*bmpWidth)/bmpHeight; float factor = (float)height/bmpHeight; - water.move( new Static3D((width-w)/2,0,0) ); - water.scale(factor); + mWater.move( new Static3D((width-w)/2,0,0) ); + mWater.scale(factor); } else { int h = (width*bmpHeight)/bmpWidth; float factor = (float)width/bmpWidth; - water.move( new Static3D(0,(height-h)/2,0) ); - water.scale(factor); + mWater.move( new Static3D(0,(height-h)/2,0) ); + mWater.scale(factor); } Distorted.onSurfaceChanged(width, height); @@ -152,9 +153,11 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - - water = new DistortedBitmap(bitmap, 50); - water.addEventListener(this); + + mGrid = new DistortedBitmapGrid(50,50*bmpHeight/bmpWidth); + mWater = new DistortedObject(bmpWidth,bmpHeight,1); + mWater.setTexture(bitmap); + mWater.addEventListener(this); for(int i=0; i mEffects; private int mEffectAdd; @@ -66,7 +68,8 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele createEffectNames(); - mObject = new DistortedCubes( 1, "1", 100); + mGrid = new DistortedCubesGrid(1,1,false); + mObject = new DistortedObject(1,1,1); setEffectView(); } @@ -102,6 +105,13 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele return mObject; } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public DistortedObjectGrid getGrid() + { + return mGrid; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// public void setRegion(float x, float y, float r) diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java index 833a592..473de6d 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java @@ -23,6 +23,7 @@ import android.opengl.GLES20; import android.opengl.GLSurfaceView; import org.distorted.library.Distorted; +import org.distorted.library.DistortedObjectGrid; import org.distorted.library.DistortedObject; import org.distorted.library.EffectTypes; @@ -35,6 +36,7 @@ class Matrix3DRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; private DistortedObject mObject; + private DistortedObjectGrid mGrid; private int mWidth, mHeight; @@ -44,7 +46,10 @@ class Matrix3DRenderer implements GLSurfaceView.Renderer { mView = v; - mObject= ((Matrix3DActivity)v.getContext()).getObject(); + Matrix3DActivity act = (Matrix3DActivity)v.getContext(); + + mObject= act.getObject(); + mGrid = act.getGrid(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -55,7 +60,7 @@ class Matrix3DRenderer implements GLSurfaceView.Renderer long time = System.currentTimeMillis(); - mObject.draw(time); + mObject.draw(time,mGrid); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -92,7 +97,7 @@ class Matrix3DRenderer implements GLSurfaceView.Renderer Matrix3DActivity act = (Matrix3DActivity)mView.getContext(); - mObject.setBitmap( act.getBitmap() ); + mObject.setTexture(act.getBitmap()); try { diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java index b8e9b3b..f74b124 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java @@ -27,10 +27,10 @@ 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.DistortedObject; +import org.distorted.library.DistortedBitmapGrid; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; -import org.distorted.library.type.Static2D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -44,7 +44,8 @@ import android.opengl.GLSurfaceView; class MonaLisaRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; - private DistortedBitmap monaLisa; + private DistortedObject mObject; + private DistortedBitmapGrid mGrid; private Static3D pLeft, pRight; private Static4D rLeft, rRight; private Dynamic3D dLeft, dRight; @@ -75,28 +76,28 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - monaLisa.draw(System.currentTimeMillis()); + mObject.draw(System.currentTimeMillis(),mGrid); } /////////////////////////////////////////////////////////////////////////////////////////////////// public void onSurfaceChanged(GL10 glUnused, int width, int height) { - monaLisa.abortEffects(EffectTypes.MATRIX); + mObject.abortEffects(EffectTypes.MATRIX); if( (float)bmpHeight/bmpWidth > (float)height/width ) { int w = (height*bmpWidth)/bmpHeight; float factor = (float)height/bmpHeight; - monaLisa.move( new Static3D((width-w)/2,0,0) ); - monaLisa.scale(factor); + mObject.move( new Static3D((width-w)/2,0,0) ); + mObject.scale(factor); } else { int h = (width*bmpHeight)/bmpWidth; float factor = (float)width/bmpWidth; - monaLisa.move( new Static3D(0,(height-h)/2,0) ); - monaLisa.scale(factor); + mObject.move( new Static3D(0,(height-h)/2,0) ); + mObject.scale(factor); } Distorted.onSurfaceChanged(width, height); @@ -127,9 +128,11 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - monaLisa = new DistortedBitmap(bitmap, 9); - monaLisa.distort( dLeft, pLeft , rLeft ); - monaLisa.distort(dRight, pRight, rRight); + mGrid = new DistortedBitmapGrid(9,9*bmpHeight/bmpWidth); + mObject = new DistortedObject(bmpWidth,bmpHeight,1); + mObject.setTexture(bitmap); + mObject.distort( dLeft, pLeft , rLeft ); + mObject.distort(dRight, pRight, rRight); try { diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java index 5d5817d..debe2be 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java @@ -29,7 +29,8 @@ import android.graphics.Paint.Style; import android.opengl.GLES20; import android.opengl.GLSurfaceView; -import org.distorted.library.DistortedBitmap; +import org.distorted.library.DistortedObject; +import org.distorted.library.DistortedBitmapGrid; import org.distorted.library.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -42,7 +43,9 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer private Paint mPaint; private int texW, texH; - static DistortedBitmap mBackground; + private DistortedBitmapGrid mGrid; + + static DistortedObject mBackground; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -102,7 +105,8 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer texW = width; texH = height; - mBackground = new DistortedBitmap(texW,texH, 80); + mGrid = new DistortedBitmapGrid(80,80*height/width); + mBackground = new DistortedObject(texW,texH,1); mBitmap = Bitmap.createBitmap(texW,texH, Bitmap.Config.ARGB_8888); mCanvas = new Canvas(mBitmap); @@ -122,10 +126,10 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer { drawBackground(); mView.drawCurve(mCanvas,time); - mBackground.setBitmap(mBitmap); + mBackground.setTexture(mBitmap); } - mBackground.draw(time); + mBackground.draw(time,mGrid); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java index c59c70f..bf3d229 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java @@ -33,7 +33,8 @@ import org.distorted.library.DistortedNode; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static1D; import org.distorted.library.Distorted; -import org.distorted.library.DistortedBitmap; +import org.distorted.library.DistortedBitmapGrid; +import org.distorted.library.DistortedObject; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -50,17 +51,18 @@ class OlimpicRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedNode mScreen; - private DistortedBitmap mLeaf; + private DistortedObject mLeaf; /////////////////////////////////////////////////////////////////////////////////////////////////// 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)); + + mLeaf = new DistortedObject(LEAF_SIZE,LEAF_SIZE,1); + DistortedBitmapGrid grid = new DistortedBitmapGrid(1,1); + + mScreen = new DistortedNode(new DistortedObject(9*LEAF_SIZE,9*LEAF_SIZE,1), grid); Dynamic1D rot = new Dynamic1D(5000,0.0f); rot.setMode(Dynamic1D.MODE_JUMP); @@ -72,7 +74,7 @@ class OlimpicRenderer implements GLSurfaceView.Renderer 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; + DistortedObject tmp; Static3D center = new Static3D(3*LEAF_SIZE/2, 3*LEAF_SIZE/2, 0); Static3D axis = new Static3D(0,0,1); Static3D moveVector = new Static3D(0,LEAF_SIZE,0); @@ -81,12 +83,12 @@ class OlimpicRenderer implements GLSurfaceView.Renderer { if( i==0 ) { - mCircleNode[i] = new DistortedNode(new DistortedBitmap(3*LEAF_SIZE,3*LEAF_SIZE,1)); + mCircleNode[i] = new DistortedNode(new DistortedObject(3*LEAF_SIZE,3*LEAF_SIZE,1), grid); for(int j=0; j (float)height/width ) { int w = (height*bmpWidth)/bmpHeight; float factor = (float)height/bmpHeight; - sinkBmp.move( new Static3D((width-w)/2,0,0) ); - sinkBmp.scale( factor ); + mObject.move( new Static3D((width-w)/2,0,0) ); + mObject.scale( factor ); } else { int h = (width*bmpHeight)/bmpWidth; float factor = (float)width/bmpWidth; - sinkBmp.move( new Static3D(0,(height-h)/2,0) ); - sinkBmp.scale( factor ); + mObject.move( new Static3D(0,(height-h)/2,0) ); + mObject.scale( factor ); } Distorted.onSurfaceChanged(width, height); @@ -125,9 +126,12 @@ class SinkRenderer implements GLSurfaceView.Renderer dSink.add(new Static1D( 1)); dSink.add(new Static1D(10)); - sinkBmp = new DistortedBitmap(bitmap, 30); - sinkBmp.sink( dSink, pLeft, Region); - sinkBmp.sink( dSink, pRight,Region); + mGrid = new DistortedBitmapGrid(30,30*bmpHeight/bmpWidth); + mObject = new DistortedObject(bmpWidth,bmpHeight,1); + mObject.setTexture(bitmap); + + mObject.sink( dSink, pLeft, Region); + mObject.sink( dSink, pRight,Region); try { diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java index a7c16bd..1b696e2 100644 --- a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java +++ b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java @@ -28,6 +28,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; +import org.distorted.library.DistortedBitmapGrid; import org.distorted.library.EffectNames; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; @@ -38,7 +39,7 @@ import org.distorted.library.type.Static4D; import org.distorted.library.message.EffectListener; import org.distorted.library.message.EffectMessage; import org.distorted.library.Distorted; -import org.distorted.library.DistortedBitmap; +import org.distorted.library.DistortedObject; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -100,19 +101,22 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener private final float CRAWL_ANGLE = -30.0f; private GLSurfaceView mView; - private DistortedBitmap mScreen, mGFFA, mLogo, mCrawl, mCrawlBackground; - private DistortedBitmap[] mStars; + private DistortedObject mScreen, mGFFA, mLogo, mCrawl, mCrawlBackground; + private DistortedObject[] mStars; private long gffaID, logoID, crawlID; private Random mRnd = new Random(0); private DistortedNode mRoot, mBackground; - + private DistortedBitmapGrid mQuad; + + /////////////////////////////////////////////////////////////////////////////////////////////////// StarWarsRenderer(GLSurfaceView v) { mView = v; - + + mQuad = new DistortedBitmapGrid(1,1); Distorted.setProjection(60.0f, 0.0f, 0.0f); } @@ -154,10 +158,10 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener private void setupScreen(int w, int h) { - mScreen = new DistortedBitmap(w,h,1); - mRoot = new DistortedNode(mScreen); + mScreen = new DistortedObject(w,h,1); + mRoot = new DistortedNode(mScreen,mQuad); - mCrawlBackground = new DistortedBitmap(w,(int)(Math.sqrt(3.0)*h),1); + mCrawlBackground = new DistortedObject(w,(int)(Math.sqrt(3.0)*h),1); int randomA, randomX, randomY, randomTime; float randomS, randomAlpha1, randomAlpha2; @@ -188,7 +192,7 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener mStars[i].alpha(di); - mRoot.attach(mStars[i]); + mRoot.attach(mStars[i], mQuad); } float scale = (0.5f*w/mGFFA.getWidth()); @@ -202,7 +206,7 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener mGFFA.scale( new Static3D(scale,scale,scale) ); mGFFA.alpha(di); - mRoot.attach(mGFFA); + mRoot.attach(mGFFA, mQuad); mGFFA.addEventListener(this); } @@ -240,7 +244,7 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener paint.setTypeface(tf); ///// create GFFA /////////////////// - mGFFA = new DistortedBitmap(GFFA_WIDTH, GFFA_HEIGHT, 1); + mGFFA = new DistortedObject(GFFA_WIDTH, GFFA_HEIGHT, 1); bitmapGFFA = Bitmap.createBitmap(GFFA_WIDTH,GFFA_HEIGHT,Bitmap.Config.ARGB_8888); bitmapGFFA.eraseColor(0x00000000); Canvas gffaCanvas = new Canvas(bitmapGFFA); @@ -250,13 +254,14 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener gffaCanvas.drawText(mGFFAString[i], 0, (i+1)*(FONT_HEIGHT+VERTICAL_SPACING), paint); } - mGFFA.setBitmap(bitmapGFFA); + mGFFA.setTexture(bitmapGFFA); ///// create Logo /////////////////// - mLogo = new DistortedBitmap(bitmapLogo, 1); - + mLogo = new DistortedObject(bitmapLogo.getWidth(),bitmapLogo.getHeight(),1); + mLogo.setTexture(bitmapLogo); + ///// create CRAWL ////////////////// - mCrawl = new DistortedBitmap(CRAWL_WIDTH, CRAWL_HEIGHT, 1); + mCrawl = new DistortedObject(CRAWL_WIDTH, CRAWL_HEIGHT, 1); bitmapText = Bitmap.createBitmap(CRAWL_WIDTH,CRAWL_HEIGHT,Bitmap.Config.ARGB_8888); bitmapText.eraseColor(0x00000000); Canvas textCanvas = new Canvas(bitmapText); @@ -267,17 +272,18 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener displayJustified(mCRAWLString[i], 0, (i+1)*(FONT_HEIGHT+VERTICAL_SPACING), CRAWL_WIDTH, textCanvas, paint); } - mCrawl.setBitmap(bitmapText); + mCrawl.setTexture(bitmapText); ///// create Stars /////////////////// - mStars = new DistortedBitmap[NUM_STARS]; - - mStars[0] = new DistortedBitmap(bitmapStar,1); + mStars = new DistortedObject[NUM_STARS]; + mStars[0] = new DistortedObject(bitmapStar.getWidth(),bitmapStar.getHeight(),1); + mStars[0].setTexture(bitmapStar); + for(int i=1; i