Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/geom/geom-obj.js
	js/lib/geom/rectangle.js
	js/tools/TagTool.js

1 files changed, 478 insertions, 419 deletions

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 4efa5d60..803dbb53 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -10,551 +10,615 @@ var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 // Class GLGeomObj
 //      Super class for all geometry classes
 ///////////////////////////////////////////////////////////////////////
-var GeomObj = function GLGeomObj()
+exports.GeomObj = Object.create(Object.prototype, {
 {
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
-    this.GEOM_TYPE_RECTANGLE = 1;
-    this.GEOM_TYPE_CIRCLE = 2;
-    this.GEOM_TYPE_LINE = 3;
-    this.GEOM_TYPE_PATH = 4;
-    this.GEOM_TYPE_CUBIC_BEZIER = 5;
-    this.GEOM_TYPE_BRUSH_STROKE = 6;
-    this.GEOM_TYPE_UNDEFINED = -1;
-
-    // Needed for calculating dashed/dotted strokes
-    this.DASH_LENGTH = 0.15;
-    this.DOT_LENGTH = 0.05;
-    this.GAP_LENGTH = 0.05;
+    // TODO - Is there a way to make these static constants?
+    GEOM_TYPE_RECTANGLE: { value : 1, writable: false },
+    GEOM_TYPE_CIRCLE: { value : 2, writable: false },
+    GEOM_TYPE_LINE: { value : 3, writable: false },
+    GEOM_TYPE_PATH: { value : 4, writable: false },
+    GEOM_TYPE_CUBIC_BEZIER: { value : 5, writable: false },
+    GEOM_TYPE_BRUSH_STROKE: { value : 6, writable: false },
+    GEOM_TYPE_UNDEFINED: { value : -1, writable: false },
 
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-    this._matrix = Matrix.I(4);
+    _matrix: { value : Matrix.I(4), writable: true },
 
-    this._next = undefined;
-    this._prev = undefined;
-    this._child = undefined;
-    this._parent = undefined;
+    _next: { value : undefined, writable: true },
+    _prev: { value : undefined, writable: true },
+    _child: { value : undefined, writable: true },
+    _parent: { value : undefined, writable: true },
 
-    this.m_world = null;
+    m_world: { value : null, writable: true },
 
     // stroke and fill colors
-    this._strokeColor = [0, 0, 0, 0];
-    this._fillColor = [0, 0, 0, 0];
+    _strokeColor: { value : [0, 0, 0, 0], writable: true },
+    _fillColor: { value : [0, 0, 0, 0], writable: true },
 
     // stroke and fill materials
-    this._fillMaterial = null;
-    this._strokeMaterial = null;
+    _fillMaterial: { value : null, writable: true },
+    _strokeMaterial: { value : null, writable: true },
 
     // Shapes (such as lines) that don't support fill should set this to false
-    this.canFill = true;
+    canFill: { value : true, writable: true },
 
     // array of primitives - used in RDGE
-    this._primArray = [];
-    this._materialNodeArray = [];
-    this._materialArray = [];
-    this._materialTypeArray = [];
+    _primArray: { value : [], writable: true },
+    _materialNodeArray: { value : [], writable: true },
+    _materialArray: { value : [], writable: true },
+    _materialTypeArray: { value : [], writable: true },
 
     // the transform node used by RDGE
-    this._trNode = null;
+    _trNode: { value : null, writable: true },
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
-    this.setWorld = function (world) {
-        this.m_world = world;
-    };
-
-    this.getWorld = function () {
-        return this.m_world;
-    };
+    getWorld: {
+        value: function() {
+            return this.m_world;
+        }
+    },
 
-    this.getMatrix = function () {
-        return this._matrix.slice(0);
-    };
+    setWorld: {
+        value: function(world) {
+            this.m_world = world;
+        }
+    },
 
-    this.setMatrix = function (m) {
-        this._matrix = m.slice(0);
-    };
+    getMatrix: {
+        value: function() {
+            return this._matrix.slice(0);
+        }
+    },
 
-    this.setNext = function (next) {
-        this._next = next;
-    };
+    setMatrix: {
+        value: function(m) {
+            this._matrix = m.slice(0);
+        }
+    },
 
-    this.getNext = function () {
-        return this._next;
-    };
+    getNext: {
+        value: function() {
+            return this._next;
+        }
+    },
 
-    this.setPrev = function (prev) {
-        this._prev = prev;
-    };
+    setNext: {
+        value: function(next) {
+            this._next = next;
+        }
+    },
 
-    this.getPrev = function () {
-        return this._prev;
-    };
+    getPrev: {
+        value: function() {
+            return this._prev;
+        }
+    },
 
-    this.setChild = function (child) {
-        this._child = child;
-    };
+    setPrev: {
+        value: function(prev) {
+            this._prev = prev;
+        }
+    },
 
-    this.getChild = function () {
-        return this._child;
-    };
+    getChild: {
+        value: function() {
+            return this._child;
+        }
+    },
 
-    this.setParent = function (parent) {
-        this._parent = parent;
-    };
+    setChild: {
+        value: function(child) {
+            this._child = child;
+        }
+    },
 
-    this.getParent = function () {
-        return this._parent;
-    };
+    getParent: {
+        value: function() {
+            return this._parent;
+        }
+    },
 
-    this.geomType = function () {
-        return this.GEOM_TYPE_UNDEFINED;
-    };
+    setParent: {
+        value: function(parent) {
+            this._parent = parent;
+        }
+    },
 
-    this.getPrimitiveArray = function () {
-        return this._primArray;
-    };
+    geomType: {
+        value: function() {
+            return this.GEOM_TYPE_UNDEFINED;
+        }
+    },
 
-    this.getMaterialNodeArray = function () {
-        return this._materialNodeArray;
-    };
+    getPrimitiveArray: {
+        value: function() {
+            return this._primArray;
+        }
+    },
 
-    this.getMaterialArray = function () {
-        return this._materialArray;
-    };
+    getMaterialNodeArray: {
+        value: function() {
+            return this._materialNodeArray;
+        }
+    },
 
-    this.getTransformNode = function () {
-        return this._trNode;
-    };
+    getMaterialArray: {
+        value: function() {
+            return this._materialArray;
+        }
+    },
 
-    this.setTransformNode = function (t) {
-        this._trNode = t;
-    };
+    getTransformNode: {
+        value: function() {
+            return this._trNode;
+        }
+    },
 
-    this.setFillColor = function (c) {
-        this.setMaterialColor(c, "fill");
-    };
+    setTransformNode: {
+        value: function(t) {
+            this._trNode = t;
+        }
+    },