commit f3ca895f30702a6aa7ed2d981bbe6b0b11e2c245 Author: Leszek Koltunski Date: Fri Feb 21 11:27:50 2020 +0000 Rename MeshFlat MeshRectangles. diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java index f855af7..a06e7ca 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java @@ -36,7 +36,7 @@ import org.distorted.library.effect.VertexEffectSwirl; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Static3D; @@ -54,7 +54,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects; private DistortedTexture mTexture; private DistortedScreen mScreen; - private MeshFlat mMesh; + private MeshRectangles mMesh; private AroundTheWorldEffectsManager mManager; private int mObjWidth, mObjHeight; private Static3D mMove, mScale; @@ -139,7 +139,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer if( mTexture==null ) mTexture = new DistortedTexture(mObjWidth,mObjHeight); mTexture.setTexture(bitmap); - if( mMesh==null ) mMesh = new MeshFlat(30,30*mObjHeight/mObjWidth); + if( mMesh==null ) mMesh = new MeshRectangles(30,30*mObjHeight/mObjWidth); mScreen.detachAll(); mScreen.attach(mTexture, mEffects, mMesh); diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java index 6948df7..6b77219 100644 --- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java +++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java @@ -34,7 +34,7 @@ import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -51,7 +51,7 @@ class BeanRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects; private DistortedScreen mScreen; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private int mObjHeight, mObjWidth; private Static3D mMove, mScale; @@ -151,7 +151,7 @@ class BeanRenderer implements GLSurfaceView.Renderer if( mTexture==null ) mTexture = new DistortedTexture(mObjWidth,mObjHeight); mTexture.setTexture(bitmap); - if( mMesh==null ) mMesh = new MeshFlat(25,25*mObjHeight/mObjWidth); + if( mMesh==null ) mMesh = new MeshRectangles(25,25*mObjHeight/mObjWidth); mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); diff --git a/src/main/java/org/distorted/examples/blur/BlurRenderer.java b/src/main/java/org/distorted/examples/blur/BlurRenderer.java index 5f00ebb..cda7cfe 100644 --- a/src/main/java/org/distorted/examples/blur/BlurRenderer.java +++ b/src/main/java/org/distorted/examples/blur/BlurRenderer.java @@ -33,7 +33,7 @@ import org.distorted.library.main.DistortedFramebuffer; import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; @@ -55,7 +55,7 @@ class BlurRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects, mBufferEffects; private DistortedScreen mScreen; private DistortedFramebuffer mBuffer; - private MeshFlat mMesh; + private MeshRectangles mMesh; private Static1D mRadiusSta; private int mObjHeight, mObjWidth; private Static3D mMove, mScale, mBufferMove, mBufferScale; @@ -65,7 +65,7 @@ class BlurRenderer implements GLSurfaceView.Renderer BlurRenderer(GLSurfaceView v) { mView = v; - mMesh = new MeshFlat(1,1); + mMesh = new MeshRectangles(1,1); mScreen = new DistortedScreen(); mBuffer = new DistortedFramebuffer(SIZE,SIZE,1, DistortedFramebuffer.NO_DEPTH_NO_STENCIL); diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java index e959dd3..2c17811 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java @@ -35,7 +35,7 @@ import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; @@ -53,7 +53,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects mEffects; - private MeshFlat mMesh; + private MeshRectangles mMesh; private DistortedTexture mTexture; private DistortedScreen mScreen; private int mObjHeight, mObjWidth; @@ -65,7 +65,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer { mView = v; - mMesh = new MeshFlat(1,1); // no vertex effects, grid can be a (1x1) quad. + mMesh = new MeshRectangles(1,1); // no vertex effects, grid can be a (1x1) quad. Dynamic3D moveDyn= new Dynamic3D(DURATION,0.0f); mRotate = new Static3D(0,0,0); diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java index c9e7199..247ef98 100644 --- a/src/main/java/org/distorted/examples/check/CheckRenderer.java +++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java @@ -37,7 +37,7 @@ import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; @@ -63,7 +63,7 @@ class CheckRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects mEffects; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private DistortedScreen mScreen; private int mObjHeight, mObjWidth; private Static3D mMove, mScale, mCenter; @@ -184,7 +184,7 @@ class CheckRenderer implements GLSurfaceView.Renderer if( mTexture==null ) mTexture = new DistortedTexture(mObjWidth,mObjHeight); mTexture.setTexture(bitmap); - if( mMesh==null ) mMesh = new MeshFlat(30,30*mObjHeight/mObjWidth); + if( mMesh==null ) mMesh = new MeshRectangles(30,30*mObjHeight/mObjWidth); mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java index b5c7fe8..f2b08e9 100644 --- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -32,7 +32,7 @@ import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshBase; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.message.EffectListener; import org.distorted.library.type.Dynamic3D; @@ -193,7 +193,7 @@ class DeformRenderer implements GLSurfaceView.Renderer , EffectListener if( mMesh!=null ) mMesh.markForDeletion(); - mMesh = new MeshFlat(50,50*h/w); + mMesh = new MeshRectangles(50,50*h/w); Bitmap stretchBitmap = Bitmap.createBitmap(w,h, Bitmap.Config.ARGB_8888); stretchCanvas = new Canvas(stretchBitmap); diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java index 5e7fd0d..ec726d5 100644 --- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java @@ -35,7 +35,7 @@ import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.DistortedEffects; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; @@ -54,7 +54,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects[] mEffects; private DistortedTexture[] mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private DistortedScreen mScreen; private int bmpHeight, bmpWidth; private Static3D mScale; @@ -186,7 +186,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer mTexture[1].setTexture(bitmap1); mTexture[2].setTexture(bitmap2); - if( mMesh==null ) mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); + if( mMesh==null ) mMesh = new MeshRectangles(30,30*bmpHeight/bmpWidth); mScreen.detachAll(); for(int i=NUM-1; i>=0; i--) mScreen.attach(mTexture[i], mEffects[i], mMesh); diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java index 12b5ac8..f041ced 100644 --- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java @@ -35,7 +35,7 @@ import org.distorted.library.effect.VertexEffectSink; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; @@ -56,7 +56,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects[] mEffects; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private DistortedScreen mScreen; private int bmpHeight, bmpWidth; private Static3D mScale; @@ -173,7 +173,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - if( mMesh==null ) mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); + if( mMesh==null ) mMesh = new MeshRectangles(30,30*bmpHeight/bmpWidth); if( mTexture==null ) 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 858276d..9943207 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java @@ -30,7 +30,7 @@ import android.opengl.GLSurfaceView; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.DistortedLibrary; @@ -42,7 +42,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer private DistortedTexture mTexture; private DistortedEffects mEffects; private DistortedScreen mScreen; - private MeshFlat mMesh; + private MeshRectangles mMesh; private Canvas mCanvas; private Bitmap mBitmap; private Paint mPaint; @@ -60,7 +60,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer mPaint.setStyle(Style.FILL); mView = v; - mMesh = new MeshFlat(1,1); + mMesh = new MeshRectangles(1,1); mEffects = new DistortedEffects(); mScreen = new DistortedScreen(); } diff --git a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java index 6cf4ef2..24e7e4d 100644 --- a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java +++ b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java @@ -37,7 +37,7 @@ import org.distorted.library.effect.VertexEffectSink; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.message.EffectListener; import org.distorted.library.type.Static3D; @@ -57,7 +57,7 @@ class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener private Static3D mScale; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private DistortedEffects mEffects; private DistortedScreen mScreen; @@ -77,7 +77,7 @@ class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener mScale = new Static3D(1,1,1); MatrixEffectScale scaleEffect = new MatrixEffectScale(mScale); - mMesh = new MeshFlat(MESH_QUALITY,MESH_QUALITY*texHeight/texWidth); + mMesh = new MeshRectangles(MESH_QUALITY,MESH_QUALITY*texHeight/texWidth); mTexture = new DistortedTexture(texWidth,texHeight); mEffects = new DistortedEffects(); mEffects.apply(scaleEffect); diff --git a/src/main/java/org/distorted/examples/generic/GenericActivity2.java b/src/main/java/org/distorted/examples/generic/GenericActivity2.java index 0e9b092..047bdfb 100644 --- a/src/main/java/org/distorted/examples/generic/GenericActivity2.java +++ b/src/main/java/org/distorted/examples/generic/GenericActivity2.java @@ -35,7 +35,7 @@ import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshCubes; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.mesh.MeshBase; import org.distorted.library.mesh.MeshQuad; import org.distorted.library.mesh.MeshSphere; @@ -99,7 +99,7 @@ public class GenericActivity2 extends AppCompatActivity mMesh = new MeshCubes(numCols, str, numSlic, mapFB, mapFB, mapLR, mapLR, mapTB, mapTB); } break; - case 1: mMesh = new MeshFlat(numCols,numRows); + case 1: mMesh = new MeshRectangles(numCols,numRows); break; case 2: mMesh = new MeshSphere(numRows); break; diff --git a/src/main/java/org/distorted/examples/generic/GenericRenderer.java b/src/main/java/org/distorted/examples/generic/GenericRenderer.java index ed8b618..e68fbe9 100644 --- a/src/main/java/org/distorted/examples/generic/GenericRenderer.java +++ b/src/main/java/org/distorted/examples/generic/GenericRenderer.java @@ -35,7 +35,7 @@ import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshBase; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.mesh.MeshSphere; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -99,7 +99,7 @@ class GenericRenderer implements GLSurfaceView.Renderer DistortedEffects regionEffects = new DistortedEffects(); MeshBase mesh = act.getMesh(); - MeshFlat quad = new MeshFlat(1,1); + MeshRectangles quad = new MeshRectangles(1,1); mFactor = mesh instanceof MeshSphere ? 1.0f : 0.7f; diff --git a/src/main/java/org/distorted/examples/girl/GirlRenderer.java b/src/main/java/org/distorted/examples/girl/GirlRenderer.java index 5ab1003..4764d71 100644 --- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java +++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java @@ -34,7 +34,7 @@ import org.distorted.library.effect.VertexEffectSink; import org.distorted.library.effect.VertexEffectSwirl; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.DistortedEffects; import org.distorted.library.type.Dynamic1D; @@ -55,7 +55,7 @@ class GirlRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects; private DistortedScreen mScreen; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private Static3D v0,v1,v2,v3; private Static1D dBegin, dMiddle, dEnd, s0; private int bmpHeight, bmpWidth; @@ -213,7 +213,7 @@ class GirlRenderer implements GLSurfaceView.Renderer if( mTexture==null ) mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); - if( mMesh==null ) mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); + if( mMesh==null ) mMesh = new MeshRectangles(30,30*bmpHeight/bmpWidth); mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); diff --git a/src/main/java/org/distorted/examples/glow/GlowRenderer.java b/src/main/java/org/distorted/examples/glow/GlowRenderer.java index 9b7077c..8239345 100644 --- a/src/main/java/org/distorted/examples/glow/GlowRenderer.java +++ b/src/main/java/org/distorted/examples/glow/GlowRenderer.java @@ -32,7 +32,7 @@ import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -80,7 +80,7 @@ class GlowRenderer implements GLSurfaceView.Renderer effects.apply(mGlow); mScreen = new DistortedScreen(); - mScreen.attach(mLeaf, effects, new MeshFlat(1,1) ); + mScreen.attach(mLeaf, effects, new MeshRectangles(1,1) ); mScreen.glClearColor(1.0f, 1.0f, 1.0f, 1.0f); mScreen.showFPS(); } diff --git a/src/main/java/org/distorted/examples/inflate/InflateActivity2.java b/src/main/java/org/distorted/examples/inflate/InflateActivity2.java index a79b25a..517902c 100644 --- a/src/main/java/org/distorted/examples/inflate/InflateActivity2.java +++ b/src/main/java/org/distorted/examples/inflate/InflateActivity2.java @@ -24,7 +24,7 @@ import org.distorted.examples.R; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshBase; import org.distorted.library.mesh.MeshCubes; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.mesh.MeshQuad; import org.distorted.library.mesh.MeshSphere; import org.distorted.library.type.Static4D; @@ -122,7 +122,7 @@ public class InflateActivity2 extends Activity implements SeekBar.OnSeekBarChang mMesh = new MeshCubes(numCols, str, numSlic, mapFB, mapFB, mapLR, mapLR, mapTB, mapTB); } break; - case 1: mMesh = new MeshFlat(numCols,numRows); + case 1: mMesh = new MeshRectangles(numCols,numRows); break; case 2: mMesh = new MeshSphere(numRows); break; diff --git a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java index afbaee1..103595d 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java +++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java @@ -34,7 +34,7 @@ import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.effect.VertexEffectDistort; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.DistortedEffects; import org.distorted.library.type.Dynamic3D; @@ -56,7 +56,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener private DistortedEffects mEffects; private DistortedScreen mScreen; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private int bmpHeight, bmpWidth; private Random mRnd; private Static3D mMove, mScale; @@ -165,7 +165,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener if( mTexture==null ) mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); - if( mMesh==null ) mMesh = new MeshFlat(50,50*bmpHeight/bmpWidth); + if( mMesh==null ) mMesh = new MeshRectangles(50,50*bmpHeight/bmpWidth); mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); diff --git a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java index f56d01b..5c553d2 100644 --- a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java +++ b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java @@ -32,7 +32,7 @@ import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedFramebuffer; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; @@ -60,7 +60,7 @@ class MirrorRenderer implements GLSurfaceView.Renderer private DistortedTexture mTextureMirror, mTextureHead; private DistortedFramebuffer mOffScreen1, mOffScreen2; private DistortedScreen mScreen; - private MeshFlat mQuad; + private MeshRectangles mQuad; private Static3D mHeadPosition, mScaleMirror, mMoveOffscreen2, mScaleHead; private int mX; @@ -72,7 +72,7 @@ class MirrorRenderer implements GLSurfaceView.Renderer MirrorRenderer(GLSurfaceView view) { mView = view; - mQuad = new MeshFlat(1,1); + mQuad = new MeshRectangles(1,1); mScreen = new DistortedScreen(); 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 b1fb0d2..26e94b1 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java @@ -33,7 +33,7 @@ import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -49,7 +49,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects mEffects; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private DistortedScreen mScreen; private int bmpHeight, bmpWidth; private Static3D mMove, mScale; @@ -156,7 +156,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer if( mTexture==null ) mTexture = new DistortedTexture(bmpWidth,bmpHeight); // likewise the Mesh - if( mMesh==null ) mMesh = new MeshFlat(9,9*bmpHeight/bmpWidth); + if( mMesh==null ) mMesh = new MeshRectangles(9,9*bmpHeight/bmpWidth); // even if mTexture wasn't null, we still need to call setTexture() on it // because every time activity goes to background, its OpenGL resources diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java index 0f27443..ccbb365 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java @@ -37,7 +37,7 @@ import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.DistortedEffects; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -52,7 +52,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects; private DistortedTexture mTexture; private DistortedScreen mScreen; - private MeshFlat mMesh; + private MeshRectangles mMesh; private boolean mRefresh; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -142,7 +142,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer mCanvas = new Canvas(mBitmap); if( mMesh!=null ) mMesh.markForDeletion(); - mMesh = new MeshFlat(80,80*texH/texW); + mMesh = new MeshRectangles(80,80*texH/texW); mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); diff --git a/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java b/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java index 51c7d4d..0748427 100644 --- a/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java +++ b/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java @@ -35,7 +35,7 @@ import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshBase; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.message.EffectListener; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic4D; @@ -78,7 +78,7 @@ class MovingGlowRenderer implements GLSurfaceView.Renderer,EffectListener mLeaf = new DistortedTexture(LEAF_SIZE,LEAF_SIZE); DistortedTexture surface = new DistortedTexture(mRootW,mRootH); - MeshBase mesh = new MeshFlat(1,1); + MeshBase mesh = new MeshRectangles(1,1); DistortedNode root = new DistortedNode(surface, new DistortedEffects(), mesh); diff --git a/src/main/java/org/distorted/examples/objecttree/ObjectTreeRenderer.java b/src/main/java/org/distorted/examples/objecttree/ObjectTreeRenderer.java index e86edb3..5bd622f 100644 --- a/src/main/java/org/distorted/examples/objecttree/ObjectTreeRenderer.java +++ b/src/main/java/org/distorted/examples/objecttree/ObjectTreeRenderer.java @@ -38,7 +38,7 @@ import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.mesh.MeshCubes; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic; import org.distorted.library.type.Dynamic1D; @@ -60,7 +60,7 @@ class ObjectTreeRenderer implements GLSurfaceView.Renderer private DistortedTexture mLisaTexture, mGridTexture; private DistortedScreen mScreen; private DistortedNode mRoot; - private MeshFlat mMeshFlat; + private MeshRectangles mMeshRectangles; private MeshCubes mMeshCubes; private int lisaHeight, lisaWidth; private boolean mDepth; @@ -186,12 +186,12 @@ class ObjectTreeRenderer implements GLSurfaceView.Renderer final Static4D mapLR = new Static4D(0.0f,0.0f,1.0f/GRID,1.0f ); final Static4D mapTB = new Static4D(0.0f,0.0f,1.0f ,1.0f/GRID); - if( mMeshFlat==null ) mMeshFlat = new MeshFlat(1,1); + if( mMeshRectangles ==null ) mMeshRectangles = new MeshRectangles(1,1); if( mMeshCubes==null) mMeshCubes= new MeshCubes(GRID,GRID,1, mapFB, mapFB, mapLR, mapLR, mapTB, mapTB); int gridDepth = mGridTexture.getDepth(mMeshCubes); - mRoot = new DistortedNode(mLisaTexture, mEffects, mMeshFlat); + mRoot = new DistortedNode(mLisaTexture, mEffects, mMeshRectangles); mRoot.attach(mGridTexture,gridEffects,mMeshCubes); setDepthPriv(); diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java index 9d27793..bf8fb7b 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java @@ -35,7 +35,7 @@ import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedNode; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static1D; @@ -57,7 +57,7 @@ class OlimpicRenderer implements GLSurfaceView.Renderer private DistortedNode mRoot; private DistortedTexture mLeaf; private DistortedScreen mScreen; - private MeshFlat mMesh; + private MeshRectangles mMesh; private int mScreenW, mScreenH; private int mPrevRendered, mCurrRendered; private Static3D mMove, mScale; @@ -95,7 +95,7 @@ class OlimpicRenderer implements GLSurfaceView.Renderer mLeaf = new DistortedTexture(LEAF_SIZE,LEAF_SIZE); DistortedTexture surface = new DistortedTexture(3*LEAF_SIZE,3*LEAF_SIZE); - mMesh = new MeshFlat(1,1); + mMesh = new MeshRectangles(1,1); mMove = new Static3D(0,0,0); mScale= new Static3D(1,1,1); diff --git a/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java b/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java index 17f153f..cee2a99 100644 --- a/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java +++ b/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java @@ -36,7 +36,7 @@ import org.distorted.library.effect.VertexEffectDistort; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; @@ -66,7 +66,7 @@ class RenderThread extends Thread private DistortedEffects mEffects; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private DistortedScreen mScreen; private int bmpHeight, bmpWidth; private SurfaceView mView; @@ -265,7 +265,7 @@ class RenderThread extends Thread if( mTexture==null ) mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bmp); - if( mMesh==null ) mMesh = new MeshFlat(9,9*bmpHeight/bmpWidth); + if( mMesh==null ) mMesh = new MeshRectangles(9,9*bmpHeight/bmpWidth); mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); diff --git a/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java b/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java index 4ea30c2..aea5d9b 100644 --- a/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java +++ b/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java @@ -34,7 +34,7 @@ import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; @@ -78,7 +78,7 @@ class PostprocessTreeRenderer implements GLSurfaceView.Renderer mLeaf = new DistortedTexture(LEAF_SIZE,LEAF_SIZE); - MeshFlat mesh = new MeshFlat(1,1); + MeshRectangles mesh = new MeshRectangles(1,1); mMove = new Static3D(0,0,0); mScale= new Static3D(1,1,1); diff --git a/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java b/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java index 9acbf3f..b49c9dc 100644 --- a/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java +++ b/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java @@ -26,7 +26,7 @@ import org.distorted.library.effect.VertexEffectDeform; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -44,7 +44,7 @@ class ProjectionRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedEffects mEffects; private DistortedScreen mScreen; - private MeshFlat mMesh; + private MeshRectangles mMesh; private DistortedTexture mTexture; private float mF, mNear; @@ -140,7 +140,7 @@ class ProjectionRenderer implements GLSurfaceView.Renderer // likewise with the Mesh if( mMesh!=null ) mMesh.markForDeletion(); - mMesh = new MeshFlat(100,100*height/width); + mMesh = new MeshRectangles(100,100*height/width); mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); diff --git a/src/main/java/org/distorted/examples/save/SaveRenderer.java b/src/main/java/org/distorted/examples/save/SaveRenderer.java index 10b8048..62c3234 100644 --- a/src/main/java/org/distorted/examples/save/SaveRenderer.java +++ b/src/main/java/org/distorted/examples/save/SaveRenderer.java @@ -37,7 +37,7 @@ import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedFramebuffer; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; @@ -58,7 +58,7 @@ class SaveRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects; private DistortedFramebuffer mOffscreen; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private DistortedScreen mScreen; private Static1D s0; private Static3D mScaleFactor, mScaleMain, mMove; @@ -245,7 +245,7 @@ class SaveRenderer implements GLSurfaceView.Renderer bmpHeight = bitmap.getHeight(); bmpWidth = bitmap.getWidth(); - if( mMesh==null ) mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); + if( mMesh==null ) mMesh = new MeshRectangles(30,30*bmpHeight/bmpWidth); if( mTexture==null ) mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); diff --git a/src/main/java/org/distorted/examples/sink/SinkRenderer.java b/src/main/java/org/distorted/examples/sink/SinkRenderer.java index 4e8f792..2084b51 100644 --- a/src/main/java/org/distorted/examples/sink/SinkRenderer.java +++ b/src/main/java/org/distorted/examples/sink/SinkRenderer.java @@ -33,7 +33,7 @@ import org.distorted.library.effect.VertexEffectSink; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; @@ -51,7 +51,7 @@ class SinkRenderer implements GLSurfaceView.Renderer private DistortedEffects mEffects; private DistortedScreen mScreen; private DistortedTexture mTexture; - private MeshFlat mMesh; + private MeshRectangles mMesh; private int bmpHeight, bmpWidth; private Static3D mScale, mMove; @@ -131,7 +131,7 @@ class SinkRenderer implements GLSurfaceView.Renderer if( mTexture==null ) mTexture = new DistortedTexture(bmpWidth,bmpHeight); mTexture.setTexture(bitmap); - if( mMesh==null ) mMesh = new MeshFlat(30,30*bmpHeight/bmpWidth); + if( mMesh==null ) mMesh = new MeshRectangles(30,30*bmpHeight/bmpWidth); mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java index 90d36f9..9e24c87 100644 --- a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java +++ b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java @@ -34,7 +34,7 @@ import org.distorted.library.effect.MatrixEffectRotate; import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; @@ -110,7 +110,7 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener private DistortedEffects[] mStarEffects; private DistortedNode mBackground; private DistortedScreen mScreen; - private MeshFlat mQuad; + private MeshRectangles mQuad; private long alphaEffectID, scaleEffectID, moveEffectID; private Random mRnd = new Random(0); @@ -122,7 +122,7 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener { mView = v; - mQuad = new MeshFlat(1,1); + mQuad = new MeshRectangles(1,1); mGFFAEffects = new DistortedEffects(); mLogoEffects = new DistortedEffects(); diff --git a/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java b/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java index ac4e8db..6424112 100644 --- a/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java +++ b/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java @@ -31,7 +31,7 @@ import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshRectangles; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -74,7 +74,7 @@ class TransparencyRenderer implements GLSurfaceView.Renderer { mView = v; - MeshFlat mesh = new MeshFlat(1,1); + MeshRectangles mesh = new MeshRectangles(1,1); mQuat1 = new Static4D(0,0,0,1); // unity mQuat2 = new Static4D(0,0,0,1); // quaternions