commit 57d7fdbaad9991fa81573575c06546ae2a27279d Author: Leszek Koltunski Date: Wed Nov 21 11:00:05 2018 +0000 Rename MeshObject to MeshBase. diff --git a/src/main/java/org/distorted/examples/cubes/CubesActivity.java b/src/main/java/org/distorted/examples/cubes/CubesActivity.java index 708cf8d..50413c0 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesActivity.java +++ b/src/main/java/org/distorted/examples/cubes/CubesActivity.java @@ -22,7 +22,7 @@ package org.distorted.examples.cubes; import org.distorted.library.main.Distorted; import org.distorted.examples.R; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshObject; +import org.distorted.library.mesh.MeshBase; import org.distorted.library.mesh.MeshCubes; import android.app.Activity; @@ -54,7 +54,7 @@ public class CubesActivity extends Activity implements View.OnClickListener, See private LinearLayout mLay; private boolean[] mShape; private DistortedTexture mTexture; - private MeshObject mMesh; + private MeshBase mMesh; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -290,7 +290,7 @@ public class CubesActivity extends Activity implements View.OnClickListener, See /////////////////////////////////////////////////////////////////////////////////////////////////// - public MeshObject getMesh() + public MeshBase getMesh() { return mMesh; } diff --git a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java index 5ff1c69..568acd8 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java +++ b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java @@ -34,7 +34,7 @@ import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshObject; +import org.distorted.library.mesh.MeshBase; import org.distorted.library.type.DynamicQuat; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static4D; @@ -52,7 +52,7 @@ class CubesRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedTexture mTexture; private DistortedEffects mEffects; - private MeshObject mMesh; + private MeshBase mMesh; private DistortedScreen mScreen; private int mObjWidth, mObjHeight, mObjDepth; private Static3D mMove, mScale, mCenter; diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java index 692971e..6137687 100644 --- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -31,7 +31,7 @@ import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshObject; +import org.distorted.library.mesh.MeshBase; import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic3D; @@ -54,7 +54,7 @@ class DeformRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedTexture stretchTexture; private DistortedEffects stretchEffects; - private MeshObject stretchMesh; + private MeshBase stretchMesh; private DistortedScreen mScreen; private Static3D mTouchPoint; diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java index be9e0a7..c482ba6 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java @@ -38,7 +38,7 @@ 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.MeshObject; +import org.distorted.library.mesh.MeshBase; import java.io.IOException; import java.io.InputStream; @@ -57,7 +57,7 @@ public class Effects3DActivity2 extends AppCompatActivity private String mString; private DistortedTexture mTexture; - private MeshObject mMesh; + private MeshBase mMesh; private Bitmap mBitmap; private float mCenterX, mCenterY, mCenterZ; @@ -131,7 +131,7 @@ public class Effects3DActivity2 extends AppCompatActivity /////////////////////////////////////////////////////////////////////////////////////////////////// - public MeshObject getMesh() + public MeshBase getMesh() { return mMesh; } diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java index bc78ed7..d5d009c 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java @@ -32,8 +32,8 @@ 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.MeshBase; import org.distorted.library.mesh.MeshFlat; -import org.distorted.library.mesh.MeshObject; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -92,7 +92,7 @@ class Effects3DRenderer implements GLSurfaceView.Renderer DistortedEffects centerEffects = new DistortedEffects(); DistortedEffects regionEffects = new DistortedEffects(); - MeshObject mesh = act.getMesh(); + MeshBase mesh = act.getMesh(); MeshFlat quad = new MeshFlat(1,1); mObjWidth = mObjectTexture.getWidth(); @@ -148,7 +148,7 @@ class Effects3DRenderer implements GLSurfaceView.Renderer Effects3DActivity2 act = (Effects3DActivity2)mView.getContext(); DistortedEffects objectEffects= act.getEffects(); - MeshObject mesh = act.getMesh(); + MeshBase mesh = act.getMesh(); int objDepth = mObjectTexture.getDepth(mesh); diff --git a/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java b/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java index 96cc53a..6fc601d 100644 --- a/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java +++ b/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java @@ -34,8 +34,8 @@ 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.MeshBase; import org.distorted.library.mesh.MeshFlat; -import org.distorted.library.mesh.MeshObject; import org.distorted.library.message.EffectListener; import org.distorted.library.message.EffectMessage; import org.distorted.library.type.Dynamic1D; @@ -79,7 +79,7 @@ class MovingGlowRenderer implements GLSurfaceView.Renderer,EffectListener mLeaf = new DistortedTexture(LEAF_SIZE,LEAF_SIZE); DistortedTexture surface = new DistortedTexture(mRootW,mRootH); - MeshObject mesh = new MeshFlat(1,1); + MeshBase mesh = new MeshFlat(1,1); DistortedNode root = new DistortedNode(surface, new DistortedEffects(), mesh); diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java index e9be64d..33526ff 100644 --- a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java @@ -34,7 +34,7 @@ import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.mesh.MeshObject; +import org.distorted.library.mesh.MeshBase; import org.distorted.library.mesh.MeshCubes; import org.distorted.library.type.Dynamic; import org.distorted.library.type.DynamicQuat; @@ -54,7 +54,7 @@ class QuaternionRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedTexture mTexture; - private MeshObject mMesh; + private MeshBase mMesh; private DistortedScreen mScreen; private Static3D mMove, mScale, mCenter; diff --git a/src/main/java/org/distorted/examples/stencil/StencilRenderer.java b/src/main/java/org/distorted/examples/stencil/StencilRenderer.java index 7e7c304..5f5fd85 100644 --- a/src/main/java/org/distorted/examples/stencil/StencilRenderer.java +++ b/src/main/java/org/distorted/examples/stencil/StencilRenderer.java @@ -37,7 +37,7 @@ import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshCubes; import org.distorted.library.mesh.MeshFlat; -import org.distorted.library.mesh.MeshObject; +import org.distorted.library.mesh.MeshBase; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; @@ -56,7 +56,7 @@ class StencilRenderer implements GLSurfaceView.Renderer private DistortedScreen mScreen; private DistortedTexture mCubeTex, mFloorTex, mFBOTex; private DistortedNode mCube1Node, mCube2Node, mFloorNode, mFBONode; - private MeshObject mCubeMesh, mQuad; + private MeshBase mCubeMesh, mQuad; private Static3D mCubeMove, mCubeScale, mFloorScale, mFloorMove, mFBOScale; ///////////////////////////////////////////////////////////////////////////////////////////////////