1 files changed, 59 insertions, 24 deletions

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 91b1d426..ef91d158 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -12,7 +12,11 @@ var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 //      GL representation of a rectangle.
 //      Derived from class GeomObj
 ///////////////////////////////////////////////////////////////////////
-var Rectangle = function GLRectangle() {
+var Rectangle = function GLRectangle()
+{
+        if (!MaterialsModel)
+                MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
         // CONSTANTS
         this.N_TRIANGLES = 15;
 
@@ -848,13 +852,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);
@@ -1080,13 +1084,13 @@ 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);
@@ -1164,15 +1168,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);
@@ -1185,11 +1189,42 @@ 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, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+}
+
+
+
 
 Rectangle.prototype = new GeomObj();
 
 if (typeof exports === "object") {
     exports.Rectangle = Rectangle;
+        exports.RectangleGeometry = RectangleGeometry;
 }