commit 01782e850061a18791d69a7c68ee0b17fa116c17 Author: Leszek Koltunski Date: Wed Jun 7 18:18:57 2017 +0100 Progress with support for Effect classes. diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldActivity.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldActivity.java index 5a3f918..ce0e8c6 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldActivity.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldActivity.java @@ -23,7 +23,7 @@ import android.app.Activity; import android.os.Bundle; import org.distorted.examples.R; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldEffectsManager.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldEffectsManager.java index 45e3a34..8c6baee 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldEffectsManager.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldEffectsManager.java @@ -21,7 +21,7 @@ package org.distorted.examples.aroundtheworld; /////////////////////////////////////////////////////////////////////////////////////////////////// -import org.distorted.library.DistortedEffects; +import org.distorted.library.main.DistortedEffects; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic2D; import org.distorted.library.type.Dynamic3D; diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java index 5577a5b..afe1b41 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java @@ -24,12 +24,12 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectNames; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/bean/BeanActivity.java b/src/main/java/org/distorted/examples/bean/BeanActivity.java index 420cbeb..cfb37ec 100644 --- a/src/main/java/org/distorted/examples/bean/BeanActivity.java +++ b/src/main/java/org/distorted/examples/bean/BeanActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.bean; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java index a14ef87..f6fed94 100644 --- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java +++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java @@ -27,13 +27,13 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedTexture; -import org.distorted.library.MeshFlat; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.main.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/blur/BlurActivity.java b/src/main/java/org/distorted/examples/blur/BlurActivity.java index 7c95a6e..5e72446 100644 --- a/src/main/java/org/distorted/examples/blur/BlurActivity.java +++ b/src/main/java/org/distorted/examples/blur/BlurActivity.java @@ -27,7 +27,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; import org.distorted.examples.R; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/blur/BlurRenderer.java b/src/main/java/org/distorted/examples/blur/BlurRenderer.java index 6314370..15fc79c 100644 --- a/src/main/java/org/distorted/examples/blur/BlurRenderer.java +++ b/src/main/java/org/distorted/examples/blur/BlurRenderer.java @@ -24,15 +24,15 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedEffectsPostprocess; -import org.distorted.library.DistortedNode; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedEffectsPostprocess; +import org.distorted.library.main.DistortedNode; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; -import org.distorted.library.MeshFlat; +import org.distorted.library.main.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/CatAndDogActivity.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogActivity.java index c4cc55a..9e5ad68 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogActivity.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.catanddog; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java index b9efc24..7b1c8ab 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java @@ -26,12 +26,12 @@ import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +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.EffectNames; -import org.distorted.library.MeshFlat; +import org.distorted.library.main.MeshFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; diff --git a/src/main/java/org/distorted/examples/check/CheckActivity.java b/src/main/java/org/distorted/examples/check/CheckActivity.java index 4712014..21fe15e 100644 --- a/src/main/java/org/distorted/examples/check/CheckActivity.java +++ b/src/main/java/org/distorted/examples/check/CheckActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.check; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.examples.R; import android.app.Activity; diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java index 494aeb4..cfb0764 100644 --- a/src/main/java/org/distorted/examples/check/CheckRenderer.java +++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java @@ -27,12 +27,12 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +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.EffectNames; -import org.distorted.library.MeshFlat; +import org.distorted.library.main.MeshFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; diff --git a/src/main/java/org/distorted/examples/cubes/CubesActivity.java b/src/main/java/org/distorted/examples/cubes/CubesActivity.java index 06654c4..368caee 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesActivity.java +++ b/src/main/java/org/distorted/examples/cubes/CubesActivity.java @@ -19,11 +19,11 @@ package org.distorted.examples.cubes; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.examples.R; -import org.distorted.library.DistortedTexture; -import org.distorted.library.MeshObject; -import org.distorted.library.MeshCubes; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.main.MeshObject; +import org.distorted.library.main.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 3820632..d0724c3 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java +++ b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java @@ -27,19 +27,18 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; -import org.distorted.library.MeshObject; +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.EffectTypes; import org.distorted.library.type.DynamicQuat; import org.distorted.library.type.Static4D; import org.distorted.library.type.Static3D; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.opengl.GLES30; import android.opengl.GLSurfaceView; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/deform/DeformActivity.java b/src/main/java/org/distorted/examples/deform/DeformActivity.java index ecea176..4a1e4b5 100644 --- a/src/main/java/org/distorted/examples/deform/DeformActivity.java +++ b/src/main/java/org/distorted/examples/deform/DeformActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.deform; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.examples.R; import org.distorted.library.EffectNames; diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java index ef8d8d9..9db04a9 100644 --- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -22,12 +22,12 @@ package org.distorted.examples.deform; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; -import org.distorted.library.MeshObject; -import org.distorted.library.MeshFlat; +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.EffectNames; import org.distorted.library.type.Dynamic3D; diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java index 6842439..0f94328 100644 --- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.differentbitmaps; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java index b6f96d9..08b2e55 100644 --- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java @@ -27,12 +27,12 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffects; +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.EffectNames; -import org.distorted.library.MeshFlat; +import org.distorted.library.main.MeshFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static1D; diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsActivity.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsActivity.java index 887c2ff..e2a4a3f 100644 --- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsActivity.java +++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.differenteffects; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java index 99e1122..6608169 100644 --- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java @@ -27,12 +27,12 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectNames; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java b/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java index 2ca3ad9..5e2da9c 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.dynamic; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.library.type.Dynamic1D; import org.distorted.examples.R; diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java index f4d76f2..005e138 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java @@ -28,11 +28,11 @@ import android.graphics.Paint; import android.graphics.Paint.Style; import android.opengl.GLSurfaceView; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; -import org.distorted.library.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.main.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/effectqueue/EffectQueueActivity.java b/src/main/java/org/distorted/examples/effectqueue/EffectQueueActivity.java index ef97c3a..a6e0bb6 100644 --- a/src/main/java/org/distorted/examples/effectqueue/EffectQueueActivity.java +++ b/src/main/java/org/distorted/examples/effectqueue/EffectQueueActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.effectqueue; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.examples.R; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; diff --git a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java index 2d032ec..76830b5 100644 --- a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java +++ b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java @@ -28,11 +28,11 @@ import android.graphics.Paint; import android.graphics.Paint.Style; import android.opengl.GLSurfaceView; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; -import org.distorted.library.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.main.Distorted; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; import org.distorted.library.message.EffectListener; diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java index 7fd1692..15956aa 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java @@ -38,12 +38,12 @@ import android.widget.Spinner; import android.widget.TableRow; import org.distorted.examples.R; -import org.distorted.library.Distorted; -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.main.Distorted; +import org.distorted.library.main.MeshCubes; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.MeshObject; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.main.DistortedEffects; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java b/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java index 4680eee..5e1c0e8 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java @@ -24,7 +24,7 @@ import android.widget.SeekBar; import android.widget.TextView; import org.distorted.examples.R; -import org.distorted.library.DistortedEffects; +import org.distorted.library.main.DistortedEffects; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java index 7fc4594..f16815d 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java @@ -24,14 +24,14 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedNode; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.Distorted; +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.EffectNames; -import org.distorted.library.MeshFlat; -import org.distorted.library.MeshObject; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.MeshObject; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.DynamicQuat; diff --git a/src/main/java/org/distorted/examples/fbo/FBOActivity.java b/src/main/java/org/distorted/examples/fbo/FBOActivity.java index 311f63f..db64da0 100644 --- a/src/main/java/org/distorted/examples/fbo/FBOActivity.java +++ b/src/main/java/org/distorted/examples/fbo/FBOActivity.java @@ -20,7 +20,7 @@ package org.distorted.examples.fbo; import org.distorted.examples.R; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/fbo/FBORenderer.java b/src/main/java/org/distorted/examples/fbo/FBORenderer.java index 194b6e6..f314ce1 100644 --- a/src/main/java/org/distorted/examples/fbo/FBORenderer.java +++ b/src/main/java/org/distorted/examples/fbo/FBORenderer.java @@ -27,15 +27,15 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.DistortedNode; -import org.distorted.library.DistortedScreen; -import org.distorted.library.Distorted; +import org.distorted.library.main.DistortedEffects; +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.EffectNames; -import org.distorted.library.MeshCubes; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.MeshCubes; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic; import org.distorted.library.type.Dynamic1D; diff --git a/src/main/java/org/distorted/examples/flag/FlagActivity.java b/src/main/java/org/distorted/examples/flag/FlagActivity.java index 01282dc..10bef8a 100644 --- a/src/main/java/org/distorted/examples/flag/FlagActivity.java +++ b/src/main/java/org/distorted/examples/flag/FlagActivity.java @@ -26,7 +26,7 @@ import android.widget.SeekBar; import android.widget.TextView; import org.distorted.examples.R; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.library.type.Static5D; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/flag/FlagRenderer.java b/src/main/java/org/distorted/examples/flag/FlagRenderer.java index 0e26ae2..20f882f 100644 --- a/src/main/java/org/distorted/examples/flag/FlagRenderer.java +++ b/src/main/java/org/distorted/examples/flag/FlagRenderer.java @@ -24,12 +24,12 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectNames; -import org.distorted.library.MeshCubes; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.MeshCubes; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic; import org.distorted.library.type.Dynamic5D; diff --git a/src/main/java/org/distorted/examples/girl/GirlActivity.java b/src/main/java/org/distorted/examples/girl/GirlActivity.java index 56ad119..349e4c1 100644 --- a/src/main/java/org/distorted/examples/girl/GirlActivity.java +++ b/src/main/java/org/distorted/examples/girl/GirlActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.girl; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.examples.R; import android.app.Activity; diff --git a/src/main/java/org/distorted/examples/girl/GirlRenderer.java b/src/main/java/org/distorted/examples/girl/GirlRenderer.java index 879ab8f..8d66a80 100644 --- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java +++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java @@ -27,12 +27,12 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectNames; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffects; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.main.DistortedEffects; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; diff --git a/src/main/java/org/distorted/examples/glow/GlowActivity.java b/src/main/java/org/distorted/examples/glow/GlowActivity.java index 1e72137..11ac990 100644 --- a/src/main/java/org/distorted/examples/glow/GlowActivity.java +++ b/src/main/java/org/distorted/examples/glow/GlowActivity.java @@ -21,7 +21,7 @@ package org.distorted.examples.glow; import android.app.Activity; import android.os.Bundle; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/glow/GlowRenderer.java b/src/main/java/org/distorted/examples/glow/GlowRenderer.java index c611aca..75d73d4 100644 --- a/src/main/java/org/distorted/examples/glow/GlowRenderer.java +++ b/src/main/java/org/distorted/examples/glow/GlowRenderer.java @@ -24,16 +24,16 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedEffectsPostprocess; -import org.distorted.library.DistortedNode; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedEffectsPostprocess; +import org.distorted.library.main.DistortedNode; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; -import org.distorted.library.MeshFlat; -import org.distorted.library.MeshObject; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.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/listener/ListenerActivity.java b/src/main/java/org/distorted/examples/listener/ListenerActivity.java index af4f529..9ae4ac3 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerActivity.java +++ b/src/main/java/org/distorted/examples/listener/ListenerActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.listener; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java index 8f975f0..b579f07 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java +++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java @@ -28,11 +28,11 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedScreen; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffects; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.main.DistortedEffects; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java index 2658ef4..e136219 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java @@ -31,11 +31,11 @@ import android.widget.LinearLayout; import android.widget.Spinner; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.MeshCubes; -import org.distorted.library.MeshObject; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.MeshCubes; +import org.distorted.library.main.MeshObject; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java index d126cde..d98b5ec 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java @@ -24,7 +24,7 @@ import android.widget.SeekBar; import android.widget.TextView; import org.distorted.examples.R; -import org.distorted.library.DistortedEffects; +import org.distorted.library.main.DistortedEffects; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java index 95c13c7..1451806 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java @@ -19,12 +19,11 @@ package org.distorted.examples.matrix3d; -import android.opengl.GLES30; import android.opengl.GLSurfaceView; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.DistortedTexture; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; diff --git a/src/main/java/org/distorted/examples/mirror/MirrorActivity.java b/src/main/java/org/distorted/examples/mirror/MirrorActivity.java index 0bc6ce0..26e697d 100644 --- a/src/main/java/org/distorted/examples/mirror/MirrorActivity.java +++ b/src/main/java/org/distorted/examples/mirror/MirrorActivity.java @@ -26,7 +26,7 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import org.distorted.examples.R; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java index cf4d320..4388b41 100644 --- a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java +++ b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java @@ -24,13 +24,13 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.Distorted; +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.EffectNames; -import org.distorted.library.MeshFlat; +import org.distorted.library.main.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/monalisa/MonaLisaActivity.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaActivity.java index 47f80ae..bd1018c 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaActivity.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.monalisa; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java index 4a76791..6b1b48a 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java @@ -26,12 +26,12 @@ import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +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.EffectNames; -import org.distorted.library.MeshFlat; +import org.distorted.library.main.MeshFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java index 428e9c5..ec86acd 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.movingeffects; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.examples.R; import android.app.Activity; diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java index edb19e3..8e69a87 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java @@ -28,12 +28,12 @@ import android.graphics.Paint; import android.graphics.Paint.Style; import android.opengl.GLSurfaceView; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffects; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.main.DistortedEffects; import org.distorted.library.EffectNames; -import org.distorted.library.MeshFlat; -import org.distorted.library.Distorted; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java index 7ba86bd..7766be7 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java @@ -27,7 +27,7 @@ import android.opengl.GLSurfaceView; import android.view.MotionEvent; import android.util.AttributeSet; -import org.distorted.library.DistortedEffects; +import org.distorted.library.main.DistortedEffects; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Dynamic4D; diff --git a/src/main/java/org/distorted/examples/multiblur/MultiblurActivity.java b/src/main/java/org/distorted/examples/multiblur/MultiblurActivity.java index e7b679b..3204fdc 100644 --- a/src/main/java/org/distorted/examples/multiblur/MultiblurActivity.java +++ b/src/main/java/org/distorted/examples/multiblur/MultiblurActivity.java @@ -27,8 +27,8 @@ import android.widget.CheckBox; import android.widget.SeekBar; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.EffectQuality; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.EffectQuality; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java b/src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java index 83a5492..c576709 100644 --- a/src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java +++ b/src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java @@ -24,16 +24,16 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedEffectsPostprocess; -import org.distorted.library.DistortedNode; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedEffectsPostprocess; +import org.distorted.library.main.DistortedNode; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectNames; -import org.distorted.library.EffectQuality; +import org.distorted.library.main.EffectQuality; import org.distorted.library.EffectTypes; -import org.distorted.library.MeshCubes; +import org.distorted.library.main.MeshCubes; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.DynamicQuat; diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java b/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java index 374b396..839b0b8 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java @@ -20,7 +20,7 @@ package org.distorted.examples.olimpic; import org.distorted.examples.R; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.opengl.GLSurfaceView; diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java index 5240497..1d2eeee 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java @@ -27,17 +27,17 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedNode; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.DistortedNode; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; -import org.distorted.library.MeshFlat; +import org.distorted.library.main.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.DistortedTexture; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedTexture; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/src/main/java/org/distorted/examples/plainmonalisa/PlainMonaLisaActivity.java b/src/main/java/org/distorted/examples/plainmonalisa/PlainMonaLisaActivity.java index 6a39afd..7a93e51 100644 --- a/src/main/java/org/distorted/examples/plainmonalisa/PlainMonaLisaActivity.java +++ b/src/main/java/org/distorted/examples/plainmonalisa/PlainMonaLisaActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.plainmonalisa; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java b/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java index 0fdac8f..19ed787 100644 --- a/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java +++ b/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java @@ -30,12 +30,12 @@ import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectNames; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; diff --git a/src/main/java/org/distorted/examples/projection/ProjectionActivity.java b/src/main/java/org/distorted/examples/projection/ProjectionActivity.java index 2a54589..222d7f0 100644 --- a/src/main/java/org/distorted/examples/projection/ProjectionActivity.java +++ b/src/main/java/org/distorted/examples/projection/ProjectionActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.projection; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.examples.R; import android.app.Activity; diff --git a/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java b/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java index 5032c0a..f7e941a 100644 --- a/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java +++ b/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java @@ -22,12 +22,12 @@ package org.distorted.examples.projection; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectNames; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.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/QuaternionActivity.java b/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java index 3d0cd1c..0072438 100644 --- a/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.quaternion; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java index f9e0176..956e4ed 100644 --- a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java @@ -28,17 +28,17 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectTypes; -import org.distorted.library.MeshObject; +import org.distorted.library.main.MeshObject; import org.distorted.library.type.Dynamic; import org.distorted.library.type.DynamicQuat; -import org.distorted.library.MeshCubes; -import org.distorted.library.DistortedTexture; +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.Distorted; +import org.distorted.library.main.Distorted; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/src/main/java/org/distorted/examples/save/SaveActivity.java b/src/main/java/org/distorted/examples/save/SaveActivity.java index c37e058..45fa726 100644 --- a/src/main/java/org/distorted/examples/save/SaveActivity.java +++ b/src/main/java/org/distorted/examples/save/SaveActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.save; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import org.distorted.examples.R; import android.Manifest; diff --git a/src/main/java/org/distorted/examples/save/SaveRenderer.java b/src/main/java/org/distorted/examples/save/SaveRenderer.java index 6ae8e6a..98ef941 100644 --- a/src/main/java/org/distorted/examples/save/SaveRenderer.java +++ b/src/main/java/org/distorted/examples/save/SaveRenderer.java @@ -30,13 +30,13 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +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.EffectNames; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedFramebuffer; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedFramebuffer; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; diff --git a/src/main/java/org/distorted/examples/sink/SinkActivity.java b/src/main/java/org/distorted/examples/sink/SinkActivity.java index ad2b3ab..70b507a 100644 --- a/src/main/java/org/distorted/examples/sink/SinkActivity.java +++ b/src/main/java/org/distorted/examples/sink/SinkActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.sink; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/sink/SinkRenderer.java b/src/main/java/org/distorted/examples/sink/SinkRenderer.java index 88c674a..854a627 100644 --- a/src/main/java/org/distorted/examples/sink/SinkRenderer.java +++ b/src/main/java/org/distorted/examples/sink/SinkRenderer.java @@ -27,12 +27,12 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectNames; -import org.distorted.library.MeshFlat; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static1D; diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java b/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java index 402812b..6a9352a 100644 --- a/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java +++ b/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java @@ -19,7 +19,7 @@ package org.distorted.examples.starwars; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; import android.app.Activity; import android.os.Bundle; diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java index db627f1..9cdcb05 100644 --- a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java +++ b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java @@ -28,9 +28,9 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.DistortedNode; -import org.distorted.library.DistortedScreen; -import org.distorted.library.MeshFlat; +import org.distorted.library.main.DistortedNode; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.main.MeshFlat; import org.distorted.library.EffectNames; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic3D; @@ -39,9 +39,9 @@ import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; import org.distorted.library.message.EffectListener; import org.distorted.library.message.EffectMessage; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffects; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.main.DistortedEffects; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/src/main/java/org/distorted/examples/stencil/StencilActivity.java b/src/main/java/org/distorted/examples/stencil/StencilActivity.java index c52311f..750c849 100644 --- a/src/main/java/org/distorted/examples/stencil/StencilActivity.java +++ b/src/main/java/org/distorted/examples/stencil/StencilActivity.java @@ -24,7 +24,7 @@ import android.os.Bundle; import android.view.View; import org.distorted.examples.R; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/stencil/StencilRenderer.java b/src/main/java/org/distorted/examples/stencil/StencilRenderer.java index 18a3683..1ddcd90 100644 --- a/src/main/java/org/distorted/examples/stencil/StencilRenderer.java +++ b/src/main/java/org/distorted/examples/stencil/StencilRenderer.java @@ -25,17 +25,17 @@ import android.opengl.GLES30; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedFramebuffer; -import org.distorted.library.DistortedNode; -import org.distorted.library.DistortedScreen; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedEffects; +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.EffectNames; import org.distorted.library.EffectTypes; -import org.distorted.library.MeshCubes; -import org.distorted.library.MeshFlat; -import org.distorted.library.MeshObject; +import org.distorted.library.main.MeshCubes; +import org.distorted.library.main.MeshFlat; +import org.distorted.library.main.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/wind/WindActivity.java b/src/main/java/org/distorted/examples/wind/WindActivity.java index 092a538..5d9c6a2 100644 --- a/src/main/java/org/distorted/examples/wind/WindActivity.java +++ b/src/main/java/org/distorted/examples/wind/WindActivity.java @@ -27,7 +27,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; import org.distorted.examples.R; -import org.distorted.library.Distorted; +import org.distorted.library.main.Distorted; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/wind/WindEffectsManager.java b/src/main/java/org/distorted/examples/wind/WindEffectsManager.java index d0cde48..9cf28a1 100644 --- a/src/main/java/org/distorted/examples/wind/WindEffectsManager.java +++ b/src/main/java/org/distorted/examples/wind/WindEffectsManager.java @@ -21,8 +21,8 @@ package org.distorted.examples.wind; /////////////////////////////////////////////////////////////////////////////////////////////////// -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Dynamic; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Dynamic5D; diff --git a/src/main/java/org/distorted/examples/wind/WindRenderer.java b/src/main/java/org/distorted/examples/wind/WindRenderer.java index 3f70558..d4d9741 100644 --- a/src/main/java/org/distorted/examples/wind/WindRenderer.java +++ b/src/main/java/org/distorted/examples/wind/WindRenderer.java @@ -24,12 +24,12 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import org.distorted.examples.R; -import org.distorted.library.Distorted; -import org.distorted.library.DistortedScreen; +import org.distorted.library.main.Distorted; +import org.distorted.library.main.DistortedScreen; import org.distorted.library.EffectNames; -import org.distorted.library.MeshCubes; -import org.distorted.library.DistortedEffects; -import org.distorted.library.DistortedTexture; +import org.distorted.library.main.MeshCubes; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedTexture; import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D;