1 files changed, 59 insertions, 23 deletions

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index b85433a0..42d51e74 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -17,6 +17,9 @@ exports.Rectangle = Object.create(GeomObj, {
         // CONSTANTS
         N_TRIANGLES: { value : 15, writable: false },       // TODO - This is not being used anywhere. Remove?
 
+        //if (!MaterialsModel)
+        //      MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
         ///////////////////////////////////////////////////////////////////////
         // Instance variables
         ///////////////////////////////////////////////////////////////////////
@@ -942,13 +945,13 @@ RectangleFill.create = function( rectCtr,  width, height, tlRad, blRad,  brRad,
         }
 
         //refine the mesh for vertex deformations
-//      if (material) {
-//              if (material.hasVertexDeformation()) {
-//                      var paramRange = material.getVertexDeformationRange();
-//                      var tolerance = material.getVertexDeformationTolerance();
-//                      nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );
-//              }
-//      }
+        if (material) {
+                if (material.hasVertexDeformation()) {
+                        var paramRange = material.getVertexDeformationRange();
+                        var tolerance = material.getVertexDeformationTolerance();
+                        nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );
+                }
+        }
 
         // create the RDGE primitive
         return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
@@ -1174,13 +1177,15 @@ RectangleStroke.create = function( rectCtr,  width, height, strokeWidth,  tlRad,
         }
 
         //refine the mesh for vertex deformations
-//      if (material) {
-//              if (material.hasVertexDeformation()) {
-//                      var paramRange = material.getVertexDeformationRange();
-//                      var tolerance = material.getVertexDeformationTolerance();
-//                      nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );
-//              }
-//      }
+        if (material)
+        {
+                if (material.hasVertexDeformation())
+                {
+                        var paramRange = material.getVertexDeformationRange();
+                        var tolerance = material.getVertexDeformationTolerance();
+                        nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );
+                }
+        }
 
         // create the RDGE primitive
         return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
@@ -1258,15 +1263,15 @@ RectangleGeometry.create = function( ctr,  width, height, material ) {
         RectangleGeometry.pushIndices( 0, 3, 2 );
 
         //refine the mesh for vertex deformations
-//      if (material)
-//      {
-//              if (material.hasVertexDeformation())
-//              {
-//                      var paramRange = material.getVertexDeformationRange();
-//                      var tolerance = material.getVertexDeformationTolerance();
-//                      nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );
-//              }
-//      }
+        if (material)
+        {
+                if (material.hasVertexDeformation())
+                {
+                        var paramRange = material.getVertexDeformationRange();
+                        var tolerance = material.getVertexDeformationTolerance();
+                        nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );
+                }
+        }
 
         // create the RDGE primitive
         return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
@@ -1279,5 +1284,36 @@ RectangleGeometry.pushIndices	= RectangleFill.pushIndices;
 RectangleGeometry.getVertex             = RectangleFill.getVertex;
 RectangleGeometry.getUV                 = RectangleFill.getUV;
 
+RectangleGeometry.init = function()
+{
+        this.vertices   = [];
+        this.normals    = [];
+        this.uvs                = [];
+        this.indices    = [];
+}
+
+RectangleGeometry.addQuad = function( verts,  normals, uvs )
+{
+        var offset = this.vertices.length/3;
+        for (var i=0;  i<4;  i++)
+        {
+                RectangleGeometry.pushVertex( verts[i][0], verts[i][1], verts[i][2]);
+                RectangleGeometry.pushNormal( normals[i] );
+                RectangleGeometry.pushUV( uvs[i] );
+        }
+
+        RectangleGeometry.pushIndices( 0+offset, 1+offset, 2+offset );
+        RectangleGeometry.pushIndices( 2+offset, 3+offset, 0+offset );
+}
+
+RectangleGeometry.buildPrimitive = function()
+{
+        var nVertices = this.vertices.length/3;
+        return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
+}
+
+
+
+        exports.RectangleGeometry = RectangleGeometry;