commit b01acdaf23a748afb4f9e24928bbb5f8a34807fa Author: Leszek Koltunski Date: Tue Jan 3 12:01:05 2017 +0000 Rename Grid to Mesh diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java index 5ddd058..52223c1 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java @@ -28,7 +28,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Static3D; @@ -46,7 +46,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects mEffects; private DistortedTexture mTexture; - private GridFlat mGrid; + private MeshFlat mMesh; private DistortedFramebuffer mScreen; private AroundTheWorldEffectsManager mManager; private int mObjWidth, mObjHeight; @@ -77,7 +77,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -132,7 +132,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer mTexture = new DistortedTexture(mObjWidth,mObjHeight); mTexture.setTexture(bitmap); - mGrid = new GridFlat(30,30*mObjHeight/mObjWidth); + mMesh = new MeshFlat(30,30*mObjHeight/mObjWidth); try { diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java index 654794b..7dbd68f 100644 --- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java +++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java @@ -32,7 +32,7 @@ import org.distorted.library.DistortedFramebuffer; import org.distorted.library.EffectTypes; import org.distorted.library.Distorted; import org.distorted.library.DistortedTexture; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -50,7 +50,7 @@ class BeanRenderer implements GLSurfaceView.Renderer private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedFramebuffer mScreen; - private GridFlat mGrid; + private MeshFlat mMesh; private int bmpHeight, bmpWidth; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -97,7 +97,7 @@ class BeanRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -153,7 +153,7 @@ class BeanRenderer implements GLSurfaceView.Renderer mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); - mGrid = new GridFlat(25,25*bmpHeight/bmpWidth); + mMesh = new MeshFlat(25,25*bmpHeight/bmpWidth); try { diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java index 1068382..20fda86 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java @@ -30,7 +30,7 @@ import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; @@ -50,7 +50,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects mEffects; private DistortedTexture mTexture; - private GridFlat mGrid; + private MeshFlat mMesh; private DistortedFramebuffer mScreen; private int bmpHeight, bmpWidth; @@ -60,7 +60,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer { mView = v; - mGrid = new GridFlat(1,1); // no vertex effects, grid can be a (1x1) quad. + mMesh = new MeshFlat(1,1); // no vertex effects, grid can be a (1x1) quad. mEffects = new DistortedEffects(); Static4D chromaRegion= new Static4D( 530, 200,100,100); @@ -86,7 +86,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java index 7cfa4ec..afec1a3 100644 --- a/src/main/java/org/distorted/examples/check/CheckRenderer.java +++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java @@ -31,7 +31,7 @@ import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; @@ -58,7 +58,7 @@ class CheckRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedTexture mTexture; private DistortedEffects mEffects; - private GridFlat mGrid; + private MeshFlat mMesh; private DistortedFramebuffer mScreen; private int bmpHeight, bmpWidth; @@ -82,7 +82,7 @@ class CheckRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -138,7 +138,7 @@ class CheckRenderer implements GLSurfaceView.Renderer mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); - mGrid = new GridFlat(30,30*bmpHeight/bmpWidth); + mMesh = new MeshFlat(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 2cdcf25..7e28e8e 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesActivity.java +++ b/src/main/java/org/distorted/examples/cubes/CubesActivity.java @@ -22,8 +22,8 @@ package org.distorted.examples.cubes; import org.distorted.library.Distorted; import org.distorted.examples.R; import org.distorted.library.DistortedTexture; -import org.distorted.library.GridObject; -import org.distorted.library.GridCubes; +import org.distorted.library.MeshObject; +import org.distorted.library.MeshCubes; import android.app.Activity; import android.opengl.GLSurfaceView; @@ -49,7 +49,7 @@ public class CubesActivity extends Activity implements View.OnClickListener private LinearLayout mLay; private boolean[] mShape; private DistortedTexture mTexture; - private GridObject mGrid; + private MeshObject mMesh; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -199,7 +199,7 @@ public class CubesActivity extends Activity implements View.OnClickListener for(int i=0; i=0; i--) mScreen.renderTo(mTexture[i], mGrid, mEffects[i], time); + for(int i=NUM-1; i>=0; i--) mScreen.renderTo(mTexture[i], mMesh, mEffects[i], time); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -171,7 +171,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer mTexture[1].setTexture(bitmap1); mTexture[2].setTexture(bitmap2); - mGrid = new GridFlat(30,30*bmpHeight/bmpWidth); + mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); try { diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java index 1767324..38cd389 100644 --- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java @@ -30,7 +30,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; @@ -53,7 +53,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects[] mEffects; private DistortedTexture mTexture; - private GridFlat mGrid; + private MeshFlat mMesh; private DistortedFramebuffer mScreen; private int bmpHeight, bmpWidth; @@ -105,7 +105,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer long time = System.currentTimeMillis(); - for(int i=NUM-1; i>=0; i--) mScreen.renderTo(mTexture, mGrid, mEffects[i], time); + for(int i=NUM-1; i>=0; i--) mScreen.renderTo(mTexture, mMesh, mEffects[i], time); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -169,7 +169,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mGrid = new GridFlat(30,30*bmpHeight/bmpWidth); + mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java index 97bec3a..8dc8110 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java @@ -31,7 +31,7 @@ import android.opengl.GLSurfaceView; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; import org.distorted.library.Distorted; @@ -43,7 +43,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedFramebuffer mScreen; - private GridFlat mGrid; + private MeshFlat mMesh; private Canvas mCanvas; private Bitmap mBitmap; private Paint mPaint; @@ -61,7 +61,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer mPaint.setStyle(Style.FILL); mView = v; - mGrid = new GridFlat(1,1); + mMesh = new MeshFlat(1,1); mEffects = new DistortedEffects(); mScreen = new DistortedFramebuffer(0); } @@ -106,7 +106,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer mCanvas.drawRect(0, 0, texW, texH, mPaint); mView.drawCurve(mCanvas,time); mTexture.setTexture(mBitmap); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, 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 964c021..747feb8 100644 --- a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java +++ b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java @@ -31,7 +31,7 @@ import android.opengl.GLSurfaceView; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; import org.distorted.library.Distorted; import org.distorted.library.EffectNames; @@ -53,7 +53,7 @@ class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener private int texWidth, texHeight; private DistortedTexture mTexture; - private GridFlat mGrid; + private MeshFlat mMesh; private DistortedEffects mEffects; private DistortedFramebuffer mScreen; @@ -71,7 +71,7 @@ class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener texWidth = BWID; texHeight= BHEI; - mGrid = new GridFlat(80,80*texHeight/texWidth); + mMesh = new MeshFlat(80,80*texHeight/texWidth); mTexture = new DistortedTexture(texWidth,texHeight); mEffects = new DistortedEffects(); @@ -130,7 +130,7 @@ class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener public void onDrawFrame(GL10 glUnused) { GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, 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 3d208ff..6e7302a 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java @@ -38,9 +38,9 @@ import android.widget.TableRow; import org.distorted.examples.R; import org.distorted.library.Distorted; -import org.distorted.library.GridFlat; -import org.distorted.library.GridCubes; -import org.distorted.library.GridObject; +import org.distorted.library.MeshCubes; +import org.distorted.library.MeshFlat; +import org.distorted.library.MeshObject; import org.distorted.library.DistortedTexture; import org.distorted.library.DistortedEffects; import org.distorted.library.EffectNames; @@ -69,7 +69,7 @@ public class Effects3DActivity extends Activity private boolean[] mShape; private DistortedTexture mTexture; private DistortedEffects mEffects; - private GridObject mGrid; + private MeshObject mMesh; private int mObjectType; private int mBitmapID; private Bitmap mBitmap; @@ -233,9 +233,9 @@ public class Effects3DActivity extends Activity /////////////////////////////////////////////////////////////////////////////////////////////////// - public GridObject getGrid() + public MeshObject getGrid() { - return mGrid; + return mMesh; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -412,7 +412,7 @@ public class Effects3DActivity extends Activity mEffects = new DistortedEffects(); mTexture= new DistortedTexture(w,h); - mGrid = new GridFlat(mNumCols,mNumCols*h/w); + mMesh = new MeshFlat(mNumCols,mNumCols*h/w); setEffectView(); } else @@ -443,7 +443,7 @@ public class Effects3DActivity extends Activity mEffects = new DistortedEffects(); mTexture= new DistortedTexture(mNumCols,mNumRows); - mGrid = new GridCubes(mNumCols, str, false); + mMesh = new MeshCubes(mNumCols, str, false); setEffectView(); } @@ -496,7 +496,7 @@ public class Effects3DActivity extends Activity public int getDepth() { - return mTexture==null ? 0: mTexture.getDepth(mGrid); + return mTexture==null ? 0: mTexture.getDepth(mMesh); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java index 5a5835f..a5ba2a7 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java @@ -29,8 +29,8 @@ import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.GridFlat; -import org.distorted.library.GridObject; +import org.distorted.library.MeshFlat; +import org.distorted.library.MeshObject; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.DynamicQuat; @@ -51,8 +51,8 @@ class Effects3DRenderer implements GLSurfaceView.Renderer private DistortedTexture mObjectTexture, mBackgroundTexture, mCenterTexture, mRegionTexture; private DistortedEffects mObjectEffects, mBackgroundEffects, mCenterEffects, mRegionEffects; private DistortedFramebuffer mScreen; - private GridFlat mQuad; - private GridObject mObjectGrid; + private MeshFlat mQuad; + private MeshObject mObjectMesh; private int mObjWidth, mObjHeight, mObjDepth; private DynamicQuat mQuatInt1, mQuatInt2; @@ -75,19 +75,19 @@ class Effects3DRenderer implements GLSurfaceView.Renderer Effects3DActivity act = (Effects3DActivity)v.getContext(); mObjectTexture = act.getTexture(); - mObjectGrid = act.getGrid(); + mObjectMesh = act.getGrid(); mObjectEffects = act.getEffects(); mBackgroundTexture = new DistortedTexture(100,100); mCenterTexture = new DistortedTexture(100,100); mRegionTexture = new DistortedTexture(100,100); - mQuad = new GridFlat(1,1); + mQuad = new MeshFlat(1,1); mBackgroundEffects = new DistortedEffects(); mCenterEffects = new DistortedEffects(); mRegionEffects = new DistortedEffects(); mObjWidth = mObjectTexture.getWidth(); mObjHeight= mObjectTexture.getHeight(); - mObjDepth = mObjectTexture.getDepth(mObjectGrid); + mObjDepth = mObjectTexture.getDepth(mObjectMesh); mQuat1 = new Static4D(0,0,0,1); // unity mQuat2 = new Static4D(0,0,0,1); // quaternions @@ -138,7 +138,7 @@ class Effects3DRenderer implements GLSurfaceView.Renderer long time = System.currentTimeMillis(); mScreen.renderTo(mBackgroundTexture,mQuad ,mBackgroundEffects,time); - mScreen.renderTo(mObjectTexture ,mObjectGrid,mObjectEffects ,time); + mScreen.renderTo(mObjectTexture , mObjectMesh,mObjectEffects ,time); if( Effects3DActivity.supportsCenter() ) { diff --git a/src/main/java/org/distorted/examples/fbo/FBORenderer.java b/src/main/java/org/distorted/examples/fbo/FBORenderer.java index f307aa7..569fcdf 100644 --- a/src/main/java/org/distorted/examples/fbo/FBORenderer.java +++ b/src/main/java/org/distorted/examples/fbo/FBORenderer.java @@ -31,8 +31,8 @@ import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTree; import org.distorted.library.Distorted; -import org.distorted.library.GridCubes; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshCubes; +import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic; @@ -137,8 +137,8 @@ class FBORenderer implements GLSurfaceView.Renderer mEffects.abortAllEffects(); - mRoot = new DistortedTree(lisa, mEffects,new GridFlat(1,1)); - mRoot.attach(text,textEffects,new GridCubes(20,5,false)); + mRoot = new DistortedTree(lisa, mEffects,new MeshFlat(1,1)); + mRoot.attach(text,textEffects,new MeshCubes(20,5,false)); float factor = lisaWidth/(2.0f*textWidth); diff --git a/src/main/java/org/distorted/examples/flag/FlagRenderer.java b/src/main/java/org/distorted/examples/flag/FlagRenderer.java index 4f653dd..3c2fc50 100644 --- a/src/main/java/org/distorted/examples/flag/FlagRenderer.java +++ b/src/main/java/org/distorted/examples/flag/FlagRenderer.java @@ -28,7 +28,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.GridCubes; +import org.distorted.library.MeshCubes; import org.distorted.library.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic; @@ -52,7 +52,7 @@ class FlagRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects; private DistortedTexture mTexture; private DistortedFramebuffer mScreen; - private GridCubes mGrid; + private MeshCubes mMesh; private DynamicQuat mQuatInt1, mQuatInt2; private Dynamic5D mWaveDyn; private Static5D mWaveSta1, mWaveSta2; @@ -68,7 +68,7 @@ class FlagRenderer implements GLSurfaceView.Renderer mView = v; mEffects = new DistortedEffects(); - mGrid = new GridCubes(50,30,false); + mMesh = new MeshCubes(50,30,false); mTexture = new DistortedTexture(500,300); mObjWidth = mTexture.getWidth(); @@ -143,7 +143,7 @@ class FlagRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, 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 7f10098..65bd8d0 100644 --- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java +++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java @@ -29,7 +29,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; import org.distorted.library.DistortedEffects; import org.distorted.library.EffectTypes; @@ -52,7 +52,7 @@ class GirlRenderer implements GLSurfaceView.Renderer private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedFramebuffer mScreen; - private GridFlat mGrid; + private MeshFlat mMesh; private Static3D v0,v1,v2,v3; private Static1D dBegin, dMiddle, dEnd, s0; private int bmpHeight, bmpWidth; @@ -154,7 +154,7 @@ class GirlRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -208,7 +208,7 @@ class GirlRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mGrid = new GridFlat(30,30*bmpHeight/bmpWidth); + mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); diff --git a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java index cd62070..c7044d4 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java +++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java @@ -30,7 +30,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.DistortedTexture; import org.distorted.library.DistortedEffects; import org.distorted.library.EffectNames; @@ -56,7 +56,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedFramebuffer mScreen; - private GridFlat mGrid; + private MeshFlat mMesh; private int bmpHeight, bmpWidth; private Random mRnd; @@ -106,7 +106,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -160,7 +160,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mGrid = new GridFlat(50,50*bmpHeight/bmpWidth); + mMesh = new MeshFlat(50,50*bmpHeight/bmpWidth); mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java index 4181c61..d645b5b 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java @@ -33,8 +33,8 @@ import android.widget.Spinner; import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; -import org.distorted.library.GridObject; -import org.distorted.library.GridCubes; +import org.distorted.library.MeshCubes; +import org.distorted.library.MeshObject; import org.distorted.library.DistortedTexture; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; @@ -48,7 +48,7 @@ import java.util.ArrayList; public class Matrix3DActivity extends Activity implements AdapterView.OnItemSelectedListener { private DistortedTexture mTexture; - private GridObject mGrid; + private MeshObject mMesh; private DistortedEffects mEffects; private ArrayList mList; @@ -70,7 +70,7 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele createEffectNames(); mEffects = new DistortedEffects(); - mGrid = new GridCubes(1,1,false); + mMesh = new MeshCubes(1,1,false); mTexture= new DistortedTexture(100,100); setEffectView(); @@ -116,9 +116,9 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele /////////////////////////////////////////////////////////////////////////////////////////////////// - public GridObject getGrid() + public MeshObject getGrid() { - return mGrid; + return mMesh; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -191,7 +191,7 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele public int getDepth() { - return mTexture==null ? 0: mTexture.getDepth(mGrid); + return mTexture==null ? 0: mTexture.getDepth(mMesh); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java index bb465d8..85c15d0 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java @@ -25,7 +25,7 @@ import android.opengl.GLSurfaceView; import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.GridObject; +import org.distorted.library.MeshObject; import org.distorted.library.DistortedTexture; import javax.microedition.khronos.egl.EGLConfig; @@ -39,7 +39,7 @@ class Matrix3DRenderer implements GLSurfaceView.Renderer private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedFramebuffer mScreen; - private GridObject mGrid; + private MeshObject mMesh; private int mWidth, mHeight; @@ -53,7 +53,7 @@ class Matrix3DRenderer implements GLSurfaceView.Renderer mEffects= act.getEffects(); mTexture= act.getTexture(); - mGrid = act.getGrid(); + mMesh = act.getGrid(); mScreen = new DistortedFramebuffer(0); } @@ -62,7 +62,7 @@ class Matrix3DRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java index 425fbde..fbc29ba 100644 --- a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java +++ b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java @@ -29,7 +29,7 @@ import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; @@ -56,7 +56,7 @@ class MirrorRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffectsOffscreen1, mEffectsOffscreen2; private DistortedTexture mTextureMirror, mTextureHead; private DistortedFramebuffer mScreen, mOffScreen1, mOffScreen2; - private GridFlat mQuad; + private MeshFlat mQuad; private Static3D mHeadPosition; private Dynamic3D mHeadDyn; private int mX; @@ -69,7 +69,7 @@ class MirrorRenderer implements GLSurfaceView.Renderer MirrorRenderer(GLSurfaceView view) { mView = view; - mQuad = new GridFlat(1,1); + mQuad = new MeshFlat(1,1); mScreen = new DistortedFramebuffer(0); mEffectsMirror = new DistortedEffects(); diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java index 4721e51..e864200 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java @@ -30,7 +30,7 @@ import org.distorted.library.Distorted; import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; @@ -49,7 +49,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedFramebuffer mScreen; - private GridFlat mGrid; + private MeshFlat mMesh; private int bmpHeight, bmpWidth; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -82,7 +82,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer public void onDrawFrame(GL10 glUnused) { GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); - mScreen.renderTo(mTexture, mGrid, mEffects, System.currentTimeMillis() ); + mScreen.renderTo(mTexture, mMesh, mEffects, System.currentTimeMillis() ); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -134,7 +134,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - mGrid = new GridFlat(9,9*bmpHeight/bmpWidth); + mMesh = new MeshFlat(9,9*bmpHeight/bmpWidth); mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java index 08438be..c3ced87 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java @@ -32,7 +32,7 @@ import android.opengl.GLSurfaceView; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTexture; import org.distorted.library.DistortedEffects; -import org.distorted.library.GridFlat; +import org.distorted.library.MeshFlat; import org.distorted.library.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -45,7 +45,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer private Paint mPaint; private int texW, texH; - private GridFlat mGrid; + private MeshFlat mMesh; private DistortedEffects mEffects; private DistortedTexture mTexture; private DistortedFramebuffer mScreen; @@ -126,7 +126,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer texW = width; texH = height; - mGrid = new GridFlat(80,80*texH/texW); + mMesh = new MeshFlat(80,80*texH/texW); mTexture = new DistortedTexture(texW,texH); mBitmap = Bitmap.createBitmap(texW,texH, Bitmap.Config.ARGB_8888); mCanvas = new Canvas(mBitmap); @@ -153,7 +153,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer mRefresh = false; } - mScreen.renderTo(mTexture, mGrid, mEffects, time ); + mScreen.renderTo(mTexture, mMesh, mEffects, time ); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java index d90f945..13ea7e4 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java @@ -31,11 +31,11 @@ import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTree; import org.distorted.library.EffectTypes; +import org.distorted.library.MeshFlat; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static1D; import org.distorted.library.Distorted; -import org.distorted.library.GridFlat; import org.distorted.library.DistortedTexture; import android.graphics.Bitmap; @@ -64,12 +64,12 @@ class OlimpicRenderer implements GLSurfaceView.Renderer mView = v; mLeaf = new DistortedTexture(LEAF_SIZE,LEAF_SIZE); - GridFlat grid = new GridFlat(1,1); + MeshFlat mesh = new MeshFlat(1,1); DistortedEffects effects = new DistortedEffects(); mScreenW = 9*LEAF_SIZE; mScreenH = 9*LEAF_SIZE; - mRoot = new DistortedTree(new DistortedTexture(mScreenW,mScreenH), effects, grid); + mRoot = new DistortedTree(new DistortedTexture(mScreenW,mScreenH), effects, mesh); Dynamic1D rot = new Dynamic1D(5000,0.0f); rot.setMode(Dynamic1D.MODE_JUMP); @@ -90,12 +90,12 @@ class OlimpicRenderer implements GLSurfaceView.Renderer if( i<=1 ) { effects = new DistortedEffects(); - mCircleNode[i] = new DistortedTree(new DistortedTexture(3*LEAF_SIZE,3*LEAF_SIZE), effects, grid); + mCircleNode[i] = new DistortedTree(new DistortedTexture(3*LEAF_SIZE,3*LEAF_SIZE), effects, mesh); for(int j=0; j