commit fe59d375cdbd1f77756d890244aa3dcac1137e3f Author: Leszek Koltunski Date: Fri Feb 10 16:11:57 2017 +0000 Change the the render() API! THis introduces some regressions with the Effects3D app. diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java index 70d07e7..3c1e242 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java @@ -27,7 +27,6 @@ import android.opengl.GLSurfaceView; import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; @@ -46,8 +45,6 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; private DistortedEffects mEffects; - private DistortedTexture mTexture; - private MeshFlat mMesh; private DistortedScreen mScreen; private AroundTheWorldEffectsManager mManager; private int mObjWidth, mObjHeight; @@ -78,7 +75,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -130,10 +127,13 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer mObjWidth = bitmap.getWidth(); mObjHeight= bitmap.getHeight(); - mTexture = new DistortedTexture(mObjWidth,mObjHeight); - mTexture.setTexture(bitmap); + DistortedTexture texture = new DistortedTexture(mObjWidth,mObjHeight); + texture.setTexture(bitmap); - mMesh = new MeshFlat(30,30*mObjHeight/mObjWidth); + MeshFlat mesh = new MeshFlat(30,30*mObjHeight/mObjWidth); + + mScreen.detachAll(); + mScreen.attach(texture, mEffects, mesh ); try { diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java index dd013c0..f648f61 100644 --- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java +++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java @@ -28,7 +28,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.EffectTypes; import org.distorted.library.Distorted; @@ -48,10 +47,8 @@ import android.opengl.GLSurfaceView; class BeanRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; - private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedScreen mScreen; - private MeshFlat mMesh; private int bmpHeight, bmpWidth; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -98,7 +95,7 @@ class BeanRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -152,9 +149,12 @@ class BeanRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mTexture = new DistortedTexture(bmpWidth,bmpHeight); - mTexture.setTexture(bitmap); - mMesh = new MeshFlat(25,25*bmpHeight/bmpWidth); + DistortedTexture texture = new DistortedTexture(bmpWidth,bmpHeight); + texture.setTexture(bitmap); + MeshFlat mesh = new MeshFlat(25,25*bmpHeight/bmpWidth); + + mScreen.detachAll(); + mScreen.attach(texture,mEffects,mesh); try { diff --git a/src/main/java/org/distorted/examples/blur/BlurRenderer.java b/src/main/java/org/distorted/examples/blur/BlurRenderer.java index faf9ab3..baa0c1d 100644 --- a/src/main/java/org/distorted/examples/blur/BlurRenderer.java +++ b/src/main/java/org/distorted/examples/blur/BlurRenderer.java @@ -27,7 +27,6 @@ import android.opengl.GLSurfaceView; import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.DistortedTexture; import org.distorted.library.EffectTypes; @@ -47,7 +46,6 @@ import javax.microedition.khronos.opengles.GL10; class BlurRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; - private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedScreen mScreen; private MeshFlat mMesh; @@ -84,7 +82,7 @@ class BlurRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -138,8 +136,11 @@ class BlurRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mTexture = new DistortedTexture(bmpWidth,bmpHeight); - mTexture.setTexture(bitmap); + DistortedTexture texture = new DistortedTexture(bmpWidth,bmpHeight); + texture.setTexture(bitmap); + + mScreen.detachAll(); + mScreen.attach(texture,mEffects,mMesh); try { @@ -147,7 +148,7 @@ class BlurRenderer implements GLSurfaceView.Renderer } catch(Exception ex) { - android.util.Log.e("Renderer", ex.getMessage() ); + android.util.Log.e("Blur", ex.getMessage() ); } } } diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java index cdde0d4..eeb8221 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java @@ -28,7 +28,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.DistortedTexture; import org.distorted.library.MeshFlat; @@ -50,7 +49,6 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; private DistortedEffects mEffects; - private DistortedTexture mTexture; private MeshFlat mMesh; private DistortedScreen mScreen; private int bmpHeight, bmpWidth; @@ -87,7 +85,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -115,8 +113,11 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mTexture = new DistortedTexture(bmpWidth,bmpHeight); - mTexture.setTexture(bitmap); + DistortedTexture texture = new DistortedTexture(bmpWidth,bmpHeight); + texture.setTexture(bitmap); + + mScreen.detachAll(); + mScreen.attach(texture,mEffects,mMesh); try { diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java index 9a8b8b2..407f7c0 100644 --- a/src/main/java/org/distorted/examples/check/CheckRenderer.java +++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java @@ -29,7 +29,6 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.DistortedTexture; import org.distorted.library.MeshFlat; @@ -57,9 +56,7 @@ class CheckRenderer implements GLSurfaceView.Renderer private static String compilationTitle; private GLSurfaceView mView; - private DistortedTexture mTexture; private DistortedEffects mEffects; - private MeshFlat mMesh; private DistortedScreen mScreen; private int bmpHeight, bmpWidth; @@ -83,7 +80,7 @@ class CheckRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -137,9 +134,12 @@ class CheckRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mTexture = new DistortedTexture(bmpWidth,bmpHeight); - mTexture.setTexture(bitmap); - mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); + DistortedTexture texture = new DistortedTexture(bmpWidth,bmpHeight); + texture.setTexture(bitmap); + MeshFlat mesh = new MeshFlat(30,30*bmpHeight/bmpWidth); + + mScreen.detachAll(); + mScreen.attach(texture,mEffects,mesh); // 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/CubesRenderer.java b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java index d161052..040ef0e 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java +++ b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java @@ -28,7 +28,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.DistortedTexture; import org.distorted.library.MeshObject; @@ -90,7 +89,7 @@ class CubesRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -144,7 +143,10 @@ class CubesRenderer implements GLSurfaceView.Renderer } mTexture.setTexture(bitmap); - + + mScreen.detachAll(); + mScreen.attach(mTexture,mEffects,mMesh); + try { Distorted.onCreate(mView.getContext()); diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java index ffa644d..aeb8e9a 100644 --- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -24,7 +24,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.DistortedTexture; import org.distorted.library.MeshObject; @@ -182,19 +181,16 @@ class DeformRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - - long time = System.currentTimeMillis(); - - mScreen.renderTo(stretchTexture, stretchMesh,stretchEffects,time); - + mPaint.setColor(0xffffffff); fpsCanvas.drawRect(0, 0, fpsW, fpsH, mPaint); mPaint.setColor(0xff000000); fpsCanvas.drawText(fpsString, fpsW/2, 5*fpsH/6, mPaint); - fpsTexture.setTexture(fpsBitmap); - mScreen.renderTo(fpsTexture, fpsMesh,fpsEffects,time); - + + long time = System.currentTimeMillis(); + + mScreen.render(time); computeFPS(time); } @@ -215,6 +211,10 @@ class DeformRenderer implements GLSurfaceView.Renderer stretchEffects.move( new Static3D(scrWidth/4,scrHeight/4,0) ); fpsEffects.move( new Static3D(5,5,0) ); bitmapCreated=true; + + mScreen.detachAll(); + mScreen.attach(stretchTexture,stretchEffects,stretchMesh); + mScreen.attach(fpsTexture,fpsEffects,fpsMesh); } else { diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java index f715cf7..040cc99 100644 --- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java @@ -28,7 +28,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.Distorted; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.DistortedTexture; import org.distorted.library.DistortedEffects; @@ -51,9 +50,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer private static final int NUM = 3; private GLSurfaceView mView; - private DistortedTexture[] mTexture; private DistortedEffects[] mEffects; - private MeshFlat mMesh; private DistortedScreen mScreen; private int bmpHeight, bmpWidth; @@ -109,10 +106,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - - long time = System.currentTimeMillis(); - - for(int i=NUM-1; i>=0; i--) mScreen.renderTo(mTexture[i], mMesh, mEffects[i], time); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -164,15 +158,18 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap0.getHeight(); bmpWidth = bitmap0.getWidth(); - mTexture = new DistortedTexture[NUM]; + DistortedTexture[] texture = new DistortedTexture[NUM]; for(int i=0; i=0; i--) mScreen.attach(texture[i], mEffects[i], mesh); try { diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java index 7078744..024f224 100644 --- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java @@ -29,7 +29,6 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; @@ -53,8 +52,6 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects[] mEffects; - private DistortedTexture mTexture; - private MeshFlat mMesh; private DistortedScreen mScreen; private int bmpHeight, bmpWidth; @@ -103,10 +100,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - - long time = System.currentTimeMillis(); - - for(int i=NUM-1; i>=0; i--) mScreen.renderTo(mTexture, mMesh, mEffects[i], time); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -170,10 +164,12 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); - mTexture = new DistortedTexture(bmpWidth,bmpHeight); + MeshFlat mesh = new MeshFlat(30,30*bmpHeight/bmpWidth); + DistortedTexture texture = new DistortedTexture(bmpWidth,bmpHeight); + texture.setTexture(bitmap); - mTexture.setTexture(bitmap); + mScreen.detachAll(); + for(int i=NUM-1; i>=0; i--) mScreen.attach(texture, mEffects[i], mesh); try { diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java index b96207b..335323e 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java @@ -30,7 +30,6 @@ import android.opengl.GLES30; import android.opengl.GLSurfaceView; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; @@ -61,10 +60,10 @@ class DynamicRenderer implements GLSurfaceView.Renderer mPaint.setColor(0xff447da7); mPaint.setStyle(Style.FILL); - mView = v; - mMesh = new MeshFlat(1,1); + mView = v; + mMesh = new MeshFlat(1,1); mEffects = new DistortedEffects(); - mScreen = new DistortedScreen(); + mScreen = new DistortedScreen(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -92,6 +91,8 @@ class DynamicRenderer implements GLSurfaceView.Renderer mBitmap = Bitmap.createBitmap(texW,texH, Bitmap.Config.ARGB_8888); mCanvas = new Canvas(mBitmap); + mScreen.detachAll(); + mScreen.attach(mTexture,mEffects,mMesh); mScreen.resize(texW,texH); mView.onSurfaceChanged(texW,texH); } @@ -107,7 +108,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer mCanvas.drawRect(0, 0, texW, texH, mPaint); mView.drawCurve(mCanvas,time); mTexture.setTexture(mBitmap); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java index 231a3ba..f3196f6 100644 --- a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java +++ b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java @@ -30,7 +30,6 @@ import android.opengl.GLES30; import android.opengl.GLSurfaceView; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; @@ -106,6 +105,9 @@ class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener } mTexture.setTexture(bitmap); + mScreen.detachAll(); + mScreen.attach(mTexture,mEffects,mMesh); + try { Distorted.onCreate(mView.getContext()); @@ -131,7 +133,7 @@ class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener public void onDrawFrame(GL10 glUnused) { GLES30.glClear(GLES30.GL_COLOR_BUFFER_BIT | GLES30.GL_DEPTH_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java index a2d4f0f..8a88c42 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java @@ -249,13 +249,6 @@ public class Effects3DActivity extends Activity mSupportsRegion = supports; } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static boolean supportsRegion() - { - return mSupportsRegion; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public static void setSupportsCenter(boolean supports) @@ -263,13 +256,6 @@ public class Effects3DActivity extends Activity mSupportsCenter = supports; } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static boolean supportsCenter() - { - return mSupportsCenter; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public Bitmap getBitmap() diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java index c4ba7aa..d42b75d 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java @@ -27,7 +27,7 @@ import android.opengl.GLSurfaceView; import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; +import org.distorted.library.DistortedNode; import org.distorted.library.DistortedScreen; import org.distorted.library.DistortedTexture; import org.distorted.library.MeshFlat; @@ -52,6 +52,7 @@ class Effects3DRenderer implements GLSurfaceView.Renderer private DistortedTexture mObjectTexture, mBackgroundTexture, mCenterTexture, mRegionTexture; private DistortedEffects mObjectEffects, mBackgroundEffects, mCenterEffects, mRegionEffects; private DistortedScreen mScreen; + private DistortedNode mCenterNode, mRegionNode; private MeshFlat mQuad; private MeshObject mObjectMesh; private int mObjWidth, mObjHeight, mObjDepth; @@ -111,7 +112,17 @@ class Effects3DRenderer implements GLSurfaceView.Renderer mRegionScalePoint = new Static3D(0,0,0); mRegionScaleInter.add(mRegionScalePoint); + mCenterNode = new DistortedNode(mCenterTexture, mCenterEffects, mQuad); + mRegionNode = new DistortedNode(mRegionTexture, mRegionEffects, mQuad); + mScreen = new DistortedScreen(); + mScreen.attach(mBackgroundTexture, mBackgroundEffects, mQuad ); + mScreen.attach(mObjectTexture , mObjectEffects , mObjectMesh); + + //if( Effects3DActivity.supportsCenter() ) + mScreen.attach(mCenterNode); + //if( Effects3DActivity.supportsRegion() ) + mScreen.attach(mRegionNode); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -135,17 +146,7 @@ class Effects3DRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - - long time = System.currentTimeMillis(); - - mScreen.renderTo(mBackgroundTexture,mQuad ,mBackgroundEffects,time); - mScreen.renderTo(mObjectTexture , mObjectMesh,mObjectEffects ,time); - - if( Effects3DActivity.supportsCenter() ) - { - mScreen.renderTo(mCenterTexture,mQuad,mCenterEffects, time); - if( Effects3DActivity.supportsRegion() ) mScreen.renderTo(mRegionTexture,mQuad,mRegionEffects,time); - } + mScreen.render(System.currentTimeMillis()); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/fbo/FBORenderer.java b/src/main/java/org/distorted/examples/fbo/FBORenderer.java index 55037ae..0ca7254 100644 --- a/src/main/java/org/distorted/examples/fbo/FBORenderer.java +++ b/src/main/java/org/distorted/examples/fbo/FBORenderer.java @@ -81,7 +81,7 @@ class FBORenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mRoot,System.currentTimeMillis()); + mScreen.render(System.currentTimeMillis()); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -152,6 +152,9 @@ class FBORenderer implements GLSurfaceView.Renderer mRoot = new DistortedNode(lisa, mEffects,new MeshFlat(1,1)); mRoot.attach(grid,gridEffects,new MeshCubes(10,10,false)); + mScreen.detachAll(); + mScreen.attach(mRoot); + float factor = lisaWidth/(2.0f*gridWidth); gridEffects.move( new Static3D( (lisaWidth-factor*gridWidth)/2,(lisaHeight-factor*gridHeight)/2,0) ); diff --git a/src/main/java/org/distorted/examples/flag/FlagRenderer.java b/src/main/java/org/distorted/examples/flag/FlagRenderer.java index 8ccf44b..b672951 100644 --- a/src/main/java/org/distorted/examples/flag/FlagRenderer.java +++ b/src/main/java/org/distorted/examples/flag/FlagRenderer.java @@ -27,7 +27,6 @@ import android.opengl.GLSurfaceView; import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.MeshCubes; import org.distorted.library.DistortedTexture; @@ -53,7 +52,6 @@ class FlagRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects; private DistortedTexture mTexture; private DistortedScreen mScreen; - private MeshCubes mMesh; private DynamicQuat mQuatInt1, mQuatInt2; private Dynamic5D mWaveDyn; private Static5D mWaveSta1, mWaveSta2; @@ -69,7 +67,6 @@ class FlagRenderer implements GLSurfaceView.Renderer mView = v; mEffects = new DistortedEffects(); - mMesh = new MeshCubes(50,30,false); mTexture = new DistortedTexture(500,300); mObjWidth = mTexture.getWidth(); @@ -98,6 +95,7 @@ class FlagRenderer implements GLSurfaceView.Renderer mEffects.wave(mWaveDyn, waveCenter, waveRegion); mScreen = new DistortedScreen(); + mScreen.attach(mTexture,mEffects, new MeshCubes(50,30,false) ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -144,7 +142,7 @@ class FlagRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/girl/GirlRenderer.java b/src/main/java/org/distorted/examples/girl/GirlRenderer.java index df34734..129d2b0 100644 --- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java +++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java @@ -28,7 +28,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.Distorted; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; @@ -50,10 +49,8 @@ import android.opengl.GLSurfaceView; class GirlRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; - private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedScreen mScreen; - private MeshFlat mMesh; private Static3D v0,v1,v2,v3; private Static1D dBegin, dMiddle, dEnd, s0; private int bmpHeight, bmpWidth; @@ -155,7 +152,7 @@ class GirlRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -209,9 +206,12 @@ class GirlRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); - mTexture = new DistortedTexture(bmpWidth,bmpHeight); - mTexture.setTexture(bitmap); + MeshFlat mesh = new MeshFlat(30,30*bmpHeight/bmpWidth); + DistortedTexture texture = new DistortedTexture(bmpWidth,bmpHeight); + texture.setTexture(bitmap); + + mScreen.detachAll(); + mScreen.attach(texture,mEffects,mesh); try { diff --git a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java index 6a7b271..d662528 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java +++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java @@ -29,7 +29,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.Distorted; -import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedScreen; import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; @@ -54,10 +53,8 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener private final int NUM_BUBBLES = 12; private GLSurfaceView mView; - private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedScreen mScreen; - private MeshFlat mMesh; private int bmpHeight, bmpWidth; private Random mRnd; @@ -107,7 +104,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener public void onDrawFrame(GL10 glUnused) { GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); + mScreen.render( System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -161,9 +158,12 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mMesh = new MeshFlat(50,50*bmpHeight/bmpWidth); - mTexture = new DistortedTexture(bmpWidth,bmpHeight); - mTexture.setTexture(bitmap); + MeshFlat mesh = new MeshFlat(50,50*bmpHeight/bmpWidth); + DistortedTexture texture = new DistortedTexture(bmpWidth,bmpHeight); + texture.setTexture(bitmap); + + mScreen.detachAll(); + mScreen.attach(texture,mEffects,mesh); for(int i=0; i