commit f2085b96610cb9cba82afe4a2f75f8a5401dc180
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Aug 28 01:37:57 2020 +0100

    Rename Meshes.

diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java
index 6d0280e..1fca2e4 100644
--- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java
+++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java
@@ -36,7 +36,7 @@ import org.distorted.library.effect.VertexEffectSwirl;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.type.Static3D;
 
@@ -54,7 +54,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer, DistortedLibrary
    private DistortedEffects mEffects;
    private DistortedTexture mTexture;
    private DistortedScreen mScreen;
-   private MeshRectangles mMesh;
+   private MeshSquare mMesh;
    private AroundTheWorldEffectsManager mManager;
    private Static3D mScaleMatrix, mScaleVertex;
 
@@ -130,7 +130,7 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer, DistortedLibrary
       if( mTexture==null ) mTexture = new DistortedTexture();
       mTexture.setTexture(bitmap);
 
-      if( mMesh==null ) mMesh = new MeshRectangles(30,30*objHeight/objWidth);
+      if( mMesh==null ) mMesh = new MeshSquare(30,30*objHeight/objWidth);
 
       mScreen.detachAll();
       mScreen.attach(mTexture, mEffects, mMesh);
diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java
index 004e40c..4e6ce75 100644
--- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java
+++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java
@@ -33,7 +33,7 @@ import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedTexture;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.type.Dynamic3D;
 import org.distorted.library.type.Static3D;
 import org.distorted.library.type.Static4D;
@@ -50,7 +50,7 @@ class BeanRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
    private DistortedEffects mEffects;
    private DistortedScreen mScreen;
    private DistortedTexture mTexture;
-   private MeshRectangles mMesh;
+   private MeshSquare mMesh;
    private Static3D mScale;
    private float mBmpRatio;
 
@@ -155,7 +155,7 @@ class BeanRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
 
      yLoc[height] = (height-(height-1)*PART)/height;
 
-     if( mMesh==null ) mMesh = new MeshRectangles(xLoc,yLoc);
+     if( mMesh==null ) mMesh = new MeshSquare(xLoc,yLoc);
 
      mScreen.detachAll();
      mScreen.attach(mTexture,mEffects,mMesh);
diff --git a/src/main/java/org/distorted/examples/blur/BlurRenderer.java b/src/main/java/org/distorted/examples/blur/BlurRenderer.java
index 2552d09..2f0574d 100644
--- a/src/main/java/org/distorted/examples/blur/BlurRenderer.java
+++ b/src/main/java/org/distorted/examples/blur/BlurRenderer.java
@@ -32,7 +32,7 @@ import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedFramebuffer;
 import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.type.Dynamic2D;
 import org.distorted.library.type.Static2D;
 import org.distorted.library.type.Static3D;
@@ -55,7 +55,7 @@ class BlurRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
     private DistortedEffects mEffects, mBufferEffects;
     private DistortedScreen mScreen;
     private DistortedFramebuffer mBuffer;
-    private MeshRectangles mMesh, mMeshBuffer;
+    private MeshSquare mMesh, mMeshBuffer;
     private Static2D mHaloRadiusSta;
     private Static3D mMove, mScale, mBufferScale;
 
@@ -64,8 +64,8 @@ class BlurRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
    BlurRenderer(GLSurfaceView v)
       {
       mView       = v;
-      mMesh       = new MeshRectangles(1,1);
-      mMeshBuffer = new MeshRectangles(1,1);
+      mMesh       = new MeshSquare(1,1);
+      mMeshBuffer = new MeshSquare(1,1);
       mScreen     = new DistortedScreen();
       mBuffer     = new DistortedFramebuffer(SIZE,SIZE,1, DistortedFramebuffer.NO_DEPTH_NO_STENCIL);
 
diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java
index 079d5dd..c50e31c 100644
--- a/src/main/java/org/distorted/examples/check/CheckRenderer.java
+++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java
@@ -37,7 +37,7 @@ import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.type.Dynamic3D;
 import org.distorted.library.type.Static1D;
 import org.distorted.library.type.Static3D;
@@ -63,7 +63,7 @@ class CheckRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exceptio
     private GLSurfaceView mView;
     private DistortedEffects mEffects;
     private DistortedTexture mTexture;
-    private MeshRectangles mMesh;
+    private MeshSquare mMesh;
     private DistortedScreen mScreen;
     private int mObjHeight, mObjWidth;
     private Static3D mScaleMatrix, mScaleVertex, mSwirl1, mSwirl2, mDeform1, mDeform2;
@@ -189,7 +189,7 @@ class CheckRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exceptio
       mRadius.set(mObjWidth*0.5f);
       mScaleVertex.set(mObjWidth,mObjHeight,0);
 
-      if( mMesh   ==null ) mMesh = new MeshRectangles(30,30*mObjHeight/mObjWidth);
+      if( mMesh   ==null ) mMesh = new MeshSquare(30,30*mObjHeight/mObjWidth);
       if( mTexture==null ) mTexture = new DistortedTexture();
       mTexture.setTexture(bitmap);
 
diff --git a/src/main/java/org/distorted/examples/deferredjob/DeferredJobRenderer.java b/src/main/java/org/distorted/examples/deferredjob/DeferredJobRenderer.java
index ef13f61..3732595 100644
--- a/src/main/java/org/distorted/examples/deferredjob/DeferredJobRenderer.java
+++ b/src/main/java/org/distorted/examples/deferredjob/DeferredJobRenderer.java
@@ -36,7 +36,7 @@ import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.mesh.MeshBase;
 import org.distorted.library.mesh.MeshJoined;
-import org.distorted.library.mesh.MeshTriangles;
+import org.distorted.library.mesh.MeshTriangle;
 import org.distorted.library.type.Dynamic1D;
 import org.distorted.library.type.DynamicQuat;
 import org.distorted.library.type.Static1D;
@@ -160,10 +160,10 @@ class DeferredJobRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Ex
       {
       final int MESHES=4;
 
-      MeshBase[] meshes = new MeshTriangles[MESHES];
+      MeshBase[] meshes = new MeshTriangle[MESHES];
       VertexEffectMove[] moveEffect = new VertexEffectMove[MESHES];
 
-      meshes[0] = new MeshTriangles(1);
+      meshes[0] = new MeshTriangle(1);
       meshes[0].setEffectAssociation(0,1,0);
 
       for(int i=1; i<MESHES; i++)
diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java
index b7716ff..c831e00 100644
--- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java
+++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java
@@ -32,7 +32,7 @@ import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.mesh.MeshBase;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 
 import org.distorted.library.message.EffectListener;
 import org.distorted.library.type.Dynamic3D;
@@ -198,7 +198,7 @@ class DeformRenderer implements GLSurfaceView.Renderer, EffectListener, Distorte
      textureHeight= (int)(0.6f*height);
 
      if( mMesh!=null ) mMesh.markForDeletion();
-     mMesh = new MeshRectangles(50,50*textureHeight/textureWidth);
+     mMesh = new MeshSquare(50,50*textureHeight/textureWidth);
 
      mScale.set(textureWidth,textureHeight,1);
 
diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java
index 5669c22..e794aeb 100644
--- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java
+++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java
@@ -36,7 +36,7 @@ import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.main.DistortedEffects;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.type.Dynamic3D;
 import org.distorted.library.type.Static1D;
 import org.distorted.library.type.Static3D;
@@ -56,7 +56,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer, DistortedLibra
    private GLSurfaceView mView;
    private DistortedEffects[] mEffects;
    private DistortedTexture[] mTexture;
-   private MeshRectangles mMesh;
+   private MeshSquare mMesh;
    private DistortedScreen mScreen;
    private Static3D mScaleMatrix, mScaleVertex;
    private Static3D[] mMove;
@@ -159,7 +159,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer, DistortedLibra
        mTexture[i].setTexture(bmp[i]);
        }
 
-     if( mMesh==null ) mMesh = new MeshRectangles(30,30*bmpHeight/bmpWidth);
+     if( mMesh==null ) mMesh = new MeshSquare(30,30*bmpHeight/bmpWidth);
 
      mScreen.detachAll();
      for(int i=NUM-1; i>=0; i--) mScreen.attach(mTexture[i], mEffects[i], mMesh);
diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java
index 676064c..bf9b0e0 100644
--- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java
+++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java
@@ -36,7 +36,7 @@ import org.distorted.library.effect.VertexEffectSink;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.type.Dynamic1D;
 import org.distorted.library.type.Dynamic3D;
@@ -57,7 +57,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer, DistortedLibra
    private GLSurfaceView mView;
    private DistortedEffects[] mEffects;
    private DistortedTexture mTexture;
-   private MeshRectangles mMesh;
+   private MeshSquare mMesh;
    private DistortedScreen mScreen;
    private Static3D mScale, mScaleBitmap;
    private Static3D[] mMove;
@@ -176,7 +176,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer, DistortedLibra
 
      mScaleBitmap.set(mBmpWidth,mBmpHeight,0);
 
-     if( mMesh   ==null ) mMesh = new MeshRectangles(30,30*mBmpHeight/mBmpWidth);
+     if( mMesh   ==null ) mMesh = new MeshSquare(30,30*mBmpHeight/mBmpWidth);
      if( mTexture==null ) mTexture  = new DistortedTexture();
      mTexture.setTexture(bitmap);
 
diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java
index 781c0f8..74092b4 100644
--- a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java
+++ b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java
@@ -31,7 +31,7 @@ import android.opengl.GLSurfaceView;
 import org.distorted.library.effect.MatrixEffectScale;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.type.Static3D;
@@ -44,7 +44,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Except
    private DistortedTexture mTexture;
    private DistortedEffects mEffects;
    private DistortedScreen mScreen;
-   private MeshRectangles mMesh;
+   private MeshSquare mMesh;
    private Canvas mCanvas;
    private Bitmap mBitmap;
    private Paint mPaint;
@@ -62,7 +62,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Except
      mPaint.setStyle(Style.FILL);
       
      mView    = v;
-     mMesh    = new MeshRectangles(1,1);
+     mMesh    = new MeshSquare(1,1);
      mScreen  = new DistortedScreen();
      mEffects = new DistortedEffects();
      mTexture = new DistortedTexture();
diff --git a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java
index 35e49d6..8d54b1d 100644
--- a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java
+++ b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java
@@ -37,7 +37,7 @@ import org.distorted.library.effect.VertexEffectSink;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.message.EffectListener;
 import org.distorted.library.type.Static3D;
@@ -57,7 +57,7 @@ class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener, Dis
   private Static3D mScale;
 
   private DistortedTexture mTexture;
-  private MeshRectangles mMesh;
+  private MeshSquare mMesh;
   private DistortedEffects mEffects;
   private DistortedScreen mScreen;
 
@@ -77,7 +77,7 @@ class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener, Dis
     mScale = new Static3D(1,1,1);
     MatrixEffectScale scaleEffect = new MatrixEffectScale(mScale);
 
-    mMesh = new MeshRectangles(MESH_QUALITY,MESH_QUALITY*texHeight/texWidth);
+    mMesh = new MeshSquare(MESH_QUALITY,MESH_QUALITY*texHeight/texWidth);
 
     mTexture = new DistortedTexture();
     mEffects = new DistortedEffects();
diff --git a/src/main/java/org/distorted/examples/generic/GenericMeshList.java b/src/main/java/org/distorted/examples/generic/GenericMeshList.java
index aef2b8d..a3d056c 100644
--- a/src/main/java/org/distorted/examples/generic/GenericMeshList.java
+++ b/src/main/java/org/distorted/examples/generic/GenericMeshList.java
@@ -22,9 +22,9 @@ package org.distorted.examples.generic;
 import org.distorted.library.mesh.MeshBase;
 import org.distorted.library.mesh.MeshCubes;
 import org.distorted.library.mesh.MeshQuad;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.mesh.MeshSphere;
-import org.distorted.library.mesh.MeshTriangles;
+import org.distorted.library.mesh.MeshTriangle;
 import org.distorted.library.type.Static4D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -162,13 +162,13 @@ public enum GenericMeshList
                          mesh = new MeshCubes(cols, str, slic, mapFB, mapFB, mapLR, mapLR, mapTB, mapTB);
                          }
                        break;
-      case Rectangles: mesh = new MeshRectangles(cols,rows);
+      case Rectangles: mesh = new MeshSquare(cols,rows);
                        break;
       case Sphere    : mesh = new MeshSphere(rows);
                        break;
       case Quad      : mesh = new MeshQuad();
                        break;
-      case Triangles : mesh = new MeshTriangles(rows);
+      case Triangles : mesh = new MeshTriangle(rows);
                        break;
       default:         mesh = null;
                        android.util.Log.e("Meshes", "Error: unimplemented Mesh!");
diff --git a/src/main/java/org/distorted/examples/girl/GirlRenderer.java b/src/main/java/org/distorted/examples/girl/GirlRenderer.java
index 0002872..33a79a1 100644
--- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java
+++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java
@@ -35,7 +35,7 @@ import org.distorted.library.effect.VertexEffectSink;
 import org.distorted.library.effect.VertexEffectSwirl;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.type.Dynamic1D;
@@ -56,7 +56,7 @@ class GirlRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
     private DistortedEffects mEffects;
     private DistortedScreen mScreen;
     private DistortedTexture mTexture;
-    private MeshRectangles mMesh;
+    private MeshSquare mMesh;
     private Static3D v0,v1,v2,v3;
     private Static1D dBegin, dMiddle, dEnd, s0;
     private Static3D mScaleMatrix, mScaleVertex;
@@ -200,7 +200,7 @@ class GirlRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
 
      mScaleVertex.set(1.0f,mBmpRatio,1.0f);
 
-     if( mMesh==null ) mMesh = new MeshRectangles(30, (int)(30*mBmpRatio));
+     if( mMesh==null ) mMesh = new MeshSquare(30, (int)(30*mBmpRatio));
 
      mScreen.detachAll();
      mScreen.attach(mTexture,mEffects,mMesh);
diff --git a/src/main/java/org/distorted/examples/inflate/InflateMeshList.java b/src/main/java/org/distorted/examples/inflate/InflateMeshList.java
index fd3d9f3..b5fcde9 100644
--- a/src/main/java/org/distorted/examples/inflate/InflateMeshList.java
+++ b/src/main/java/org/distorted/examples/inflate/InflateMeshList.java
@@ -22,9 +22,9 @@ package org.distorted.examples.inflate;
 import org.distorted.library.mesh.MeshBase;
 import org.distorted.library.mesh.MeshCubes;
 import org.distorted.library.mesh.MeshQuad;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.mesh.MeshSphere;
-import org.distorted.library.mesh.MeshTriangles;
+import org.distorted.library.mesh.MeshTriangle;
 import org.distorted.library.type.Static4D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -162,13 +162,13 @@ public enum InflateMeshList
                          mesh = new MeshCubes(cols, str, slic, mapFB, mapFB, mapLR, mapLR, mapTB, mapTB);
                          }
                        break;
-      case Rectangles: mesh = new MeshRectangles(cols,rows);
+      case Rectangles: mesh = new MeshSquare(cols,rows);
                        break;
       case Sphere    : mesh = new MeshSphere(rows);
                        break;
       case Quad      : mesh = new MeshQuad();
                        break;
-      case Triangles : mesh = new MeshTriangles(rows);
+      case Triangles : mesh = new MeshTriangle(rows);
                        break;
       default:         mesh = null;
                        android.util.Log.e("Meshes", "Error: unimplemented Mesh!");
diff --git a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java
index 873ac29..81733f2 100644
--- a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java
+++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java
@@ -33,7 +33,7 @@ import org.distorted.library.effect.MatrixEffectScale;
 import org.distorted.library.effect.VertexEffectDistort;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.type.Dynamic3D;
@@ -56,7 +56,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer, EffectListener, Distor
    private DistortedEffects mEffects;
    private DistortedScreen mScreen;
    private DistortedTexture mTexture;
-   private MeshRectangles mMesh;
+   private MeshSquare mMesh;
    private Random mRnd;
    private Static3D mScale;
    private float mBmpRatio;
@@ -168,7 +168,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer, EffectListener, Distor
      mBmpRatio = (float)bitmap.getHeight()/bitmap.getWidth();
      mTexture.setTexture(bitmap);
 
-     if( mMesh==null ) mMesh = new MeshRectangles(50, (int)(50*mBmpRatio) );
+     if( mMesh==null ) mMesh = new MeshSquare(50, (int)(50*mBmpRatio) );
 
      mScreen.detachAll();
      mScreen.attach(mTexture,mEffects,mMesh);
diff --git a/src/main/java/org/distorted/examples/meshjoin/MeshJoinRenderer.java b/src/main/java/org/distorted/examples/meshjoin/MeshJoinRenderer.java
index 853bbb6..b872244 100644
--- a/src/main/java/org/distorted/examples/meshjoin/MeshJoinRenderer.java
+++ b/src/main/java/org/distorted/examples/meshjoin/MeshJoinRenderer.java
@@ -38,7 +38,7 @@ import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.mesh.MeshBase;
 import org.distorted.library.mesh.MeshJoined;
-import org.distorted.library.mesh.MeshTriangles;
+import org.distorted.library.mesh.MeshTriangle;
 import org.distorted.library.type.Dynamic1D;
 import org.distorted.library.type.DynamicQuat;
 import org.distorted.library.type.Static1D;
@@ -210,11 +210,11 @@ class MeshJoinRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Excep
       final int MESHES=4;
 
       int andAssoc = 1;
-      MeshBase[] meshes = new MeshTriangles[MESHES];
+      MeshBase[] meshes = new MeshTriangle[MESHES];
 
       for(int i=0; i<MESHES; i++)
         {
-        meshes[i] = new MeshTriangles(5);
+        meshes[i] = new MeshTriangle(5);
         meshes[i].setEffectAssociation(0,andAssoc,0);
         andAssoc <<= 1;
         }
diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java
index bf89f1d..99bb6c6 100644
--- a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java
+++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java
@@ -32,7 +32,7 @@ import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.type.Dynamic3D;
 import org.distorted.library.type.Static3D;
 import org.distorted.library.type.Static4D;
@@ -48,7 +48,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Excep
     private GLSurfaceView mView;
     private DistortedEffects mEffects;
     private DistortedTexture mTexture;
-    private MeshRectangles mMesh;
+    private MeshSquare mMesh;
     private DistortedScreen mScreen;
     private Static3D mScale;
     private float mBmpRatio;
@@ -146,7 +146,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Excep
       // effect to have vertices to distort. We multiply by mBmpRatio here so
       // that the Mesh's cells are as close to squares as possible (when they
       // finally be rendered with a Scale - see mScale)
-      if( mMesh==null ) mMesh = new MeshRectangles(9, (int)(9*mBmpRatio) );
+      if( mMesh==null ) mMesh = new MeshSquare(9, (int)(9*mBmpRatio) );
 
       // Every time activity goes to background, its OpenGL resources - including
       // Textures - get deleted. We always need to call setTexture() here to
diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
index 71414fb..bb2cbb6 100644
--- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
+++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
@@ -41,7 +41,7 @@ import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.main.DistortedEffects;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.type.Static3D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -57,7 +57,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer, DistortedLibrary.
    private DistortedEffects mEffects;
    private DistortedTexture mTexture;
    private DistortedScreen mScreen;
-   private MeshRectangles mMesh;
+   private MeshSquare mMesh;
    private boolean mRefresh;
    private Static3D mScaleMatrix, mScaleVertex;
 
@@ -157,7 +157,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer, DistortedLibrary.
      mCanvas  = new Canvas(mBitmap);
 
      if( mMesh!=null ) mMesh.markForDeletion();
-     mMesh = new MeshRectangles(80,80*texH/texW);
+     mMesh = new MeshSquare(80,80*texH/texW);
 
      mScreen.detachAll();
      mScreen.attach(mTexture,mEffects,mMesh);
diff --git a/src/main/java/org/distorted/examples/predeform/PredeformMeshList.java b/src/main/java/org/distorted/examples/predeform/PredeformMeshList.java
index 393e66b..76d26e6 100644
--- a/src/main/java/org/distorted/examples/predeform/PredeformMeshList.java
+++ b/src/main/java/org/distorted/examples/predeform/PredeformMeshList.java
@@ -22,9 +22,9 @@ package org.distorted.examples.predeform;
 import org.distorted.library.mesh.MeshBase;
 import org.distorted.library.mesh.MeshCubes;
 import org.distorted.library.mesh.MeshQuad;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.mesh.MeshSphere;
-import org.distorted.library.mesh.MeshTriangles;
+import org.distorted.library.mesh.MeshTriangle;
 import org.distorted.library.type.Static4D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -162,13 +162,13 @@ public enum PredeformMeshList
                          mesh = new MeshCubes(cols, str, slic, mapFB, mapFB, mapLR, mapLR, mapTB, mapTB);
                          }
                        break;
-      case Rectangles: mesh = new MeshRectangles(cols,rows);
+      case Rectangles: mesh = new MeshSquare(cols,rows);
                        break;
       case Sphere    : mesh = new MeshSphere(rows);
                        break;
       case Quad      : mesh = new MeshQuad();
                        break;
-      case Triangles : mesh = new MeshTriangles(rows);
+      case Triangles : mesh = new MeshTriangle(rows);
                        break;
       default:         mesh = null;
                        android.util.Log.e("Meshes", "Error: unimplemented Mesh!");
diff --git a/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java b/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java
index 9d4bfe4..bcfa539 100644
--- a/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java
+++ b/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java
@@ -27,7 +27,7 @@ import org.distorted.library.effect.VertexEffectDeform;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.type.Static1D;
 import org.distorted.library.type.Static3D;
@@ -46,7 +46,7 @@ class ProjectionRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exc
    private GLSurfaceView mView;
    private DistortedEffects mEffects;
    private DistortedScreen mScreen;
-   private MeshRectangles mMesh;
+   private MeshSquare mMesh;
    private DistortedTexture mTexture;
    private float mF, mNear;
    private Static3D mScale;
@@ -133,7 +133,7 @@ class ProjectionRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exc
       mTexture.setTexture(bmp);
 
       if( mMesh!=null )  mMesh.markForDeletion();
-      mMesh = new MeshRectangles(100,100*height/width);
+      mMesh = new MeshSquare(100,100*height/width);
 
       mScreen.detachAll();
       mScreen.attach(mTexture,mEffects,mMesh);
diff --git a/src/main/java/org/distorted/examples/save/SaveRenderer.java b/src/main/java/org/distorted/examples/save/SaveRenderer.java
index 5ade8bd..2522d86 100644
--- a/src/main/java/org/distorted/examples/save/SaveRenderer.java
+++ b/src/main/java/org/distorted/examples/save/SaveRenderer.java
@@ -37,7 +37,7 @@ import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedFramebuffer;
 import org.distorted.library.type.Dynamic1D;
 import org.distorted.library.type.Static1D;
@@ -58,7 +58,7 @@ class SaveRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
   private DistortedEffects mEffects;
   private DistortedFramebuffer mOffscreen;
   private DistortedTexture mTexture;
-  private MeshRectangles mMesh;
+  private MeshSquare mMesh;
   private DistortedScreen mScreen;
   private Static1D s0;
   private Static3D mScaleFactor, mScaleMain, mScaleVertex;
@@ -234,7 +234,7 @@ class SaveRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
 
     mScaleVertex.set(bmpWidth,bmpHeight,0);
 
-    if( mMesh   ==null ) mMesh = new MeshRectangles(30,30*bmpHeight/bmpWidth);
+    if( mMesh   ==null ) mMesh = new MeshSquare(30,30*bmpHeight/bmpWidth);
     if( mTexture==null ) mTexture = new DistortedTexture();
     mTexture.setTexture(bitmap);
 
diff --git a/src/main/java/org/distorted/examples/singlemesh/SingleMeshRenderer.java b/src/main/java/org/distorted/examples/singlemesh/SingleMeshRenderer.java
index 8dc10fa..b5895ef 100644
--- a/src/main/java/org/distorted/examples/singlemesh/SingleMeshRenderer.java
+++ b/src/main/java/org/distorted/examples/singlemesh/SingleMeshRenderer.java
@@ -38,7 +38,7 @@ import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.mesh.MeshBase;
 import org.distorted.library.mesh.MeshJoined;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.type.Dynamic1D;
 import org.distorted.library.type.DynamicQuat;
 import org.distorted.library.type.Static1D;
@@ -247,8 +247,8 @@ class SingleMeshRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exc
       {
       final int MESHES=6;
       int association = 1;
-      MeshBase[] meshes = new MeshRectangles[MESHES];
-      meshes[0] = new MeshRectangles(10,10);
+      MeshBase[] meshes = new MeshSquare[MESHES];
+      meshes[0] = new MeshSquare(10,10);
       meshes[0].setEffectAssociation(0,association,0);
 
       for(int i=1; i<MESHES; i++)
diff --git a/src/main/java/org/distorted/examples/sink/SinkRenderer.java b/src/main/java/org/distorted/examples/sink/SinkRenderer.java
index 5ef8698..1c4cd9b 100644
--- a/src/main/java/org/distorted/examples/sink/SinkRenderer.java
+++ b/src/main/java/org/distorted/examples/sink/SinkRenderer.java
@@ -32,7 +32,7 @@ import org.distorted.library.effect.VertexEffectSink;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.type.Dynamic1D;
 import org.distorted.library.type.Static1D;
@@ -51,7 +51,7 @@ class SinkRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
   private DistortedEffects mEffects;
   private DistortedScreen mScreen;
   private DistortedTexture mTexture;
-  private MeshRectangles mMesh;
+  private MeshSquare mMesh;
   private Static3D mScale;
   private float mBmpRatio;
 
@@ -119,7 +119,7 @@ class SinkRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception
 
     mTexture.setTexture(bitmap);
 
-    if( mMesh==null ) mMesh = new MeshRectangles(30,(int)(30*mBmpRatio));
+    if( mMesh==null ) mMesh = new MeshSquare(30,(int)(30*mBmpRatio));
 
     mScreen.detachAll();
     mScreen.attach(mTexture,mEffects,mMesh);
diff --git a/src/main/java/org/distorted/examples/surfaceview/RenderThread.java b/src/main/java/org/distorted/examples/surfaceview/RenderThread.java
index 03c1e6d..1c3e6b8 100644
--- a/src/main/java/org/distorted/examples/surfaceview/RenderThread.java
+++ b/src/main/java/org/distorted/examples/surfaceview/RenderThread.java
@@ -35,7 +35,7 @@ import org.distorted.library.effect.VertexEffectDistort;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.type.Dynamic3D;
 import org.distorted.library.type.Static3D;
@@ -65,7 +65,7 @@ class RenderThread extends Thread implements DistortedLibrary.ExceptionListener
 
   private DistortedEffects mEffects;
   private DistortedTexture mTexture;
-  private MeshRectangles mMesh;
+  private MeshSquare mMesh;
   private DistortedScreen mScreen;
   private SurfaceView mView;
   private static boolean resourcesCreated = false;
@@ -247,7 +247,7 @@ class RenderThread extends Thread implements DistortedLibrary.ExceptionListener
     if( mTexture==null ) mTexture = new DistortedTexture();
     mTexture.setTexture(bmp);
 
-    if( mMesh==null ) mMesh = new MeshRectangles(9,(int)(9*mBmpRatio));
+    if( mMesh==null ) mMesh = new MeshSquare(9,(int)(9*mBmpRatio));
 
     mScreen.detachAll();
     mScreen.attach(mTexture,mEffects,mMesh);
diff --git a/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java b/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java
index 8cd41fa..e0ede6e 100644
--- a/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java
+++ b/src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java
@@ -32,7 +32,7 @@ import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedNode;
 import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.main.DistortedTexture;
-import org.distorted.library.mesh.MeshRectangles;
+import org.distorted.library.mesh.MeshSquare;
 import org.distorted.library.type.Static1D;
 import org.distorted.library.type.Static2D;
 import org.distorted.library.type.Static3D;
@@ -76,7 +76,7 @@ class TransparencyRenderer implements GLSurfaceView.Renderer, DistortedLibrary.E
       {
       mView = v;
 
-      MeshRectangles mesh = new MeshRectangles(1,1);
+      MeshSquare mesh = new MeshSquare(1,1);
 
       mQuat1 = new Static4D(0,0,0,1);  // unity
       mQuat2 = new Static4D(0,0,0,1);  // quaternions