Merge branch 'master' into pentool

1 files changed, 1165 insertions, 0 deletions

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
new file mode 100755
index 00000000..81b385b3
--- /dev/null
+++ b/js/lib/geom/rectangle.js
@@ -0,0 +1,1165 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+var GeomObj = require("js/lib/geom/geom-obj").GeomObj;
+var ShapePrimitive =    require("js/lib/geom/shape-primitive").ShapePrimitive;
+var MaterialsModel = require("js/models/materials-model").MaterialsModel;
+var FlatMaterial = require("js/lib/rdge/materials/flat-material").FlatMaterial;
+ ///////////////////////////////////////////////////////////////////////
+// Class GLRectangle
+//      GL representation of a rectangle.
+//      Derived from class GeomObj
+///////////////////////////////////////////////////////////////////////
+var Rectangle = function GLRectangle() {
+        // CONSTANTS
+        this.N_TRIANGLES = 15;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Instance variables
+        ///////////////////////////////////////////////////////////////////////
+        this._width = 2.0;
+        this._height = 2.0;
+        this._xOffset = 0;
+        this._yOffset = 0;
+
+        this._tlRadius = 0;
+        this._trRadius = 0;
+        this._blRadius = 0;
+        this._brRadius = 0;
+
+        this._strokeWidth = 0.25;
+
+        this._strokeStyle = "Solid";
+        this.init = function(world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor,
+                      tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle) {
+
+
+                this.m_world = world;
+
+                if (arguments.length > 0) {
+                        this._width = width;
+                        this._height = height;
+                        this._xOffset = xOffset;
+                        this._yOffset = yOffset;
+
+                        this._strokeWidth = strokeSize;
+                        this._strokeColor = strokeColor;
+                        this._fillColor = fillColor;
+
+                        this.setTLRadius(tlRadius);
+                        this.setTRRadius(trRadius);
+                        this.setBLRadius(blRadius);
+                        this.setBRRadius(brRadius);
+
+                        this._strokeStyle = strokeStyle;
+                }
+
+                // the overall radius includes the fill and the stroke.  separate the two based onthe stroke width
+                //  this._fillRad = this._radius - this._strokeWidth;
+                //    var err = 0.05;
+                var err = 0;
+                this._fillWidth = this._width - this._strokeWidth  + err;
+                this._fillHeight = this._height - this._strokeWidth + err;
+
+                this._materialAmbient  = [0.2, 0.2, 0.2,  1.0];
+                this._materialDiffuse  = [0.4, 0.4, 0.4,  1.0];
+                this._materialSpecular = [0.4, 0.4, 0.4,  1.0];
+
+                if(strokeMaterial) {
+                        this._strokeMaterial = strokeMaterial;
+        } else {
+                        this._strokeMaterial = MaterialsModel.exportFlatMaterial();
+        }
+
+                if(fillMaterial) {
+                        this._fillMaterial = fillMaterial;
+        } else {
+                        this._fillMaterial = MaterialsModel.exportFlatMaterial();
+        }
+        };
+
+        ///////////////////////////////////////////////////////////////////////
+        // Property Accessors
+        ///////////////////////////////////////////////////////////////////////
+        this.getStrokeWidth = function() {
+        return this._strokeWidth;
+    };
+
+        this.setStrokeWidth = function(w) {
+        this._strokeWidth = w;
+    };
+
+        this.getStrokeMaterial = function() {
+        return this._strokeMaterial;
+    };
+
+        this.setStrokeMaterial = function(m) {
+        this._strokeMaterial = m;
+    };
+
+        this.getFillMaterial = function() {
+        return this._fillMaterial;
+    };
+
+        this.setFillMaterial = function(m) {
+        this._fillMaterial = m;
+    };
+
+        this.getStrokeColor = function() {
+        return this._strokeColor;
+    };
+
+        //this.setStrokeColor = function(c) {
+        // this._strokeColor = c;
+        // };
+
+        this.getFillColor = function() {
+        return this._fillColor;
+    };
+
+        //this.setFillColor = function(c) {
+        // this._fillColor = c.slice(0);
+        // };
+
+        this.getTLRadius = function() {
+        return this._tlRadius;
+    };
+
+        this.setTLRadius = function(r) {
+        this._tlRadius = Math.min(r, (this._height - this._strokeWidth)/2, (this._width - this._strokeWidth)/2);
+    };
+
+        this.getTRRadius = function() {
+        return this._trRadius;
+    };
+
+        this.setTRRadius = function(r) {
+        this._trRadius = Math.min(r, (this._height - this._strokeWidth)/2, (this._width - this._strokeWidth)/2);
+    };
+
+        this.getBLRadius = function() {
+        return this._blRadius;
+    };
+
+        this.setBLRadius = function(r) {
+        this._blRadius = Math.min(r, (this._height - this._strokeWidth)/2, (this._width - this._strokeWidth)/2);
+    };
+
+        this.getBRRadius = function() {
+        return this._brRadius;
+    };
+
+        this.setBRRadius = function(r) {
+        this._brRadius = Math.min(r, (this._height - this._strokeWidth)/2, (this._width - this._strokeWidth)/2);
+    };
+
+        this.getStrokeStyle = function() {
+        return this._strokeStyle;
+    };
+
+        this.setStrokeStyle = function(s) {
+        this._strokeStyle = s;
+    };
+
+        this.getWidth = function() {
+        return this._width;
+    };
+
+        this.setWidth = function(w) {
+        this._width = w;
+    };
+
+        this.getHeight = function() {
+        return this._height;
+    };
+
+        this.setHeight = function(h) {
+        this._height = h;
+    };
+
+        this.geomType = function() {
+        return this.GEOM_TYPE_RECTANGLE;
+    };
+
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+        ///////////////////////////////////////////////////////////////////////
+        this.export = function() {
+                var rtnStr = "type: " + this.geomType() + "\n";
+
+                /////////////////////////////////////////////////////////////////////////
+                //
+                //      world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor,
+        //    tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle
+                //
+                /////////////////////////////////////////////////////////////////////////////
+
+                rtnStr += "xoff: "                      + this._xOffset         + "\n";
+                rtnStr += "yoff: "                      + this._yOffset         + "\n";
+                rtnStr += "width: "                     + this._width           + "\n";
+                rtnStr += "height: "            + this._height          + "\n";
+                rtnStr += "strokeWidth: "       + this._strokeWidth     + "\n";
+                rtnStr += "strokeColor: "       + String(this._strokeColor)  + "\n";
+                rtnStr += "fillColor: "         + String(this._fillColor)        + "\n";
+                rtnStr += "tlRadius: "          + this._tlRadius        + "\n";
+                rtnStr += "trRadius: "          + this._trRadius        + "\n";
+                rtnStr += "blRadius: "          + this._blRadius        + "\n";
+                rtnStr += "brRadius: "          + this._brRadius        + "\n";
+                rtnStr += "innerRadius: "       + this._innerRadius     + "\n";
+                rtnStr += "strokeStyle: "       + this._strokeStyle     + "\n";
+
+                rtnStr += "strokeMat: ";
+                if (this._strokeMaterial) {
+                        rtnStr += this._strokeMaterial.getName();
+        } else {
+                        rtnStr += "flatMaterial";
+        }
+
+                rtnStr += "\n";
+
+                rtnStr += "fillMat: ";
+                if (this._fillMaterial) {
+                        rtnStr += this._fillMaterial.getName();
+        } else {
+                        rtnStr += "flatMaterial";
+        }
+
+                rtnStr += "\n";
+
+                return rtnStr;
+        };
+
+        this.import = function( importStr ) {
+                this._xOffset                   = Number( this.getPropertyFromString( "xoff: ",                 importStr )  );
+