7 files changed, 71 insertions, 42 deletions

diff --git a/assets/shaders/Basic.frag.glsl b/assets/shaders/Basic.frag.glsl
index a2c21afa..c1f9a5c8 100644
--- a/assets/shaders/Basic.frag.glsl
+++ b/assets/shaders/Basic.frag.glsl
@@ -11,7 +11,9 @@ precision highp float;
 
 
 uniform vec4 color;
+varying vec4 v_color;
 
 void main() {
-    gl_FragColor = color;
+    gl_FragColor = v_color;
+    //gl_FragColor = color;
 }
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index 028786d1..40b97ad7 100644
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
@@ -12,7 +12,9 @@ precision highp float;
 
 // attributes
 attribute vec3 a_pos;
+attribute vec2 texcoord;
 
+varying vec4 v_color;
 
 
 // matrix uniforms
@@ -22,5 +24,6 @@ uniform mat4 u_worldMatrix;
 
 void main(void)
 {
+        v_color = vec4(texcoord.x, texcoord.y, 0, 1);
         gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
 }
\ No newline at end of file
diff --git a/assets/shaders/Taper.vert.glsl b/assets/shaders/Taper.vert.glsl
index 46f04fb3..82151f13 100644
--- a/assets/shaders/Taper.vert.glsl
+++ b/assets/shaders/Taper.vert.glsl
@@ -20,6 +20,7 @@ uniform float u_limit1;
 uniform float u_limit2;
 uniform float u_limit3;
 uniform float u_taperAmount;
+uniform float u_center;
 
 uniform vec4 color;
 
@@ -31,31 +32,35 @@ uniform mat4 u_worldMatrix;
 
 varying vec4 v_color;
 
+float TaperAmount( float param )
+{
+        float y0 = 1.0,  y1 = 1.0,  y2 = 0.0,  y3 = 0.0;
+        float yA0 = y0 + param*(y1 - y0),  yA1 = y1 + param*(y2 - y1),  yA2 = y2 + param*(y3 - y2);
+        float yB0 = yA0 + param*(yA1 - yA0),  yB1 = yA1 + param*(yA2 - yA1);
+        float yC0 = yB0 + param*(yB1 - yB0);
+
+        return yC0;
+}
 
 void main(void)
 {
         vec3 pos = vert;
         vec2 uv = texcoord;
 
-        v_color = vec4(0, 1, 0, 1);
+        v_color = vec4(texcoord.x, texcoord.y, 0, 1);
         if (uv.x > u_limit1)
         {
                 if (uv.x < u_limit2)
                 {
                         float t = (uv.x - u_limit1)/(u_limit2 - u_limit1);
-                        pos.y = pos.y - t*u_taperAmount;
-                        v_color = vec4( 1, 1, 0, 1 );
+                        pos.y = pos.y - pos.y*TaperAmount(t)*u_taperAmount;
                 }
                 else if (uv.x < u_limit3)
                 {
                         float t = 1.0 - (uv.x - u_limit2)/(u_limit3 - u_limit2);
-                        pos.y = pos.y - t*u_taperAmount;
-                        v_color = vec4( 0, 1, 1, 1 );
+                        pos.y = pos.y - pos.y*TaperAmount(t)*u_taperAmount;
                 }
-                else
-                        v_color = vec4(0,0,1,1);
         }
 
-
         gl_Position = u_projMatrix * u_mvMatrix * vec4(pos,1.0) ;
 }
\ No newline at end of file
diff --git a/js/helper-classes/RDGE/GLMaterial.js b/js/helper-classes/RDGE/GLMaterial.js
index 07a98ab5..a74a74e4 100644
--- a/js/helper-classes/RDGE/GLMaterial.js
+++ b/js/helper-classes/RDGE/GLMaterial.js
@@ -34,7 +34,7 @@ function GLMaterial( world )
         // vertex deformation variables
         this._hasVertexDeformation = false;
         this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
-        this._vertexDeformationTolerance = 0.05;
+        this._vertexDeformationTolerance = 0.1;
 
         // RDGE variables
         this._shader;
@@ -74,7 +74,7 @@ function GLMaterial( world )
         // the vertex shader can apply deformations requiring refinement in
         // certain areas.
         this.hasVertexDeformation                       = function()    {  return this._hasVertexDeformation;                   }
-        this.getVertexDeformationRange          = function()    {  return this._vertexDeformationRange.slice();                 }       
+        this.getVertexDeformationRange          = function()    {  return this._vertexDeformationRange.slice(); }       
         this.getVertexDeformationTolerance      = function()    {  return this._vertexDeformationTolerance;             }
 
 
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index e72b4488..7fe03022 100644
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -1121,6 +1121,7 @@ RectangleStroke.create = function( rectCtr,  width, height, strokeWidth,  tlRad,
 
         // create the RDGE primitive
         var prim = ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+        //var prim = ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.LINES, nVertices);
         return prim;
 }
 
@@ -1214,6 +1215,7 @@ RectangleGeometry.create = function( ctr,  width, height, material )
 
         // create the RDGE primitive
         var prim = ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+        //var prim = ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.LINES, nVertices);
         return prim;
 }
 
@@ -1301,7 +1303,7 @@ ShapePrimitive.refineMesh = function( verts, norms, uvs, indices, nVertices,  pa
                         i2 = indices[index+2];
 
                 // get the uv values
-                var vrtIndex = 3*iTriangle;
+                //var vrtIndex = 3*iTriangle;
                 var iuv0 = 2 * i0,
                         iuv1 = 2 * i1,
                         iuv2 = 2 * i2;
@@ -1335,7 +1337,7 @@ ShapePrimitive.refineMesh = function( verts, norms, uvs, indices, nVertices,  pa
                                 iTriangle++;
                                 index += 3;
                         }
-                        else    // split the triangle
+                        else    // split the triangle into 4 parts
                         {
                                 //calculate the position of the new vertex
                                 var iPt0 = 3 * i0,
@@ -1344,34 +1346,42 @@ ShapePrimitive.refineMesh = function( verts, norms, uvs, indices, nVertices,  pa
                                 var x0 = verts[iPt0],  y0 = verts[iPt0+1],  z0 = verts[iPt0+2],
                                         x1 = verts[iPt1],  y1 = verts[iPt1+1],  z1 = verts[iPt1+2],
                                         x2 = verts[iPt2],  y2 = verts[iPt2+1],  z2 = verts[iPt2+2];
-                                var xMid = (x0 + x1 + x2)/3.0,
-                                        yMid = (y0 + y1 + y2)/3.0,
-                                        zMid = (z0 + z1 + z2)/3.0;
-
-                                // calculate the uv value of the new coordinate
-                                var uMid = (u0 + u1 + u2)/3.0,
-                                        vMid = (v0 + v1 + v2)/3.0;
-
-                                // calculate the normal for the new coordinate
+                                
+                                // calculate the midpoints of the edges
+                                var xA = (x0 + x1)/2.0,  yA = (y0 + y1)/2.0,  zA = (z0 + z1)/2.0,
+                                        xB = (x1 + x2)/2.0,  yB = (y1 + y2)/2.0,  zB = (z1 + z2)/2.0,
+                                        xC = (x2 + x0)/2.0,  yC = (y2 + y0)/2.0,  zC = (z2 + z0)/2.0;
+
+                                // calculate the uv values of the new coordinates
+                                var uA = (u0 + u1)/2.0,  vA = (v0 + v1)/2.0,
+                                        uB = (u1 + u2)/2.0,  vB = (v1 + v2)/2.0,
+                                        uC = (u2 + u0)/2.0,  vC = (v2 + v0)/2.0;
+
+                                // calculate the normals for the new points
                                 var nx0 = norms[iPt0],  ny0 = norms[iPt0+1],  nz0 = norms[iPt0+2],
                                         nx1 = norms[iPt1],  ny1 = norms[iPt1+1],  nz1 = norms[iPt1+2],
                                         nx2 = norms[iPt2],  ny2 = norms[iPt2+1],  nz2 = norms[iPt2+2];
-                                var nxMid = (nx0 + nx1 + nx2),
-                                        nyMid = (ny0 + ny1 + ny2),
-                                        nzMid = (nz0 + nz1 + nz2);
-                                var nrm = VecUtils.vecNormalize(3, [nxMid, nyMid, nzMid], 1.0 );
-
-                                // push the new vertex
-                                verts.push(nrm[0]);  verts.push(nrm[1]);  verts.push(nrm[2]);
-                                uvs.push(uMid),  uvs.push(vMid);
-                                norms.push(nrm[0]);  norms.push(nrm[1]);  norms.push(nrm[2]);
-                                var iMidVrt = nVertices;
+                                var nxA = (nx0 + nx1),  nyA = (ny0 + ny1),  nzA = (nz0 + nz1);  var nrmA = VecUtils.vecNormalize(3, [nxA, nyA, nzA], 1.0 ),
+                                        nxB = (nx1 + nx2),  nyB = (ny1 + ny2),  nzB = (nz1 + nz2);  var nrmB = VecUtils.vecNormalize(3, [nxB, nyB, nzB], 1.0 ),
+                                        nxC = (nx2 + nx0),  nyC = (ny2 + ny0),  nzC = (nz2 + nz0);  var nrmC = VecUtils.vecNormalize(3, [nxC, nyC, nzC], 1.0 );
+
+                                // push everything
+                                verts.push(xA);  verts.push(yA);  verts.push(zA);
+                                verts.push(xB);  verts.push(yB);  verts.push(zB);
+                                verts.push(xC);  verts.push(yC);  verts.push(zC);
+                                uvs.push(uA),  uvs.push(vA);
+                                uvs.push(uB),  uvs.push(vB);