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

Conflicts: js/helper-classes/RDGE/GLMaterial.js js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/FlatMaterial.js js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js js/helper-classes/RDGE/Materials/JuliaMaterial.js js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js js/helper-classes/RDGE/Materials/MandelMaterial.js js/helper-classes/RDGE/Materials/PlasmaMaterial.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/Materials/RadialGradientMaterial.js js/helper-classes/RDGE/Materials/TunnelMaterial.js js/helper-classes/RDGE/Materials/TwistMaterial.js js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/src/core/script/renderer.js js/panels/Materials/Materials.xml Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
author: Nivesh Rajbhandari 2012-02-09 13:23:07 -0800
committer: Nivesh Rajbhandari 2012-02-09 13:23:07 -0800
commit: 148e6f7c00e54b0ec6fa6bb6791f0ac0920af511 (patch)
tree: 889719cf024d73e2e1e93d73a40f96a2a8d27dc6 /js
parent: a9a02ef8a206082ea9ea0cb66f3fb70e1f4256df (diff)
parent: 666ae3e9119410cbf7fa974274d95336aaff091c (diff)
download: ninja-148e6f7c00e54b0ec6fa6bb6791f0ac0920af511.tar.gz
20 files changed, 1471 insertions, 2038 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/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
index 6a458cc7..d8c212e8 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.css
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -18,14 +18,15 @@
    width: 100%;
 }
 .treeRoot .branch .branch-label {
-    border-bottom: 1px solid #505050;
-    cursor: pointer;
-    padding: 3px 0 4px;
    background-repeat: no-repeat;
    background-position: 3px 2px;
-    box-shadow: 0 0 0 0 rgba(0,0,0,0);
+    border-bottom: 1px solid #505050;
-    font-weight: bold;
    box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2);
+    color: #FFF;
+    cursor: pointer;
+    font-weight: bold;
+    padding: 3px 0 4px;
+    text-shadow: 1px 1px 0 #000;
 }
 /* First Level */
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
index b2f427b5..085b11e0 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -19,6 +19,8 @@
 /* Second level */
 .branch .branch .leaf-label {
    background-position: 25px center;
+    box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2);
+    color: #FFF;
    padding-left: 45px;
 }
 /* Third level */
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index d70b016c..4f9e6a72 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -26,7 +26,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                "name" : "Branch"
            },
            "defaultLeaf" : {
-                "module" : "js/components/treeview/presets-leaf.reel",
+                "module" : "js/components/treeview/leaf.reel",
                "name" : "Leaf"
            },
            "scrollview": {
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 71ed62a0..37044763 100644
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -8,7 +8,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 // Class Utils
 //      Math Utility functions
 ///////////////////////////////////////////////////////////////////////
-var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
+var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
+        ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
+        Rectangle = require("js/helper-classes/3D/rectangle").Rectangle;
 var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
    ///////////////////////////////////////////////////////////////////////
@@ -536,6 +538,99 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
        }
    },
+        rectsOverlap:
+        {
+                value: function( pt, width, height,  elt )
+                {
+                        // only consider rectangles with non-zero area
+                        if ((width == 0) || (height == 0))  return false;
+                        // get the mins/maxs of the onput rectangle
+                        var xMin, xMax, yMin, yMax;
+                        if (width > 0)  {  xMin = pt[0];   xMax = pt[0] + width;  }
+                        else  {  xMax = pt[0];  xMin = pt[0] + width;  }
+                        if (height > 0)  {  yMin = pt[1];   yMax = pt[1] + height;  }
+                        else  {  yMax = pt[1];  yMin = pt[1] + height;  }
author	Nivesh Rajbhandari	2012-02-09 13:23:07 -0800
committer	Nivesh Rajbhandari	2012-02-09 13:23:07 -0800
commit	148e6f7c00e54b0ec6fa6bb6791f0ac0920af511 (patch)
tree	889719cf024d73e2e1e93d73a40f96a2a8d27dc6 /js
parent	a9a02ef8a206082ea9ea0cb66f3fb70e1f4256df (diff)
parent	666ae3e9119410cbf7fa974274d95336aaff091c (diff)
download	ninja-148e6f7c00e54b0ec6fa6bb6791f0ac0920af511.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/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css index 6a458cc7..d8c212e8 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.css +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -18,14 +18,15 @@
18	width: 100%;	18	width: 100%;
19	}	19	}
20	.treeRoot .branch .branch-label {	20	.treeRoot .branch .branch-label {
21	border-bottom: 1px solid #505050;
22	cursor: pointer;
23	padding: 3px 0 4px;
24	background-repeat: no-repeat;	21	background-repeat: no-repeat;
25	background-position: 3px 2px;	22	background-position: 3px 2px;
26	box-shadow: 0 0 0 0 rgba(0,0,0,0);	23	border-bottom: 1px solid #505050;
27	font-weight: bold;
28	box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2);	24	box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2);
		25	color: #FFF;
		26	cursor: pointer;
		27	font-weight: bold;
		28	padding: 3px 0 4px;
		29	text-shadow: 1px 1px 0 #000;
29	}	30	}
30		31
31	/* First Level */	32	/* First Level */


diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css index b2f427b5..085b11e0 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -19,6 +19,8 @@
19	/* Second level */	19	/* Second level */
20	.branch .branch .leaf-label {	20	.branch .branch .leaf-label {
21	background-position: 25px center;	21	background-position: 25px center;
		22	box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2);
		23	color: #FFF;
22	padding-left: 45px;	24	padding-left: 45px;
23	}	25	}
24	/* Third level */	26	/* Third level */


diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html index d70b016c..4f9e6a72 100644 --- a/js/components/treeview/treeview.reel/treeview.html +++ b/js/components/treeview/treeview.reel/treeview.html
@@ -26,7 +26,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
26	"name" : "Branch"	26	"name" : "Branch"
27	},	27	},
28	"defaultLeaf" : {	28	"defaultLeaf" : {
29	"module" : "js/components/treeview/presets-leaf.reel",	29	"module" : "js/components/treeview/leaf.reel",
30	"name" : "Leaf"	30	"name" : "Leaf"
31	},	31	},
32	"scrollview": {	32	"scrollview": {


diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js index 71ed62a0..37044763 100644 --- a/js/helper-classes/3D/math-utils.js +++ b/js/helper-classes/3D/math-utils.js
@@ -8,7 +8,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
8	// Class Utils	8	// Class Utils
9	// Math Utility functions	9	// Math Utility functions
10	///////////////////////////////////////////////////////////////////////	10	///////////////////////////////////////////////////////////////////////
11	var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;	11	var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
		12	ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
		13	Rectangle = require("js/helper-classes/3D/rectangle").Rectangle;
12		14
13	var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {	15	var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
14	///////////////////////////////////////////////////////////////////////	16	///////////////////////////////////////////////////////////////////////
@@ -536,6 +538,99 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
536	}	538	}
537	},	539	},
538		540
		541	rectsOverlap:
		542	{
		543	value: function( pt, width, height, elt )
		544	{
		545	// only consider rectangles with non-zero area
		546	if ((width == 0) \|\| (height == 0)) return false;
		547
		548	// get the mins/maxs of the onput rectangle
		549	var xMin, xMax, yMin, yMax;
		550	if (width > 0) { xMin = pt[0]; xMax = pt[0] + width; }
		551	else { xMax = pt[0]; xMin = pt[0] + width; }
		552	if (height > 0) { yMin = pt[1]; yMax = pt[1] + height; }
		553	else { yMax = pt[1]; yMin = pt[1] + height; }
		554