commit d04a48869e1b7ba22cb56a9502c58a3fb4162acb Author: Leszek Koltunski Date: Thu Dec 15 16:02:31 2016 +0000 Change of names. diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldEffectsManager.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldEffectsManager.java index afc8f27..45e3a34 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.DistortedEffectQueues; +import org.distorted.library.DistortedEffects; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Dynamic2D; import org.distorted.library.type.Dynamic3D; @@ -255,39 +255,39 @@ class AroundTheWorldEffectsManager /////////////////////////////////////////////////////////////////////////////////////////////////// - synchronized void apply(DistortedEffectQueues queues) + synchronized void apply(DistortedEffects effects) { setRace(mBlackness, mAsianness); // WHITENESS - queues.sink(wLipsDyn, wLipsCenter, wLipsRegion); + effects.sink(wLipsDyn, wLipsCenter, wLipsRegion); // ASIANNESS - queues.distort(aLipsNoseDyn, aLipsNoseCenter, aLipsNoseRegion); - queues.pinch(aNoseBroaderDyn, aNoseBroaderCenter, aNoseBroaderRegion); - queues.distort(aNostrilsDyn, aNostrilsCenter, aNostrilsRegion); - queues.swirl(aLEyeDyn, aLEyeCenter, aEyesRegion); - queues.swirl(aREyeDyn, aREyeCenter, aEyesRegion); - queues.distort(aEyebrowsDyn, aEyebrowsCenter, aEyebrowsRegion); + effects.distort(aLipsNoseDyn, aLipsNoseCenter, aLipsNoseRegion); + effects.pinch(aNoseBroaderDyn, aNoseBroaderCenter, aNoseBroaderRegion); + effects.distort(aNostrilsDyn, aNostrilsCenter, aNostrilsRegion); + effects.swirl(aLEyeDyn, aLEyeCenter, aEyesRegion); + effects.swirl(aREyeDyn, aREyeCenter, aEyesRegion); + effects.distort(aEyebrowsDyn, aEyebrowsCenter, aEyebrowsRegion); - queues.chroma(aChromaSkinDyn, aChromaSkin, aSkinColorRegion, false); - queues.chroma(aChromaEyesDyn, aChromaEyes, aLEyeColorRegion, true); - queues.chroma(aChromaEyesDyn, aChromaEyes, aREyeColorRegion, true); + effects.chroma(aChromaSkinDyn, aChromaSkin, aSkinColorRegion, false); + effects.chroma(aChromaEyesDyn, aChromaEyes, aLEyeColorRegion, true); + effects.chroma(aChromaEyesDyn, aChromaEyes, aREyeColorRegion, true); // BLACKNESS - queues.pinch(bFaceDyn, bFaceCenter, bFaceRegion); - queues.distort(bTipLowerDyn, bTipLowerCenter, bTipLowerRegion); - queues.pinch(bWholeNoseDyn, bWholeNoseCenter, bWholeNoseRegion); - queues.pinch(bNoseBroaderDyn, bNoseBroaderCenter, bNoseBroaderRegion); - queues.pinch(bLipsDyn, bLipsCenter, bLipsRegion); - - queues.chroma(bChromaSkinDyn, bChromaSkin, bSkinColorRegion, false); - queues.chroma(bChromaEyesDyn, bChromaEyes, bLEyeColorRegion, true); - queues.chroma(bChromaEyesDyn, bChromaEyes, bREyeColorRegion, true); - queues.chroma(bChromaPupilDyn, bChromaPupil, bLPupilColorRegion, true); - queues.chroma(bChromaPupilDyn, bChromaPupil, bRPupilColorRegion, true); - - queues.contrast(bContrastDyn); + effects.pinch(bFaceDyn, bFaceCenter, bFaceRegion); + effects.distort(bTipLowerDyn, bTipLowerCenter, bTipLowerRegion); + effects.pinch(bWholeNoseDyn, bWholeNoseCenter, bWholeNoseRegion); + effects.pinch(bNoseBroaderDyn, bNoseBroaderCenter, bNoseBroaderRegion); + effects.pinch(bLipsDyn, bLipsCenter, bLipsRegion); + + effects.chroma(bChromaSkinDyn, bChromaSkin, bSkinColorRegion, false); + effects.chroma(bChromaEyesDyn, bChromaEyes, bLEyeColorRegion, true); + effects.chroma(bChromaEyesDyn, bChromaEyes, bREyeColorRegion, true); + effects.chroma(bChromaPupilDyn, bChromaPupil, bLPupilColorRegion, true); + effects.chroma(bChromaPupilDyn, bChromaPupil, bRPupilColorRegion, true); + + effects.contrast(bContrastDyn); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java index 5920200..f0769b1 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java @@ -26,9 +26,9 @@ 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.GridFlat; -import org.distorted.library.DistortedEffectQueues; import org.distorted.library.DistortedTexture; import org.distorted.library.EffectTypes; import org.distorted.library.type.Static3D; @@ -44,7 +44,7 @@ import javax.microedition.khronos.opengles.GL10; class AroundTheWorldRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; - private DistortedEffectQueues mEffects; + private DistortedEffects mEffects; private DistortedTexture mTexture; private GridFlat mGrid; private DistortedFramebuffer mScreen; @@ -60,7 +60,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer mView = view; mManager = new AroundTheWorldEffectsManager(); - mEffects = new DistortedEffectQueues(); + mEffects = new DistortedEffects(); mManager.apply(mEffects); mScreen = new DistortedFramebuffer(0); } diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java index c1b3165..bc37194 100644 --- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java +++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java @@ -27,11 +27,11 @@ 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.EffectTypes; import org.distorted.library.Distorted; import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffectQueues; import org.distorted.library.GridFlat; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Static3D; @@ -48,7 +48,7 @@ class BeanRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; private DistortedTexture mTexture; - private DistortedEffectQueues mEffects; + private DistortedEffects mEffects; private DistortedFramebuffer mScreen; private GridFlat mGrid; private int bmpHeight, bmpWidth; @@ -85,7 +85,7 @@ class BeanRenderer implements GLSurfaceView.Renderer dRight.add(p1); dRight.add(p1); - mEffects = new DistortedEffectQueues(); + mEffects = new DistortedEffects(); mEffects.distort(dLeft , pLeft , rLeft ); mEffects.distort(dRight, pRight, rRight); diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java index 737cce0..f89d92d 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java @@ -27,7 +27,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffectQueues; +import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTexture; import org.distorted.library.GridFlat; @@ -48,7 +48,7 @@ import android.opengl.GLSurfaceView; class CatAndDogRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; - private DistortedEffectQueues mEffects; + private DistortedEffects mEffects; private DistortedTexture mTexture; private GridFlat mGrid; private DistortedFramebuffer mScreen; @@ -61,7 +61,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer mView = v; mGrid = new GridFlat(1,1); // no vertex effects, grid can be a (1x1) quad. - mEffects = new DistortedEffectQueues(); + mEffects = new DistortedEffects(); Static4D chromaRegion= new Static4D( 530, 200,100,100); Static4D alphaRegion = new Static4D( 230, 200,100,100); diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java index 5023fda..f4beb5e 100644 --- a/src/main/java/org/distorted/examples/check/CheckRenderer.java +++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java @@ -28,9 +28,9 @@ 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.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffectQueues; import org.distorted.library.GridFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; @@ -57,7 +57,7 @@ class CheckRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedTexture mTexture; - private DistortedEffectQueues mEffects; + private DistortedEffects mEffects; private GridFlat mGrid; private DistortedFramebuffer mScreen; private int bmpHeight, bmpWidth; @@ -67,7 +67,7 @@ class CheckRenderer implements GLSurfaceView.Renderer CheckRenderer(GLSurfaceView view) { mView = view; - mEffects = new DistortedEffectQueues(); + mEffects = new DistortedEffects(); CheckActivity act = (CheckActivity)mView.getContext(); diff --git a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java index 1f2136a..fd4df98 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java +++ b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java @@ -27,9 +27,9 @@ 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.DistortedTexture; -import org.distorted.library.DistortedEffectQueues; import org.distorted.library.GridObject; import org.distorted.library.EffectTypes; import org.distorted.library.type.DynamicQuat; @@ -48,7 +48,7 @@ class CubesRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; private DistortedTexture mTexture; - private DistortedEffectQueues mEffects; + private DistortedEffects mEffects; private GridObject mGrid; private DistortedFramebuffer mScreen; private DynamicQuat mQuatInt1, mQuatInt2; @@ -65,7 +65,7 @@ class CubesRenderer implements GLSurfaceView.Renderer CubesActivity act = (CubesActivity)v.getContext(); - mEffects = new DistortedEffectQueues(); + mEffects = new DistortedEffects(); mTexture = act.getTexture(); mGrid = act.getGrid(); diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java index e62f44f..71255d5 100644 --- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -23,9 +23,9 @@ 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.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffectQueues; import org.distorted.library.GridObject; import org.distorted.library.GridFlat; @@ -52,7 +52,7 @@ class DeformRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedTexture fpsTexture, stretchTexture; - private DistortedEffectQueues fpsEffects, stretchEffects; + private DistortedEffects fpsEffects, stretchEffects; private GridObject fpsGrid, stretchGrid; private DistortedFramebuffer mScreen; private Static3D touchPoint; @@ -92,8 +92,8 @@ class DeformRenderer implements GLSurfaceView.Renderer mPaint.setAntiAlias(true); mPaint.setTextAlign(Paint.Align.CENTER); - fpsEffects = new DistortedEffectQueues(); - stretchEffects = new DistortedEffectQueues(); + fpsEffects = new DistortedEffects(); + stretchEffects = new DistortedEffects(); mRegion = new Static4D(0,0,50,50); diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java index b19f402..1588b9d 100644 --- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java @@ -30,7 +30,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffectQueues; +import org.distorted.library.DistortedEffects; import org.distorted.library.GridFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; @@ -51,7 +51,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer private GLSurfaceView mView; private DistortedTexture[] mTexture; - private DistortedEffectQueues[] mEffects; + private DistortedEffects[] mEffects; private GridFlat mGrid; private DistortedFramebuffer mScreen; private int bmpHeight, bmpWidth; @@ -67,10 +67,10 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer dDistort.add(new Static3D(-25,0,0)); Static3D mPoint = new Static3D(305, 380, 0); - mEffects = new DistortedEffectQueues[NUM]; - mEffects[0] = new DistortedEffectQueues(); + mEffects = new DistortedEffects[NUM]; + mEffects[0] = new DistortedEffects(); for(int i=1; i mEffects; + private ArrayList mList; private int mEffectAdd; private float mCenterX, mCenterY, mCenterZ; private float mRegionX, mRegionY, mRegionR; @@ -91,7 +91,7 @@ public class Effects3DActivity extends Activity { super.onCreate(savedState); - mEffects = new ArrayList<>(); + mList = new ArrayList<>(); createEffectNames(); @@ -226,9 +226,9 @@ public class Effects3DActivity extends Activity /////////////////////////////////////////////////////////////////////////////////////////////////// - public DistortedEffectQueues getQueues() + public DistortedEffects getEffects() { - return mQueues; + return mEffects; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -410,7 +410,7 @@ public class Effects3DActivity extends Activity int w = mBitmap.getWidth(); int h = mBitmap.getHeight(); - mQueues = new DistortedEffectQueues(); + mEffects = new DistortedEffects(); mTexture= new DistortedTexture(w,h); mGrid = new GridFlat(mNumCols,mNumCols*h/w); setEffectView(); @@ -441,7 +441,7 @@ public class Effects3DActivity extends Activity for(int i=0; i mEffects; + private ArrayList mList; private int mEffectAdd; private EffectNames[] mEffectNames; @@ -65,11 +65,11 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele { super.onCreate(savedState); - mEffects = new ArrayList<>(); + mList = new ArrayList<>(); createEffectNames(); - mQueues = new DistortedEffectQueues(); + mEffects = new DistortedEffects(); mGrid = new GridCubes(1,1,false); mTexture= new DistortedTexture(100,100); @@ -102,9 +102,9 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele /////////////////////////////////////////////////////////////////////////////////////////////////// - public DistortedEffectQueues getQueues() + public DistortedEffects getEffects() { - return mQueues; + return mEffects; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -277,7 +277,7 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele public void newEffect(View v) { Matrix3DEffect eff = new Matrix3DEffect(mEffectNames[mEffectAdd], this); - mEffects.add(eff); + mList.add(eff); LinearLayout layout = (LinearLayout)findViewById(R.id.matrix3dlayout); View view = eff.createView(); @@ -289,17 +289,17 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele layout.addView(center); } - eff.apply(mQueues); + eff.apply(mEffects); } /////////////////////////////////////////////////////////////////////////////////////////////////// public void removeAll(View v) { - mEffects.clear(); + mList.clear(); LinearLayout layout = (LinearLayout)findViewById(R.id.matrix3dlayout); layout.removeAllViews(); - mQueues.abortEffects(EffectTypes.MATRIX); + mEffects.abortEffects(EffectTypes.MATRIX); resetData(); } @@ -308,7 +308,7 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele public void remove(View v) { - for(Matrix3DEffect effect: mEffects) + for(Matrix3DEffect effect: mList) { if( effect.thisView(v) ) { @@ -322,8 +322,8 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele view = effect.getRegion(); if( view!=null ) layout.removeView(view); - mQueues.abortEffect(effect.getId()); - mEffects.remove(effect); + mEffects.abortEffect(effect.getId()); + mList.remove(effect); resetData(); diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java index 2fac1b9..b0e3feb 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.DistortedEffectQueues; +import org.distorted.library.DistortedEffects; import org.distorted.library.EffectNames; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; @@ -77,33 +77,33 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener /////////////////////////////////////////////////////////////////////////////////////////////////// // requires knowledge about effect nature - void apply(DistortedEffectQueues queues) + void apply(DistortedEffects effects) { switch(mName) { - case ROTATE : mId = queues.rotate (mDyn4, mCenterDyn); break; - case QUATERNION : mId = queues.quaternion(mDyn4, mCenterDyn); break; - case MOVE : mId = queues.move (mDyn3) ; break; - case SCALE : mId = queues.scale (mDyn3) ; break; - case SHEAR : mId = queues.shear (mDyn3, mCenterDyn); break; - - case DISTORT : mId = queues.distort (mDyn3, mCenterDyn, mRegionDyn); break; - case DEFORM : mId = queues.deform (mDyn3, mCenterDyn, mRegionDyn); break; - case SINK : mId = queues.sink (mDyn1, mCenterDyn, mRegionDyn); break; - case PINCH : mId = queues.pinch (mDyn2, mCenterDyn, mRegionDyn); break; - case SWIRL : mId = queues.swirl (mDyn1, mCenterDyn, mRegionDyn); break; - case WAVE : mId = queues.wave (mDyn5, mCenterDyn, mRegionDyn); break; - - case ALPHA : mId = queues.alpha (mDyn1, mRegionDyn, false); break; - case SMOOTH_ALPHA : mId = queues.alpha (mDyn1, mRegionDyn, true ); break; - case CHROMA : mId = queues.chroma (mDyn1, mDyn3, mRegionDyn, false); break; - case SMOOTH_CHROMA : mId = queues.chroma (mDyn1, mDyn3, mRegionDyn, true ); break; - case BRIGHTNESS : mId = queues.brightness(mDyn1, mRegionDyn, false); break; - case SMOOTH_BRIGHTNESS: mId = queues.brightness(mDyn1, mRegionDyn, true ); break; - case SATURATION : mId = queues.saturation(mDyn1, mRegionDyn, false); break; - case SMOOTH_SATURATION: mId = queues.saturation(mDyn1, mRegionDyn, true ); break; - case CONTRAST : mId = queues.contrast (mDyn1, mRegionDyn, false); break; - case SMOOTH_CONTRAST : mId = queues.contrast (mDyn1, mRegionDyn, true ); break; + case ROTATE : mId = effects.rotate (mDyn4, mCenterDyn); break; + case QUATERNION : mId = effects.quaternion(mDyn4, mCenterDyn); break; + case MOVE : mId = effects.move (mDyn3) ; break; + case SCALE : mId = effects.scale (mDyn3) ; break; + case SHEAR : mId = effects.shear (mDyn3, mCenterDyn); break; + + case DISTORT : mId = effects.distort (mDyn3, mCenterDyn, mRegionDyn); break; + case DEFORM : mId = effects.deform (mDyn3, mCenterDyn, mRegionDyn); break; + case SINK : mId = effects.sink (mDyn1, mCenterDyn, mRegionDyn); break; + case PINCH : mId = effects.pinch (mDyn2, mCenterDyn, mRegionDyn); break; + case SWIRL : mId = effects.swirl (mDyn1, mCenterDyn, mRegionDyn); break; + case WAVE : mId = effects.wave (mDyn5, mCenterDyn, mRegionDyn); break; + + case ALPHA : mId = effects.alpha (mDyn1, mRegionDyn, false); break; + case SMOOTH_ALPHA : mId = effects.alpha (mDyn1, mRegionDyn, true ); break; + case CHROMA : mId = effects.chroma (mDyn1, mDyn3, mRegionDyn, false); break; + case SMOOTH_CHROMA : mId = effects.chroma (mDyn1, mDyn3, mRegionDyn, true ); break; + case BRIGHTNESS : mId = effects.brightness(mDyn1, mRegionDyn, false); break; + case SMOOTH_BRIGHTNESS: mId = effects.brightness(mDyn1, mRegionDyn, true ); break; + case SATURATION : mId = effects.saturation(mDyn1, mRegionDyn, false); break; + case SMOOTH_SATURATION: mId = effects.saturation(mDyn1, mRegionDyn, true ); break; + case CONTRAST : mId = effects.contrast (mDyn1, mRegionDyn, false); break; + case SMOOTH_CONTRAST : mId = effects.contrast (mDyn1, mRegionDyn, true ); break; default: mId = -1; } diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java index 147c0d0..b07a614 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java @@ -23,7 +23,7 @@ import android.opengl.GLES20; import android.opengl.GLSurfaceView; import org.distorted.library.Distorted; -import org.distorted.library.DistortedEffectQueues; +import org.distorted.library.DistortedEffects; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.GridObject; import org.distorted.library.DistortedTexture; @@ -37,7 +37,7 @@ class Matrix3DRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; private DistortedTexture mTexture; - private DistortedEffectQueues mEffects; + private DistortedEffects mEffects; private DistortedFramebuffer mScreen; private GridObject mGrid; @@ -51,7 +51,7 @@ class Matrix3DRenderer implements GLSurfaceView.Renderer Matrix3DActivity act = (Matrix3DActivity)v.getContext(); - mEffects = act.getQueues(); + mEffects= act.getEffects(); mTexture= act.getTexture(); mGrid = act.getGrid(); mScreen = new DistortedFramebuffer(0); diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java index 2afed71..65f9105 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java @@ -27,9 +27,9 @@ 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.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffectQueues; import org.distorted.library.GridFlat; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; @@ -47,7 +47,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer { private GLSurfaceView mView; private DistortedTexture mTexture; - private DistortedEffectQueues mEffects; + private DistortedEffects mEffects; private DistortedFramebuffer mScreen; private GridFlat mGrid; private int bmpHeight, bmpWidth; @@ -70,7 +70,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer dRight.add( new Static3D( 0, 0,0) ); dRight.add( new Static3D( 20,-10,0) ); - mEffects = new DistortedEffectQueues(); + mEffects = new DistortedEffects(); mEffects.distort( dLeft, pLeft , rLeft ); mEffects.distort(dRight, pRight, rRight); diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java index 2f26204..554eeae 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java @@ -31,7 +31,7 @@ import android.opengl.GLSurfaceView; import org.distorted.library.DistortedFramebuffer; import org.distorted.library.DistortedTexture; -import org.distorted.library.DistortedEffectQueues; +import org.distorted.library.DistortedEffects; import org.distorted.library.GridFlat; import org.distorted.library.Distorted; @@ -46,7 +46,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer private int texW, texH; private GridFlat mGrid; - private DistortedEffectQueues mEffects; + private DistortedEffects mEffects; private DistortedTexture mTexture; private DistortedFramebuffer mScreen; private boolean mRefresh; @@ -61,7 +61,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer mPaint.setStyle(Style.FILL); mView = v; - mEffects= new DistortedEffectQueues(); + mEffects= new DistortedEffects(); mScreen = new DistortedFramebuffer(0); mRefresh= true; } @@ -93,7 +93,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer /////////////////////////////////////////////////////////////////////////////////////////////////// - DistortedEffectQueues getQueues() + DistortedEffects getEffects() { return mEffects; } diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java index a920305..1136c53 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.DistortedEffectQueues; +import org.distorted.library.DistortedEffects; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic3D; import org.distorted.library.type.Dynamic4D; @@ -119,7 +119,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - DistortedEffectQueues q = mRenderer.getQueues(); + DistortedEffects q = mRenderer.getEffects(); q.abortEffects(EffectTypes.VERTEX); q.abortEffects(EffectTypes.FRAGMENT); q.distort( new Static3D(0,0,mMax/10) , di3D, dr); @@ -135,7 +135,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - DistortedEffectQueues q = mRenderer.getQueues(); + DistortedEffects q = mRenderer.getEffects(); q.abortEffects(EffectTypes.VERTEX); q.abortEffects(EffectTypes.FRAGMENT); q.sink(new Static1D(10), di3D, dr); @@ -151,7 +151,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - DistortedEffectQueues q = mRenderer.getQueues(); + DistortedEffects q = mRenderer.getEffects(); q.abortEffects(EffectTypes.VERTEX); q.abortEffects(EffectTypes.FRAGMENT); q.chroma(new Static1D(0.5f), new Static3D(1,0,0), mRegion, true); @@ -167,7 +167,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - DistortedEffectQueues q = mRenderer.getQueues(); + DistortedEffects q = mRenderer.getEffects(); q.abortEffects(EffectTypes.VERTEX); q.abortEffects(EffectTypes.FRAGMENT); q.alpha(new Static1D(0.5f), mRegion, true); @@ -183,7 +183,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - DistortedEffectQueues q = mRenderer.getQueues(); + DistortedEffects q = mRenderer.getEffects(); q.abortEffects(EffectTypes.VERTEX); q.abortEffects(EffectTypes.FRAGMENT); q.swirl( new Static1D(30), di3D, dr); @@ -197,7 +197,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView { synchronized(lock) { - DistortedEffectQueues q = mRenderer.getQueues(); + DistortedEffects q = mRenderer.getEffects(); q.abortEffects(EffectTypes.VERTEX); q.abortEffects(EffectTypes.FRAGMENT); di3D.removeAll(); diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java index 1b791a2..d769519 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.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.DistortedObjectTree; +import org.distorted.library.DistortedTree; import org.distorted.library.EffectTypes; import org.distorted.library.type.Dynamic1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static1D; import org.distorted.library.Distorted; import org.distorted.library.GridFlat; -import org.distorted.library.DistortedEffectQueues; import org.distorted.library.DistortedTexture; import android.graphics.Bitmap; @@ -52,7 +52,7 @@ class OlimpicRenderer implements GLSurfaceView.Renderer private static final int NUM_LEAVES = 8; private GLSurfaceView mView; - private DistortedObjectTree mRoot; + private DistortedTree mRoot; private DistortedTexture mLeaf; private DistortedFramebuffer mScreen; private int mScreenW, mScreenH; @@ -65,18 +65,18 @@ class OlimpicRenderer implements GLSurfaceView.Renderer mLeaf = new DistortedTexture(LEAF_SIZE,LEAF_SIZE); GridFlat grid = new GridFlat(1,1); - DistortedEffectQueues effects = new DistortedEffectQueues(); + DistortedEffects effects = new DistortedEffects(); mScreenW = 9*LEAF_SIZE; mScreenH = 9*LEAF_SIZE; - mRoot = new DistortedObjectTree(new DistortedTexture(mScreenW,mScreenH), effects, grid); + mRoot = new DistortedTree(new DistortedTexture(mScreenW,mScreenH), effects, grid); Dynamic1D rot = new Dynamic1D(5000,0.0f); rot.setMode(Dynamic1D.MODE_JUMP); rot.add(new Static1D( 0)); rot.add(new Static1D(360)); - DistortedObjectTree[] mCircleNode = new DistortedObjectTree[NUM_CIRCLES]; + DistortedTree[] mCircleNode = new DistortedTree[NUM_CIRCLES]; int[] colors = new int[] {0,0,1, 0,0,0, 1,0,0, 1,1,0, 0,1,0}; // blue, black, red, yellow, green int[] positions = new int[] {0,2*LEAF_SIZE, 3*LEAF_SIZE,2*LEAF_SIZE, 6*LEAF_SIZE,2*LEAF_SIZE, 3*LEAF_SIZE/2,9*LEAF_SIZE/2, 9*LEAF_SIZE/2,9*LEAF_SIZE/2}; @@ -89,12 +89,12 @@ class OlimpicRenderer implements GLSurfaceView.Renderer { if( i<=1 ) { - effects = new DistortedEffectQueues(); - mCircleNode[i] = new DistortedObjectTree(new DistortedTexture(3*LEAF_SIZE,3*LEAF_SIZE), effects, grid); + effects = new DistortedEffects(); + mCircleNode[i] = new DistortedTree(new DistortedTexture(3*LEAF_SIZE,3*LEAF_SIZE), effects, grid); for(int j=0; j