Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes

Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
author: Nivesh Rajbhandari 2012-02-09 12:02:27 -0800
committer: Nivesh Rajbhandari 2012-02-09 12:02:27 -0800
commit: a9b1a1f2642841c4165ede69d131b1deb6238622 (patch)
tree: 2076dc497fbde041283af8b0082b0f4e24c9e1c6 /js
parent: 31e2eb0d0da9b032116ad073918ca36ec11dac45 (diff)
parent: ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff)
download: ninja-a9b1a1f2642841c4165ede69d131b1deb6238622.tar.gz
37 files changed, 1813 insertions, 2201 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index 7af35a03..74a3a747 100644
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -12,12 +12,25 @@
        <script type="text/montage-serialization">
        {
+            "strokeSizeHT": {
+                "module": "js/components/hottextunit.reel",
+                "name": "HotTextUnit",
+                "properties": {
+                    "element": {"#": "strokeSize"},
+                    "minValue": 1,
+                    "maxValue": 100,
+                    "value": 1,
+                    "decimalPlace": 10,
+                    "acceptableUnits" : ["px", "pt"]
+                }
+            },
            "owner": {
                "module": "js/components/tools-properties/pen-properties.reel",
                "name": "PenProperties",
                "properties": {
                    "element": {"#": "penProperties"},
-                    "reset": {"#": "resetPenTool"}
+                    "_strokeSize": {"@": "strokeSizeHT"}
                }
            }
        }
@@ -26,9 +39,12 @@
    </head>
    <body>
-        <div id="penProperties" class="subToolHolderPanel">
+    <div id="penProperties" class="subToolHolderPanel">
-            <button id="resetPenTool" tabindex="0" class="montage-button" aria-role="button" aria-busy="false">Reset</button>
+        <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
+            <label class="label"> Stroke:</label>
+            <div id="strokeSize" class="label"></div>
        </div>
+    </div>
    </body>
 </html>
 \ No newline at end of file
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js
index ec8efa69..b57f9a6f 100644
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.js
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js
@@ -5,24 +5,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 var Montage = require("montage/core/core").Montage;
-var Component = require("montage/ui/component").Component;
-var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
 var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
 exports.PenProperties = Montage.create(ToolProperties, {
-    reset:      { value: null },
+    strokeSize: {
-    
+        get: function() { return this._strokeSize; }
-    _subPrepare: {
-        value: function() {
-            this.reset.addEventListener("click", this, false);
-        }
-    },
-    handleClick: {
-        value: function(event) {
-            var newEvent = document.createEvent( "CustomEvent" );
-            newEvent.initCustomEvent( "resetPenTool", false, true );
-            defaultEventManager.dispatchEvent( newEvent );
-        }
    }
 });
 \ No newline at end of file
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 58f0680a..37044763 100644
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -897,19 +897,21 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
    getAxisAngleBetween3DVectors: {
        value: function (vec1, vec2, axis) {
            //compute magnitudes of the vectors
-            var mag1 = VecUtils.vecMag(3, vec1);
+            var v1n = VecUtils.vecNormalize(3, vec1, 1.0);
-            var mag2 = VecUtils.vecMag(3, vec2);
+            var v2n = VecUtils.vecNormalize(3, vec2, 1.0);
-            if (mag1 < this.EPSILON || mag2 < this.EPSILON) {
-                return 0; //if angle 0 is returned nothing from this function should be used
-            }
            //angle between the vectors (acos for now...)
-            var angle = Math.acos(VecUtils.vecDot(3, vec1, vec2) / (mag1 * mag2));
+            var angle = Math.acos(VecUtils.vecDot(3, v1n, v2n));
            if (Math.abs(angle) < this.EPSILON) {
                return 0;
            }
+            //TODO testing...remove this block
+            console.log("getAxisAngleBetween3DVectors Angle: "+angle);
+            if (isNaN(angle)){
+                console.log("getAxisAngleBetween3DVectors Angle is NaN");
+            }
+            //TODO end testing block
            //optionally, if axis is provided, create the axis of rotation as well
-            var rotAxis = VecUtils.vecCross(3, vec1, vec2);
+            var rotAxis = VecUtils.vecCross(3, v1n, v2n);
            rotAxis = VecUtils.vecNormalize(3, rotAxis, 1);
            axis[0] = rotAxis[0];
            axis[1] = rotAxis[1];
diff --git a/js/helper-classes/RDGE/GLAnchorPoint.js b/js/helper-classes/RDGE/GLAnchorPoint.js
index 496b6f60..716f59d4 100644
--- a/js/helper-classes/RDGE/GLAnchorPoint.js
+++ b/js/helper-classes/RDGE/GLAnchorPoint.js
@@ -26,125 +26,136 @@ function GLAnchorPoint() {
    this._nextX = 0.0;
    this._nextY = 0.0;
    this._nextZ = 0.0;
+}
    // *********** setters ************
-    this.setPos = function (x, y, z) { this._x = x; this._y = y; this._z = z; }
+GLAnchorPoint.prototype.setPos = function (x, y, z) { this._x = x; this._y = y; this._z = z; }
-    this.setPrevPos = function (x, y, z) { this._prevX = x; this._prevY = y; this._prevZ = z; }
+GLAnchorPoint.prototype.setPrevPos = function (x, y, z) { this._prevX = x; this._prevY = y; this._prevZ = z; }
-    this.setNextPos = function (x, y, z) { this._nextX = x; this._nextY = y; this._nextZ = z; }
+GLAnchorPoint.prototype.setNextPos = function (x, y, z) { this._nextX = x; this._nextY = y; this._nextZ = z; }
-    this.setPrevFromNext = function () {
-        //set the previous control point by reflecting the next control point
-        var dispX = this._nextX - this._x;
-        var dispY = this._nextY - this._y;
-        var dispZ = this._nextZ - this._z;
-        this._prevX = this._x - dispX;
-        this._prevY = this._y - dispY;
-        this._prevZ = this._z - dispZ;
-    }
-    this.setNextFromPrev = function () {
-        //set the previous control point by reflecting the next control point
author	Nivesh Rajbhandari	2012-02-09 12:02:27 -0800
committer	Nivesh Rajbhandari	2012-02-09 12:02:27 -0800
commit	a9b1a1f2642841c4165ede69d131b1deb6238622 (patch)
tree	2076dc497fbde041283af8b0082b0f4e24c9e1c6 /js
parent	31e2eb0d0da9b032116ad073918ca36ec11dac45 (diff)
parent	ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff)
download	ninja-a9b1a1f2642841c4165ede69d131b1deb6238622.tar.gz

diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index 7af35a03..74a3a747 100644 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -12,12 +12,25 @@
12	<script type="text/montage-serialization">	12	<script type="text/montage-serialization">
13	{	13	{
14		14
		15	"strokeSizeHT": {
		16	"module": "js/components/hottextunit.reel",
		17	"name": "HotTextUnit",
		18	"properties": {
		19	"element": {"#": "strokeSize"},
		20	"minValue": 1,
		21	"maxValue": 100,
		22	"value": 1,
		23	"decimalPlace": 10,
		24	"acceptableUnits" : ["px", "pt"]
		25	}
		26	},
		27
15	"owner": {	28	"owner": {
16	"module": "js/components/tools-properties/pen-properties.reel",	29	"module": "js/components/tools-properties/pen-properties.reel",
17	"name": "PenProperties",	30	"name": "PenProperties",
18	"properties": {	31	"properties": {
19	"element": {"#": "penProperties"},	32	"element": {"#": "penProperties"},
20	"reset": {"#": "resetPenTool"}	33	"_strokeSize": {"@": "strokeSizeHT"}
21	}	34	}
22	}	35	}
23	}	36	}
@@ -26,9 +39,12 @@
26	</head>	39	</head>
27		40
28	<body>	41	<body>
29	<div id="penProperties" class="subToolHolderPanel">	42	<div id="penProperties" class="subToolHolderPanel">
30	<button id="resetPenTool" tabindex="0" class="montage-button" aria-role="button" aria-busy="false">Reset</button>	43	<div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
		44	<label class="label"> Stroke:</label>
		45	<div id="strokeSize" class="label"></div>
31	</div>	46	</div>
		47	</div>
32	</body>	48	</body>
33		49
34	</html> \ No newline at end of file	50	</html> \ No newline at end of file


diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js index ec8efa69..b57f9a6f 100644 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js
@@ -5,24 +5,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
5	</copyright> */	5	</copyright> */
6		6
7	var Montage = require("montage/core/core").Montage;	7	var Montage = require("montage/core/core").Montage;
8	var Component = require("montage/ui/component").Component;
9	var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
10	var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;	8	var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
11		9
12	exports.PenProperties = Montage.create(ToolProperties, {	10	exports.PenProperties = Montage.create(ToolProperties, {
13	reset: { value: null },	11	strokeSize: {
14		12	get: function() { return this._strokeSize; }
15	_subPrepare: {
16	value: function() {
17	this.reset.addEventListener("click", this, false);
18	}
19	},
20
21	handleClick: {
22	value: function(event) {
23	var newEvent = document.createEvent( "CustomEvent" );
24	newEvent.initCustomEvent( "resetPenTool", false, true );
25	defaultEventManager.dispatchEvent( newEvent );
26	}
27	}	13	}
28	}); \ No newline at end of file	14	}); \ No newline at end of file


diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js index 58f0680a..37044763 100644 --- a/js/helper-classes/3D/math-utils.js +++ b/js/helper-classes/3D/math-utils.js
@@ -897,19 +897,21 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
897	getAxisAngleBetween3DVectors: {	897	getAxisAngleBetween3DVectors: {
898	value: function (vec1, vec2, axis) {	898	value: function (vec1, vec2, axis) {
899	//compute magnitudes of the vectors	899	//compute magnitudes of the vectors
900	var mag1 = VecUtils.vecMag(3, vec1);	900	var v1n = VecUtils.vecNormalize(3, vec1, 1.0);
901	var mag2 = VecUtils.vecMag(3, vec2);	901	var v2n = VecUtils.vecNormalize(3, vec2, 1.0);
902
903	if (mag1 < this.EPSILON \|\| mag2 < this.EPSILON) {
904	return 0; //if angle 0 is returned nothing from this function should be used
905	}
906	//angle between the vectors (acos for now...)	902	//angle between the vectors (acos for now...)
907	var angle = Math.acos(VecUtils.vecDot(3, vec1, vec2) / (mag1 * mag2));	903	var angle = Math.acos(VecUtils.vecDot(3, v1n, v2n));
908	if (Math.abs(angle) < this.EPSILON) {	904	if (Math.abs(angle) < this.EPSILON) {
909	return 0;	905	return 0;
910	}	906	}
		907	//TODO testing...remove this block
		908	console.log("getAxisAngleBetween3DVectors Angle: "+angle);
		909	if (isNaN(angle)){
		910	console.log("getAxisAngleBetween3DVectors Angle is NaN");
		911	}
		912	//TODO end testing block
911	//optionally, if axis is provided, create the axis of rotation as well	913	//optionally, if axis is provided, create the axis of rotation as well
912	var rotAxis = VecUtils.vecCross(3, vec1, vec2);	914	var rotAxis = VecUtils.vecCross(3, v1n, v2n);
913	rotAxis = VecUtils.vecNormalize(3, rotAxis, 1);	915	rotAxis = VecUtils.vecNormalize(3, rotAxis, 1);
914	axis[0] = rotAxis[0];	916	axis[0] = rotAxis[0];
915	axis[1] = rotAxis[1];	917	axis[1] = rotAxis[1];


diff --git a/js/helper-classes/RDGE/GLAnchorPoint.js b/js/helper-classes/RDGE/GLAnchorPoint.js index 496b6f60..716f59d4 100644 --- a/js/helper-classes/RDGE/GLAnchorPoint.js +++ b/js/helper-classes/RDGE/GLAnchorPoint.js
@@ -26,125 +26,136 @@ function GLAnchorPoint() {
26	this._nextX = 0.0;	26	this._nextX = 0.0;
27	this._nextY = 0.0;	27	this._nextY = 0.0;
28	this._nextZ = 0.0;	28	this._nextZ = 0.0;
29		29	}
30	// ********* setters **********	30	// ********* setters **********
31	this.setPos = function (x, y, z) { this._x = x; this._y = y; this._z = z; }	31	GLAnchorPoint.prototype.setPos = function (x, y, z) { this._x = x; this._y = y; this._z = z; }
32	this.setPrevPos = function (x, y, z) { this._prevX = x; this._prevY = y; this._prevZ = z; }	32	GLAnchorPoint.prototype.setPrevPos = function (x, y, z) { this._prevX = x; this._prevY = y; this._prevZ = z; }
33	this.setNextPos = function (x, y, z) { this._nextX = x; this._nextY = y; this._nextZ = z; }	33	GLAnchorPoint.prototype.setNextPos = function (x, y, z) { this._nextX = x; this._nextY = y; this._nextZ = z; }
34
35	this.setPrevFromNext = function () {
36	//set the previous control point by reflecting the next control point
37	var dispX = this._nextX - this._x;
38	var dispY = this._nextY - this._y;
39	var dispZ = this._nextZ - this._z;
40
41	this._prevX = this._x - dispX;
42	this._prevY = this._y - dispY;
43	this._prevZ = this._z - dispZ;
44	}
45	this.setNextFromPrev = function () {
46	//set the previous control point by reflecting the next control point