commit 107e4b7286a4255406fdb392d6dc820371efafff Author: Leszek Koltunski Date: Tue Nov 20 22:49:03 2018 +0000 Fully move the Meshes to their own package. diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java index b227b8b..0147780 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java @@ -24,7 +24,6 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.EffectType; import org.distorted.library.effect.FragmentEffectChroma; import org.distorted.library.effect.FragmentEffectContrast; @@ -37,7 +36,7 @@ import org.distorted.library.effect.VertexEffectSwirl; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java index 79cf570..41180f8 100644 --- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java +++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java @@ -27,7 +27,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.effect.VertexEffectDistort; @@ -35,7 +34,7 @@ import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; diff --git a/src/main/java/org/distorted/examples/bitmaptree/BitmapTreeRenderer.java b/src/main/java/org/distorted/examples/bitmaptree/BitmapTreeRenderer.java index ec7bc1f..a9075b5 100644 --- a/src/main/java/org/distorted/examples/bitmaptree/BitmapTreeRenderer.java +++ b/src/main/java/org/distorted/examples/bitmaptree/BitmapTreeRenderer.java @@ -37,8 +37,8 @@ import org.distorted.library.main.DistortedFramebuffer; import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.Distorted; -import org.distorted.library.main.MeshCubes; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshCubes; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic; import org.distorted.library.type.Dynamic1D; diff --git a/src/main/java/org/distorted/examples/blur/BlurRenderer.java b/src/main/java/org/distorted/examples/blur/BlurRenderer.java index 2c8e0ec..f92838c 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.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java index 2427397..7568101 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.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java index 8237c12..7b9d90d 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.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/cubes/CubesActivity.java b/src/main/java/org/distorted/examples/cubes/CubesActivity.java index d89a133..708cf8d 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.main.Distorted; import org.distorted.examples.R; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.main.MeshObject; -import org.distorted.library.main.MeshCubes; +import org.distorted.library.mesh.MeshObject; +import org.distorted.library.mesh.MeshCubes; import android.app.Activity; import android.opengl.GLSurfaceView; diff --git a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java index 1b5c7d8..5ff1c69 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.main.MeshObject; +import org.distorted.library.mesh.MeshObject; import org.distorted.library.type.DynamicQuat; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static4D; diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java index 9b250c5..692971e 100644 --- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -31,8 +31,8 @@ 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.main.MeshObject; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshObject; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java index 629fd63..eff3850 100644 --- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java @@ -27,7 +27,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.effect.VertexEffectDistort; @@ -36,7 +35,7 @@ import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.DistortedEffects; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java index 5009fe4..de1ac1a 100644 --- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java @@ -27,7 +27,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.FragmentEffectChroma; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectScale; @@ -36,7 +35,7 @@ import org.distorted.library.effect.VertexEffectSink; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java index b082309..93a61ed 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.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.Distorted; diff --git a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java index 2c747cf..f90b813 100644 --- a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java +++ b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java @@ -28,7 +28,6 @@ import android.graphics.Paint; import android.graphics.Paint.Style; import android.opengl.GLSurfaceView; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.FragmentEffectAlpha; import org.distorted.library.effect.FragmentEffectChroma; import org.distorted.library.effect.FragmentEffectSaturation; @@ -37,7 +36,7 @@ import org.distorted.library.effect.VertexEffectDistort; import org.distorted.library.effect.VertexEffectSink; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.Distorted; import org.distorted.library.message.EffectListener; diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java index 00222e9..be9e0a7 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java @@ -36,9 +36,9 @@ import org.distorted.library.effect.EffectType; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.main.MeshCubes; -import org.distorted.library.main.MeshFlat; -import org.distorted.library.main.MeshObject; +import org.distorted.library.mesh.MeshCubes; +import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshObject; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java index 873dfd8..bc78ed7 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.main.MeshFlat; -import org.distorted.library.main.MeshObject; +import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshObject; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; diff --git a/src/main/java/org/distorted/examples/flag/FlagRenderer.java b/src/main/java/org/distorted/examples/flag/FlagRenderer.java index 99e9966..d68808b 100644 --- a/src/main/java/org/distorted/examples/flag/FlagRenderer.java +++ b/src/main/java/org/distorted/examples/flag/FlagRenderer.java @@ -31,7 +31,7 @@ import org.distorted.library.effect.VertexEffectWave; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshCubes; +import org.distorted.library.mesh.MeshCubes; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic; import org.distorted.library.type.Dynamic5D; diff --git a/src/main/java/org/distorted/examples/girl/GirlRenderer.java b/src/main/java/org/distorted/examples/girl/GirlRenderer.java index aebd12d..79554fc 100644 --- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java +++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java @@ -27,7 +27,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.effect.VertexEffectDistort; @@ -35,7 +34,7 @@ import org.distorted.library.effect.VertexEffectSink; import org.distorted.library.effect.VertexEffectSwirl; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.DistortedEffects; import org.distorted.library.type.Dynamic1D; diff --git a/src/main/java/org/distorted/examples/glow/GlowRenderer.java b/src/main/java/org/distorted/examples/glow/GlowRenderer.java index 59bedfc..61851c1 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.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; diff --git a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java index 8712f87..3f47793 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java +++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java @@ -28,14 +28,13 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.EffectType; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.effect.VertexEffectDistort; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.DistortedEffects; import org.distorted.library.type.Dynamic3D; diff --git a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java index 5bb0da8..7b75a6a 100644 --- a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java +++ b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java @@ -24,7 +24,6 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.FragmentEffectBrightness; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectScale; @@ -33,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.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java index 6663f7e..e9336d0 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java @@ -26,7 +26,6 @@ import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.effect.VertexEffectDistort; @@ -34,7 +33,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.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java index ec2a634..7b9fe0a 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java @@ -36,7 +36,7 @@ import org.distorted.library.effect.VertexEffectSwirl; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.main.DistortedEffects; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java b/src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java index 49f25b7..96cc53a 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.main.MeshFlat; -import org.distorted.library.main.MeshObject; +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; diff --git a/src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java b/src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java index da69ced..c5a2760 100644 --- a/src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java +++ b/src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java @@ -34,7 +34,7 @@ import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; import org.distorted.library.effect.EffectQuality; -import org.distorted.library.main.MeshCubes; +import org.distorted.library.mesh.MeshCubes; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java index 8974bcc..d379d79 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java @@ -27,7 +27,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.FragmentEffectChroma; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectRotate; @@ -35,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.DistortedNode; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static1D; diff --git a/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java b/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java index 9951975..ca61f43 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.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java b/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java index fd4be47..a0fe672 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.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java b/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java index 8c8bc4b..4c0b195 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.VertexEffectDistort; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java index 01b5e04..e9be64d 100644 --- a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java @@ -33,11 +33,11 @@ import org.distorted.library.effect.MatrixEffectQuaternion; import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshObject; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.mesh.MeshObject; +import org.distorted.library.mesh.MeshCubes; import org.distorted.library.type.Dynamic; import org.distorted.library.type.DynamicQuat; -import org.distorted.library.main.MeshCubes; -import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Static4D; import org.distorted.library.type.Static3D; import org.distorted.library.main.Distorted; diff --git a/src/main/java/org/distorted/examples/save/SaveRenderer.java b/src/main/java/org/distorted/examples/save/SaveRenderer.java index 4c9ee63..a27e715 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.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; import org.distorted.library.main.DistortedTexture; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedFramebuffer; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; diff --git a/src/main/java/org/distorted/examples/sink/SinkRenderer.java b/src/main/java/org/distorted/examples/sink/SinkRenderer.java index b556caf..9db673e 100644 --- a/src/main/java/org/distorted/examples/sink/SinkRenderer.java +++ b/src/main/java/org/distorted/examples/sink/SinkRenderer.java @@ -27,14 +27,13 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.effect.VertexEffectSink; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java index dc7a31a..ce0efce 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.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; diff --git a/src/main/java/org/distorted/examples/stencil/StencilRenderer.java b/src/main/java/org/distorted/examples/stencil/StencilRenderer.java index 83c1329..7e7c304 100644 --- a/src/main/java/org/distorted/examples/stencil/StencilRenderer.java +++ b/src/main/java/org/distorted/examples/stencil/StencilRenderer.java @@ -35,9 +35,9 @@ 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.main.MeshCubes; -import org.distorted.library.main.MeshFlat; -import org.distorted.library.main.MeshObject; +import org.distorted.library.mesh.MeshCubes; +import org.distorted.library.mesh.MeshFlat; +import org.distorted.library.mesh.MeshObject; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java b/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java index f86ca83..4231b11 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.main.MeshFlat; +import org.distorted.library.mesh.MeshFlat; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; diff --git a/src/main/java/org/distorted/examples/triblur/TriblurRenderer.java b/src/main/java/org/distorted/examples/triblur/TriblurRenderer.java index 2831b47..485f176 100644 --- a/src/main/java/org/distorted/examples/triblur/TriblurRenderer.java +++ b/src/main/java/org/distorted/examples/triblur/TriblurRenderer.java @@ -35,7 +35,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.main.MeshCubes; +import org.distorted.library.mesh.MeshCubes; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; diff --git a/src/main/java/org/distorted/examples/wind/WindRenderer.java b/src/main/java/org/distorted/examples/wind/WindRenderer.java index 38a3b01..98116e0 100644 --- a/src/main/java/org/distorted/examples/wind/WindRenderer.java +++ b/src/main/java/org/distorted/examples/wind/WindRenderer.java @@ -24,7 +24,6 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.effect.EffectName; import org.distorted.library.effect.MatrixEffectMove; import org.distorted.library.effect.MatrixEffectRotate; import org.distorted.library.effect.MatrixEffectScale; @@ -32,7 +31,7 @@ import org.distorted.library.effect.VertexEffectDeform; import org.distorted.library.effect.VertexEffectWave; import org.distorted.library.main.Distorted; import org.distorted.library.main.DistortedScreen; -import org.distorted.library.main.MeshCubes; +import org.distorted.library.mesh.MeshCubes; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Static1D;