28 files changed, 1522 insertions, 874 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 26f33a64..2b76161f 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -466,6 +466,7 @@ World.prototype.updateObject = function (obj) {
         if (prims.length != materialNodes.length)
                 throw new Error("inconsistent material and primitive counts");
         var nPrims = prims.length;
+        var iPrim = 0;
         var ctrTrNode;
         if (nPrims > 0)
         {
@@ -483,8 +484,12 @@ World.prototype.updateObject = function (obj) {
                 );
                 ctrTrNode.meshes = [];
 
-                ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[0]);
                 ctrTrNode.attachMaterial(materialNodes[0]);
+                while ((iPrim < nPrims) && (materialNodes[iPrim] == materialNodes[0]))
+                {
+                        ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[iPrim]);
+                        iPrim++;
+                }
         }
         
         // delete all of the child nodes
@@ -505,16 +510,18 @@ World.prototype.updateObject = function (obj) {
         }
         ctrTrNode.children = [];
 
-        for (var i = 1; i < nPrims; i++)
+        while (iPrim < nPrims)
         {
-                // get the next primitive
                 childTrNode = RDGE.createTransformNode("objNode_" + this._nodeCounter++);
                 ctrTrNode.insertAsChild(childTrNode);
+                var matNode = materialNodes[iPrim];
+                childTrNode.attachMaterial(matNode);
 
-                // attach the instanced box goe
-                var prim = prims[i];
-                childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim);
-                childTrNode.attachMaterial(materialNodes[i]);
+                while ((iPrim < nPrims) && (materialNodes[iPrim] == matNode))
+                {
+                        childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[iPrim]);
+                        iPrim++;
+                }
         }
 
         // send a notification that the tree has changed
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 12781ab8..2cd5a21f 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -42,49 +42,49 @@ var vecUtils		= require("js/helper-classes/3D/vec-utils").VecUtils;
 ///////////////////////////////////////////////////////////////////////
 exports.Circle = Object.create(GeomObj, {
 
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-    _width: { value : 2.0, writable: true },
-    _height: { value : 2.0, writable: true },
-    _xOffset: { value : 0, writable: true },
-    _yOffset: { value : 0, writable: true },
-
-    _radius: { value : 2.0, writable: true },
-    _strokeWidth: { value : 0.25, writable: true },
-    _innerRadius: { value : 0, writable: true },
-    _ovalHeight: { value : 4.0, writable: true },
-    _strokeStyle: { value : "Solid", writable: true },
-    _aspectRatio: { value : 1.0, writable: true },
+        ///////////////////////////////////////////////////////////////////////
+        // Instance variables
+        ///////////////////////////////////////////////////////////////////////
+        _width: { value : 2.0, writable: true },
+        _height: { value : 2.0, writable: true },
+        _xOffset: { value : 0, writable: true },
+        _yOffset: { value : 0, writable: true },
+
+        _radius: { value : 2.0, writable: true },
+        _strokeWidth: { value : 0.25, writable: true },
+        _innerRadius: { value : 0, writable: true },
+        _ovalHeight: { value : 4.0, writable: true },
+        _strokeStyle: { value : "Solid", writable: true },
+        _aspectRatio: { value : 1.0, writable: true },
 
         init: {
-        value: function(world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle) {
-            if(arguments.length > 0) {
-                this._width = width;
-                this._height = height;
-                this._xOffset = xOffset;
-                this._yOffset = yOffset;
-                this._ovalHeight = 2.0 * this._radius;
-
-                this._strokeWidth = strokeSize;
-                this._innerRadius = innerRadius;
-                this._strokeColor = strokeColor;
-                this._fillColor = fillColor;
-
-                this._strokeStyle = strokeStyle;
-
-                this._matrix = Matrix.I(4);
-                //this._matrix[12] = xOffset;
-                //this._matrix[13] = yOffset;
-            }
+                value: function(world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle) {
+                        if(arguments.length > 0) {
+                                this._width = width;
+                                this._height = height;
+                                this._xOffset = xOffset;
+                                this._yOffset = yOffset;
+                                this._ovalHeight = 2.0 * this._radius;
+
+                                this._strokeWidth = strokeSize;
+                                this._innerRadius = innerRadius;
+                                this._strokeColor = strokeColor;
+                                this._fillColor = fillColor;
+
+                                this._strokeStyle = strokeStyle;
+
+                                this._matrix = Matrix.I(4);
+                                //this._matrix[12] = xOffset;
+                                //this._matrix[13] = yOffset;
+                        }
 
-            this.m_world = world;
+                        this.m_world = world;
 
-            if(strokeMaterial) {
-                this._strokeMaterial = strokeMaterial.dup();
-            } else {
-                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
-            }
+                        if(strokeMaterial) {
+                                this._strokeMaterial = strokeMaterial.dup();
+                        } else {
+                                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
+                        }
 
             if(strokeColor) {
                 if(this._strokeMaterial.hasProperty("color")) {
@@ -94,135 +94,135 @@ exports.Circle = Object.create(GeomObj, {
                 }
             }
 
-            if(fillMaterial) {
-                this._fillMaterial = fillMaterial.dup();
-            } else {
-                this._fillMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
-            }
+                        if(fillMaterial) {
+                                this._fillMaterial = fillMaterial.dup();
+                        } else {
+                                this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
+                        }
 
             if(fillColor) {
                 if(this._fillMaterial.hasProperty("color")) {
                     this._fillMaterial.setProperty( "color",  this._fillColor );
                 } else if (this._fillMaterial && (this._fillMaterial.gradientType === this._fillColor.gradientMode)) {
                     this._fillMaterial.setGradientData(this._fillColor.color);
-                }
+                }
             }
         }
-    },
-
-    ///////////////////////////////////////////////////////////////////////
-    // Property Accessors
-    ///////////////////////////////////////////////////////////////////////
-    // TODO - Use getters/setters in the future
-    getStrokeWidth: {
-        value: function() {
-            return this._strokeWidth;
-        }
-    },
+        },
+
+        ///////////////////////////////////////////////////////////////////////
+        // Property Accessors
+        ///////////////////////////////////////////////////////////////////////
+        // TODO - Use getters/setters in the future
+        getStrokeWidth: {
+                value: function() {
+                        return this._strokeWidth;
+                }
+        },
 
-    setStrokeWidth: {
-        value: function(w) {
-            this._strokeWidth = w;
-        }
-    },
+        setStrokeWidth: {
+                value: function(w) {
+                        this._strokeWidth = w;
+                }
+        },
 
-    getStrokeMaterial: {
+        getStrokeMaterial: {