commit 59bbb86ab20a1f61e301a9b170535665994c20bd Author: Leszek Koltunski Date: Tue Jun 21 14:02:11 2016 +0100 - Javadoc for EffectNames - make Matrix effects consistent with the rest (center of effect as last parameter!) - bugfix for yesterday's bugfix (we only want to send 'EFFECT_REMOVED' messages if it was really the Application that called 'abortAll' and not when we are cleaning up everything) diff --git a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java index 03bc797..2430e04 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java +++ b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java @@ -118,8 +118,8 @@ class CubesRenderer implements GLSurfaceView.Renderer Static3D center = new Static3D(mCols*SIZE/2,mRows*SIZE/2, 0); - mCubes.quaternion(center, mQuatInt1); - mCubes.quaternion(center, mQuatInt2); + mCubes.quaternion(mQuatInt1, center); + mCubes.quaternion(mQuatInt2, center); Distorted.onSurfaceChanged(width, height); } diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java index e2c93ce..12f06a7 100644 --- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -248,7 +248,7 @@ class DeformRenderer implements GLSurfaceView.Renderer break; case MODE_DEFORM : stretch.deform( mMovingDynamic, touchPoint); break; - case MODE_SHEAR : shearID = stretch.shear(touchPoint, mMovingDynamic); + case MODE_SHEAR : shearID = stretch.shear(mMovingDynamic, touchPoint); break; } } @@ -291,7 +291,7 @@ class DeformRenderer implements GLSurfaceView.Renderer break; case MODE_DEFORM : stretch.deform( mReleasedDynamic, touchPoint); break; - case MODE_SHEAR : shearID = stretch.shear(touchPoint,mReleasedDynamic); + case MODE_SHEAR : shearID = stretch.shear(mReleasedDynamic, touchPoint); break; } } diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java index a283a21..71f1e62 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java @@ -107,8 +107,8 @@ class Effects3DRenderer implements GLSurfaceView.Renderer { case Effects3DActivity.MOVE : mCube.move(mMoveInter) ; break; case Effects3DActivity.SCALE : mCube.scale(mScaleInter) ; break; - case Effects3DActivity.ROTATE: mCube.rotate(mZeroPoint,mDynamicRotate); break; - case Effects3DActivity.SHEAR : mCube.shear(mZeroPoint,mShearInter) ; break; + case Effects3DActivity.ROTATE: mCube.rotate(mDynamicRotate,mZeroPoint); break; + case Effects3DActivity.SHEAR : mCube.shear(mShearInter, mZeroPoint) ; break; } } } diff --git a/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java b/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java index 0d53f62..30f7d76 100644 --- a/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java +++ b/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java @@ -138,7 +138,7 @@ class MacroblockRenderer implements GLSurfaceView.Renderer macroblock.move(diMove); macroblock.scale(diScale); - macroblock.rotate( new Static3D(bmpWidth/2,bmpHeight/2,0), diRotate, new Static3D(0,0,1) ); + macroblock.rotate( diRotate, new Static3D(0,0,1), new Static3D(bmpWidth/2,bmpHeight/2,0) ); Distorted.onSurfaceChanged(width, height); } diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java index 82ad44d..aa271e6 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java @@ -90,7 +90,7 @@ class OlimpicRenderer implements GLSurfaceView.Renderer { tmp = new DistortedBitmap(mLeaf, Distorted.CLONE_BITMAP); mCircleNode[i].attach(tmp); - tmp.rotate(center, new Static1D(j*(360/NUM_LEAVES)), axis); + tmp.rotate( new Static1D(j*(360/NUM_LEAVES)), axis, center ); tmp.move(moveVector); } } @@ -102,7 +102,7 @@ class OlimpicRenderer implements GLSurfaceView.Renderer mScreen.attach(mCircleNode[i]); tmp = (DistortedBitmap)mCircleNode[i].getObject(); tmp.move( new Static3D(positions[2*i], positions[2*i+1], 0) ); - tmp.rotate( center, mRot, axis ); + tmp.rotate( mRot, axis, center ); tmp.chroma( new Static1D(0.8f), new Static3D(colors[3*i],colors[3*i+1], colors[3*i+2]) ); } } diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java index a50a92c..03859f8 100644 --- a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java @@ -110,7 +110,7 @@ class QuaternionRenderer implements GLSurfaceView.Renderer mCube.scale(factor); } - mCube.quaternion( new Static3D(3*SIZE/2,3*SIZE/2,0), mRot); + mCube.quaternion( mRot, new Static3D(3*SIZE/2,3*SIZE/2,0) ); Distorted.onSurfaceChanged(width, height); } diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java index 6976cb2..0b72d95 100644 --- a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java +++ b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java @@ -176,7 +176,7 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener mStars[i].move( new Static3D(randomX,randomY,0) ); mStars[i].scale( new Static3D(randomS,randomS,randomS) ); - mStars[i].rotate( center, new Static1D(randomA), axis); + mStars[i].rotate( new Static1D(randomA), axis, center ); Dynamic1D di = new Dynamic1D(randomTime,0.0f); di.setNoise(0.5f); @@ -372,7 +372,7 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener di.add(new Static3D(screenW/2,-scale*crawlH, 0)); mCrawlBackground.move( new Static3D(0,screenH-backH,0) ); - mCrawlBackground.rotate(new Static3D(screenW/2,backH,0), new Static1D(CRAWL_ANGLE), new Static3D(1,0,0) ); + mCrawlBackground.rotate( new Static1D(CRAWL_ANGLE), new Static3D(1,0,0), new Static3D(screenW/2,backH,0) ); final int transpDist = 5; Static4D region = new Static4D(screenW/2,(1-transpDist)*backH,transpDist*backH,transpDist*backH);