commit e3eab072a39ec1d444762f33262408b2fd214cbf
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Wed Jun 28 12:16:23 2017 +0100

    Simplify Statics.

diff --git a/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java b/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java
index 604ba90..25d04d3 100644
--- a/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java
+++ b/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java
@@ -94,15 +94,15 @@ class CubesSurfaceView extends GLSurfaceView
          case MotionEvent.ACTION_UP  : mX = -1;
                                        mY = -1;
         	                           
-                                       float qx = mRenderer.mQuat1.getX();
-                                       float qy = mRenderer.mQuat1.getY();
-                                       float qz = mRenderer.mQuat1.getZ();
-                                       float qw = mRenderer.mQuat1.getW();
+                                       float qx = mRenderer.mQuat1.get1();
+                                       float qy = mRenderer.mQuat1.get2();
+                                       float qz = mRenderer.mQuat1.get3();
+                                       float qw = mRenderer.mQuat1.get4();
 
-                                       float rx = mRenderer.mQuat2.getX();
-                                       float ry = mRenderer.mQuat2.getY();
-                                       float rz = mRenderer.mQuat2.getZ();
-                                       float rw = mRenderer.mQuat2.getW();
+                                       float rx = mRenderer.mQuat2.get1();
+                                       float ry = mRenderer.mQuat2.get2();
+                                       float rz = mRenderer.mQuat2.get3();
+                                       float rw = mRenderer.mQuat2.get4();
 
                                        // This is quaternion multiplication. (tx,ty,tz,tw)
                                        // is now equal to (qx,qy,qz,qw)*(rx,ry,rz,rw)
diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java
index a58167a..662792a 100644
--- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java
+++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java
@@ -264,11 +264,11 @@ class DeformRenderer implements GLSurfaceView.Renderer
      {
      switch(mMode)
        {
-       case DISTORT: vDistort[0].set(x,y);
+       case DISTORT: vDistort[0].set(x,y,0);
                      break;
-       case DEFORM:  vDeform[0].set(x,y);
+       case DEFORM:  vDeform[0].set(x,y,0);
                      break;
-       case SHEAR:   vShear[0].set( (float)x/(scrWidth/2), (float)y/(scrHeight/2));
+       case SHEAR:   vShear[0].set( (float)x/(scrWidth/2), (float)y/(scrHeight/2), 0);
                      break;
        }
      }
@@ -285,23 +285,23 @@ class DeformRenderer implements GLSurfaceView.Renderer
        {
        case DISTORT: for(int i=1; i<NUM_VECTORS-1; i++)
                        {
-                       vDistort[i].set( vDistort[i-1].getX()*damp, vDistort[i-1].getY()*damp );
+                       vDistort[i].set( vDistort[i-1].get1()*damp, vDistort[i-1].get2()*damp, 0 );
                        }
-                     vDistort[NUM_VECTORS-1].set(0,0);
+                     vDistort[NUM_VECTORS-1].set(0,0,0);
                      stretchEffects.apply(mReleasedDistort);
                      break;
        case DEFORM : for(int i=1; i<NUM_VECTORS-1; i++)
                        {
-                       vDeform[i].set( vDeform[i-1].getX()*damp, vDeform[i-1].getY()*damp );
+                       vDeform[i].set( vDeform[i-1].get1()*damp, vDeform[i-1].get2()*damp, 0 );
                        }
-                     vDeform[NUM_VECTORS-1].set(0,0);
+                     vDeform[NUM_VECTORS-1].set(0,0,0);
                      stretchEffects.apply(mReleasedDeform);
                      break;
        case SHEAR  : for(int i=1; i<NUM_VECTORS-1; i++)
                        {
-                       vShear[i].set( vShear[i-1].getX()*damp, vShear[i-1].getY()*damp );
+                       vShear[i].set( vShear[i-1].get1()*damp, vShear[i-1].get2()*damp, 0 );
                        }
-                     vShear[NUM_VECTORS-1].set(0,0);
+                     vShear[NUM_VECTORS-1].set(0,0,0);
                      stretchEffects.apply(mReleasedShear);
                      break;
        }
diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java b/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java
index 32031f0..b0e5224 100644
--- a/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java
+++ b/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java
@@ -259,7 +259,7 @@ public class DynamicSurfaceView extends GLSurfaceView
       for(int curr=0; curr<len; curr++)
         {      
         p1D = di1D.getPoint(curr);
-        c.drawCircle(p1D.getX(), DynamicRenderer.texH/2 , mSize2, mPaint);
+        c.drawCircle(p1D.get1(), DynamicRenderer.texH/2 , mSize2, mPaint);
         }   
       }
     
@@ -295,7 +295,7 @@ public class DynamicSurfaceView extends GLSurfaceView
       for(int curr=0; curr<len; curr++)
         {      
         p2D = di2D.getPoint(curr);
-        c.drawCircle(p2D.getX(),p2D.getY(), mSize2, mPaint);
+        c.drawCircle(p2D.get1(),p2D.get2(), mSize2, mPaint);
         }
       }
 
@@ -331,7 +331,7 @@ public class DynamicSurfaceView extends GLSurfaceView
       for(int curr=0; curr<len; curr++)
         {      
         p3D = di3D.getPoint(curr);
-        c.drawCircle(p3D.getX(), currentDim==DIM_3DXY ? p3D.getY():p3D.getZ(), mSize2, mPaint);
+        c.drawCircle(p3D.get1(), currentDim==DIM_3DXY ? p3D.get2():p3D.get3(), mSize2, mPaint);
         }   
       }
     
@@ -349,7 +349,7 @@ public class DynamicSurfaceView extends GLSurfaceView
                      for(int g=0; g<len; g++)
                        {
                        p1D = di1D.getPoint(g);  
-                       gx = p1D.getX();
+                       gx = p1D.get1();
                                     
                        if( (x-gx)*(x-gx) < (mAvg*mAvg/100) )
                          {
@@ -375,8 +375,8 @@ public class DynamicSurfaceView extends GLSurfaceView
                      for(int g=0; g<len; g++)
                        {
                        p2D = di2D.getPoint(g);  
-                       gx = p2D.getX();
-                       gy = p2D.getY();
+                       gx = p2D.get1();
+                       gy = p2D.get2();
                                     
                        if( (x-gx)*(x-gx) + (y-gy)*(y-gy) < (mAvg*mAvg/100) )
                          {
@@ -402,9 +402,9 @@ public class DynamicSurfaceView extends GLSurfaceView
                      for(int g=0; g<len; g++)
                        {
                        p3D = di3D.getPoint(g);  
-                       gx = p3D.getX();
-                       gy = p3D.getY();
-                       gz = p3D.getZ();
+                       gx = p3D.get1();
+                       gy = p3D.get2();
+                       gz = p3D.get3();
                                
                      if( currentDim==DIM_3DXY )
                        {
@@ -473,9 +473,9 @@ public class DynamicSurfaceView extends GLSurfaceView
                                                          break;
                                           case DIM_2D  : di2D.setPoint(moving, xDown, yDown);
                                                          break;
-                                          case DIM_3DXY: di3D.setPoint(moving, xDown, yDown, (int)di3D.getPoint(moving).getZ());
+                                          case DIM_3DXY: di3D.setPoint(moving, xDown, yDown, (int)di3D.getPoint(moving).get3());
                                                          break;
-                                          case DIM_3DXZ: di3D.setPoint(moving, xDown, (int)di3D.getPoint(moving).getY(), yDown);
+                                          case DIM_3DXZ: di3D.setPoint(moving, xDown, (int)di3D.getPoint(moving).get2(), yDown);
                                                          break;
                                           }
                                         }                           
diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java b/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
index 10498e3..2f24947 100644
--- a/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
+++ b/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
@@ -240,41 +240,41 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
 
     if( mSta1 !=null )
       {
-      float f1 = ((int)(mSta1.getX()*100))/100.0f;
+      float f1 = ((int)(mSta1.get1()*100))/100.0f;
       text += " "+f1;
       }
 
     if( mSta2 !=null )
       {
-      float f1 = ((int)(mSta2.getX()*100))/100.0f;
-      float f2 = ((int)(mSta2.getY()*100))/100.0f;
+      float f1 = ((int)(mSta2.get1()*100))/100.0f;
+      float f2 = ((int)(mSta2.get2()*100))/100.0f;
       text += " ("+f1+","+f2+")";
       }
 
     if( mSta3 !=null )
       {
-      float f1 = ((int)(mSta3.getX()*100))/100.0f;
-      float f2 = ((int)(mSta3.getY()*100))/100.0f;
-      float f3 = ((int)(mSta3.getZ()*100))/100.0f;
+      float f1 = ((int)(mSta3.get1()*100))/100.0f;
+      float f2 = ((int)(mSta3.get2()*100))/100.0f;
+      float f3 = ((int)(mSta3.get3()*100))/100.0f;
       text += " ("+f1+","+f2+","+f3+")";
       }
 
     if( mSta4 !=null )
       {
-      float f1 = ((int)(mSta4.getX()*100))/100.0f;
-      float f2 = ((int)(mSta4.getY()*100))/100.0f;
-      float f3 = ((int)(mSta4.getZ()*100))/100.0f;
-      float f4 = ((int)(mSta4.getW()*100))/100.0f;
+      float f1 = ((int)(mSta4.get1()*100))/100.0f;
+      float f2 = ((int)(mSta4.get2()*100))/100.0f;
+      float f3 = ((int)(mSta4.get3()*100))/100.0f;
+      float f4 = ((int)(mSta4.get4()*100))/100.0f;
       text += " ("+f1+","+f2+","+f3+","+f4+")";
       }
 
     if( mSta5 !=null )
       {
-      float f1 = ((int)(mSta5.getX()*100))/100.0f;
-      float f2 = ((int)(mSta5.getY()*100))/100.0f;
-      float f3 = ((int)(mSta5.getZ()*100))/100.0f;
-      float f4 = ((int)(mSta5.getW()*100))/100.0f;
-      float f5 = ((int)(mSta5.getV()*100))/100.0f;
+      float f1 = ((int)(mSta5.get1()*100))/100.0f;
+      float f2 = ((int)(mSta5.get2()*100))/100.0f;
+      float f3 = ((int)(mSta5.get3()*100))/100.0f;
+      float f4 = ((int)(mSta5.get4()*100))/100.0f;
+      float f5 = ((int)(mSta5.get5()*100))/100.0f;
       text += " ("+f1+","+f2+","+f3+","+f4+","+f5+")";
       }
 
@@ -307,9 +307,9 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
 
   private void setCenterText()
     {
-    int f0 = (int)mCenterSta.getX();
-    int f1 = (int)mCenterSta.getY();
-    int f2 = (int)mCenterSta.getZ();
+    int f0 = (int)mCenterSta.get1();
+    int f1 = (int)mCenterSta.get2();
+    int f2 = (int)mCenterSta.get3();
 
     mTextCenter.setText("center ("+f0+","+f1+","+f2+")");
     }
@@ -347,10 +347,10 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
 
   private void setRegionText()
     {
-    int f0 = (int)mRegionSta.getX();
-    int f1 = (int)mRegionSta.getY();
-    int f2 = (int)mRegionSta.getZ();
-    int f3 = (int)mRegionSta.getW();
+    int f0 = (int)mRegionSta.get1();
+    int f1 = (int)mRegionSta.get2();
+    int f2 = (int)mRegionSta.get3();
+    int f3 = (int)mRegionSta.get4();
 
     mTextRegion.setText("region ("+f0+","+f1+","+f2+","+f3+")");
     }
@@ -541,7 +541,7 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
       seek[i].setProgress( mInterRegion[i] );
       }
 
-    act.setRegion(mRegionSta.getX(),mRegionSta.getY(),mRegionSta.getZ());
+    act.setRegion(mRegionSta.get1(),mRegionSta.get2(),mRegionSta.get3());
 
     return mRegion;
     }
@@ -574,7 +574,7 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
       seek[i].setProgress( mInterCenter[i] );
       }
 
-    act.setCenter(mCenterSta.getX(),mCenterSta.getY(),mCenterSta.getZ());
+    act.setCenter(mCenterSta.get1(),mCenterSta.get2(),mCenterSta.get3());
 
     return mCenter;
     }
@@ -671,8 +671,8 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
 
       act.setSupportsCenter(mName.supportsCenter());
       act.setSupportsRegion(mName.supportsRegion());
-      act.setCenter(mCenterSta.getX(),mCenterSta.getY(),mCenterSta.getZ());
-      act.setRegion(mRegionSta.getX(),mRegionSta.getY(),mRegionSta.getZ());
+      act.setCenter(mCenterSta.get1(),mCenterSta.get2(),mCenterSta.get3());
+      act.setRegion(mRegionSta.get1(),mRegionSta.get2(),mRegionSta.get3());
       }
     }
 
diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DSurfaceView.java b/src/main/java/org/distorted/examples/effects3d/Effects3DSurfaceView.java
index d02b65d..c7dd007 100644
--- a/src/main/java/org/distorted/examples/effects3d/Effects3DSurfaceView.java
+++ b/src/main/java/org/distorted/examples/effects3d/Effects3DSurfaceView.java
@@ -95,15 +95,15 @@ class Effects3DSurfaceView extends GLSurfaceView
       case MotionEvent.ACTION_UP  : mX = -1;
                                     mY = -1;
 
-                                    float qx = mRenderer.mQuat1.getX();
-                                    float qy = mRenderer.mQuat1.getY();
-                                    float qz = mRenderer.mQuat1.getZ();
-                                    float qw = mRenderer.mQuat1.getW();
-
-                                    float rx = mRenderer.mQuat2.getX();
-                                    float ry = mRenderer.mQuat2.getY();
-                                    float rz = mRenderer.mQuat2.getZ();
-                                    float rw = mRenderer.mQuat2.getW();
+                                    float qx = mRenderer.mQuat1.get1();
+                                    float qy = mRenderer.mQuat1.get2();
+                                    float qz = mRenderer.mQuat1.get3();
+                                    float qw = mRenderer.mQuat1.get4();
+
+                                    float rx = mRenderer.mQuat2.get1();
+                                    float ry = mRenderer.mQuat2.get2();
+                                    float rz = mRenderer.mQuat2.get3();
+                                    float rw = mRenderer.mQuat2.get4();
 
                                     float tx = rw*qx - rz*qy + ry*qz + rx*qw;
                                     float ty = rw*qy + rz*qx + ry*qw - rx*qz;
diff --git a/src/main/java/org/distorted/examples/flag/FlagActivity.java b/src/main/java/org/distorted/examples/flag/FlagActivity.java
index 10bef8a..f6f64cf 100644
--- a/src/main/java/org/distorted/examples/flag/FlagActivity.java
+++ b/src/main/java/org/distorted/examples/flag/FlagActivity.java
@@ -83,10 +83,10 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis
       barNoiseAngleA.setOnSeekBarChangeListener(this);
       barNoiseAngleB.setOnSeekBarChangeListener(this);
 
-      barNoiseAmplitude.setProgress( (int)mNoise.getX() );
-      barNoiseLength.setProgress   ( (int)mNoise.getY() );
-      barNoiseAngleA.setProgress   ( (int)mNoise.getW() );
-      barNoiseAngleB.setProgress   ( (int)mNoise.getV() );
+      barNoiseAmplitude.setProgress( (int)mNoise.get1() );
+      barNoiseLength.setProgress   ( (int)mNoise.get2() );
+      barNoiseAngleA.setProgress   ( (int)mNoise.get4() );
+      barNoiseAngleB.setProgress   ( (int)mNoise.get5() );
 
       textNoiseAmplitude.setText(getString(R.string.noise_placeholder,"0.00"));
       textNoiseLength.setText(getString(R.string.noise_placeholder,"0.00"));
diff --git a/src/main/java/org/distorted/examples/flag/FlagSurfaceView.java b/src/main/java/org/distorted/examples/flag/FlagSurfaceView.java
index a30d692..5460bf9 100644
--- a/src/main/java/org/distorted/examples/flag/FlagSurfaceView.java
+++ b/src/main/java/org/distorted/examples/flag/FlagSurfaceView.java
@@ -97,15 +97,15 @@ class FlagSurfaceView extends GLSurfaceView
          case MotionEvent.ACTION_UP  : mX = -1;
                                        mY = -1;
         	                           
-                                       float qx = mRenderer.mQuat1.getX();
-                                       float qy = mRenderer.mQuat1.getY();
-                                       float qz = mRenderer.mQuat1.getZ();
-                                       float qw = mRenderer.mQuat1.getW();
+                                       float qx = mRenderer.mQuat1.get1();
+                                       float qy = mRenderer.mQuat1.get2();
+                                       float qz = mRenderer.mQuat1.get3();
+                                       float qw = mRenderer.mQuat1.get4();
 
-                                       float rx = mRenderer.mQuat2.getX();
-                                       float ry = mRenderer.mQuat2.getY();
-                                       float rz = mRenderer.mQuat2.getZ();
-                                       float rw = mRenderer.mQuat2.getW();
+                                       float rx = mRenderer.mQuat2.get1();
+                                       float ry = mRenderer.mQuat2.get2();
+                                       float rz = mRenderer.mQuat2.get3();
+                                       float rw = mRenderer.mQuat2.get4();
 
                                        // This is quaternion multiplication. (tx.ty.tz.tw)
                                        // is now equal to (qx,qy,qz,qw)*(rx,ry,rz,rw)
diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java
index 039c04d..9f9b1aa 100644
--- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java
+++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java
@@ -249,41 +249,41 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
 
     if( mSta1 !=null )
       {
-      float f1 = ((int)(mSta1.getX()*100))/100.0f;
+      float f1 = ((int)(mSta1.get1()*100))/100.0f;
       text += " "+f1;
       }
 
     if( mSta2 !=null )
       {
-      float f1 = ((int)(mSta2.getX()*100))/100.0f;
-      float f2 = ((int)(mSta2.getY()*100))/100.0f;
+      float f1 = ((int)(mSta2.get1()*100))/100.0f;
+      float f2 = ((int)(mSta2.get2()*100))/100.0f;
       text += " ("+f1+","+f2+")";
       }
 
     if( mSta3 !=null )
       {
-      float f1 = ((int)(mSta3.getX()*100))/100.0f;
-      float f2 = ((int)(mSta3.getY()*100))/100.0f;
-      float f3 = ((int)(mSta3.getZ()*100))/100.0f;
+      float f1 = ((int)(mSta3.get1()*100))/100.0f;
+      float f2 = ((int)(mSta3.get2()*100))/100.0f;
+      float f3 = ((int)(mSta3.get3()*100))/100.0f;
       text += " ("+f1+","+f2+","+f3+")";
       }
 
     if( mSta4 !=null )
       {
-      float f1 = ((int)(mSta4.getX()*100))/100.0f;
-      float f2 = ((int)(mSta4.getY()*100))/100.0f;
-      float f3 = ((int)(mSta4.getZ()*100))/100.0f;
-      float f4 = ((int)(mSta4.getW()*100))/100.0f;
+      float f1 = ((int)(mSta4.get1()*100))/100.0f;
+      float f2 = ((int)(mSta4.get2()*100))/100.0f;
+      float f3 = ((int)(mSta4.get3()*100))/100.0f;
+      float f4 = ((int)(mSta4.get4()*100))/100.0f;
       text += " ("+f1+","+f2+","+f3+","+f4+")";
       }
 
     if( mSta5 !=null )
       {
-      float f1 = ((int)(mSta5.getX()*100))/100.0f;
-      float f2 = ((int)(mSta5.getY()*100))/100.0f;
-      float f3 = ((int)(mSta5.getZ()*100))/100.0f;
-      float f4 = ((int)(mSta5.getW()*100))/100.0f;
-      float f5 = ((int)(mSta5.getV()*100))/100.0f;
+      float f1 = ((int)(mSta5.get1()*100))/100.0f;
+      float f2 = ((int)(mSta5.get2()*100))/100.0f;
+      float f3 = ((int)(mSta5.get3()*100))/100.0f;
+      float f4 = ((int)(mSta5.get4()*100))/100.0f;
+      float f5 = ((int)(mSta5.get5()*100))/100.0f;
       text += " ("+f1+","+f2+","+f3+","+f4+","+f5+")";
       }
 
@@ -316,9 +316,9 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
 
   private void setCenterText()
     {
-    int f0 = (int)mCenterSta.getX();
-    int f1 = (int)mCenterSta.getY();
-    int f2 = (int)mCenterSta.getZ();
+    int f0 = (int)mCenterSta.get1();
+    int f1 = (int)mCenterSta.get2();
+    int f2 = (int)mCenterSta.get3();
 
     mTextCenter.setText("center ("+f0+","+f1+","+f2+")");
     }
@@ -356,10 +356,10 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
 
   private void setRegionText()
     {
-    int f0 = (int)mRegionSta.getX();
-    int f1 = (int)mRegionSta.getY();
-    int f2 = (int)mRegionSta.getZ();
-    int f3 = (int)mRegionSta.getW();
+    int f0 = (int)mRegionSta.get1();
+    int f1 = (int)mRegionSta.get2();
+    int f2 = (int)mRegionSta.get3();
+    int f3 = (int)mRegionSta.get4();
 
     mTextRegion.setText("region ("+f0+","+f1+","+f2+","+f3+")");
     }
@@ -550,7 +550,7 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
       seek[i].setProgress( mInterRegion[i] );
       }
 
-    act.setRegion(mRegionSta.getX(),mRegionSta.getY(),mRegionSta.getZ());
+    act.setRegion(mRegionSta.get1(),mRegionSta.get2(),mRegionSta.get3());
 
     return mRegion;
     }
@@ -583,7 +583,7 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
       seek[i].setProgress( mInterCenter[i] );
       }
 
-    act.setCenter(mCenterSta.getX(),mCenterSta.getY(),mCenterSta.getZ());
+    act.setCenter(mCenterSta.get1(),mCenterSta.get2(),mCenterSta.get3());
 
     return mCenter;
     }
@@ -674,8 +674,8 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
 
       Matrix3DActivity act = mAct.get();
 
-      act.setCenter(mCenterSta.getX(),mCenterSta.getY(),mCenterSta.getZ());
-      act.setRegion(mRegionSta.getX(),mRegionSta.getY(),mRegionSta.getZ());
+      act.setCenter(mCenterSta.get1(),mCenterSta.get2(),mCenterSta.get3());
+      act.setRegion(mRegionSta.get1(),mRegionSta.get2(),mRegionSta.get3());
       }
     }
 
diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
index 38787f0..74bd9a1 100644
--- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
+++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
@@ -259,7 +259,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
         for(int curr=0; curr<len; curr++)
           {       
           cu = mCenterVertex.getPoint(curr);
-          c.drawCircle(cu.getX(), cu.getY(), mSize2, mPaint);
+          c.drawCircle(cu.get1(), cu.get2(), mSize2, mPaint);
           }
         
         if( time-mTime > LOOP_TIME ) mTime = time;
@@ -280,16 +280,16 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
                                       yDown = (int)event.getY();
                                     
                                       float gx, gy;
-                                      Static2D dv;
+                                      Static3D dv;
                                       int len = mCenterVertex.getNumPoints();
                                  
                                       for(int g=0; g<len; g++)
                                         {
                                         dv = mCenterVertex.getPoint(g);
-                                        gx = dv.getX();
-                                        gy = dv.getY();
+                                        gx = dv.get1();
+                                        gy = dv.get2();
 
-                                        float Z = mDistort.getZ()/10;
+                                        float Z = mDistort.get3()/10;
 
                                         if( (xDown-gx)*(xDown-gx) + (yDown-gy)*(yDown-gy) < Z*Z )
                                           {
diff --git a/src/main/java/org/distorted/examples/multiblur/MultiblurSurfaceView.java b/src/main/java/org/distorted/examples/multiblur/MultiblurSurfaceView.java
index a4fbe85..b6276b9 100644
--- a/src/main/java/org/distorted/examples/multiblur/MultiblurSurfaceView.java
+++ b/src/main/java/org/distorted/examples/multiblur/MultiblurSurfaceView.java
@@ -101,15 +101,15 @@ class MultiblurSurfaceView extends GLSurfaceView
          case MotionEvent.ACTION_UP  : mX = -1;
                                        mY = -1;
         	                           
-                                       float qx = mRenderer.mQuat1.getX();
-                                       float qy = mRenderer.mQuat1.getY();
-                                       float qz = mRenderer.mQuat1.getZ();
-                                       float qw = mRenderer.mQuat1.getW();
+                                       float qx = mRenderer.mQuat1.get1();
+                                       float qy = mRenderer.mQuat1.get2();
+                                       float qz = mRenderer.mQuat1.get3();
+                                       float qw = mRenderer.mQuat1.get4();
 
-                                       float rx = mRenderer.mQuat2.getX();
-                                       float ry = mRenderer.mQuat2.getY();
-                                       float rz = mRenderer.mQuat2.getZ();
-                                       float rw = mRenderer.mQuat2.getW();
+                                       float rx = mRenderer.mQuat2.get1();
+                                       float ry = mRenderer.mQuat2.get2();
+                                       float rz = mRenderer.mQuat2.get3();
+                                       float rw = mRenderer.mQuat2.get4();
 
                                        // This is quaternion multiplication. (tx,ty,tz,tw)
                                        // is now equal to (qx,qy,qz,qw)*(rx,ry,rz,rw)