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

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js
	js/preloader/Preloader.js

37 files changed, 5495 insertions, 0 deletions

diff --git a/js/panels/color/colorbutton-manager.js b/js/panels/color/colorbutton-manager.js
new file mode 100755
index 00000000..a189d040
--- /dev/null
+++ b/js/panels/color/colorbutton-manager.js
@@ -0,0 +1,44 @@
+/* <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 Montage =                   require("montage/core/core").Montage,
+        Component =                     require("montage/ui/component").Component;
+////////////////////////////////////////////////////////////////////////
+//Exporting as ColorPopupManager
+exports.ColorButtonManager = Montage.create(Component, {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
+        value: false
+    },
+    ////////////////////////////////////////////////////////////////////
+    //Storing color manager
+    _colorManager: {
+        enumerable: false,
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    colorManager: {
+        enumerable: true,
+        get: function() {
+            return this._colorManager;
+        },
+        set: function(value) {
+                this._colorManager = value;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _buttons: {
+        enumerable: false,
+        value: {chip: [], fill: [], stroke: [], current: [], previous: [], rgbmode: [], hslmode: [], hexinput: [], nocolor: [], reset: [], swap: [], mlabel1: [], mlabel2: [], mlabel3: []}
+    }
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+});
\ No newline at end of file
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html
new file mode 100755
index 00000000..1ae40cc1
--- /dev/null
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<!-- 
+        <copyright>
+        This file contains proprietary software owned by Motorola Mobility, Inc.
+        No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+        (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
+        </copyright>
+-->
+<html lang="en">
+        <head>
+        
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        
+        <link rel="stylesheet" type="text/css" href="css/colorchippopup.css">
+                
+                <script type="text/montage-serialization">
+        {
+            "owner": {
+                "module": "js/panels/Color/colorchippopup.reel",
+                "name": "colorchippopup",
+                "properties": {
+                    "element": {"#": "cc_popup"}
+                }
+            }
+        }
+                </script>
+                
+        </head>
+        
+        <body>
+    
+        <div id="cc_popup" class="cc_popup">
+                <div id="cc_pu_options">
+                        
+                        <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div>
+                        
+                        <button id="cc_pu_wheel" title="Color Wheel">Color Wheel</button>
+                        <button id="cc_pu_images" title="Background Image">Images</button>
+                        <button id="cc_pu_gradients" title="Gradient">Gradients</button>
+                        <button id="cc_pu_palettes" title="Color Palette">Palettes</button>
+                        <button id="cc_pu_nocolor" title="No Color">No Color</button>
+                        
+                </div>
+                
+                <div id="cc_pu_content">
+                        <div id="cc_pu_wheel_container" class="cc_pu_wheel_container"></div>
+                        <div id="cc_pu_gradient_container" class="cc_pu_gradient_container"></div>
+                        <div id="cc_pu_palette_container" class="cc_pu_palette_container"></div>
+                        <div id="cc_pu_image_container" class="cc_pu_image_container"></div>
+                </div>
+                
+                <div id="cc_pu_alpha">
+                        <div id="cc_pu_a_label">Alpha</div>
+                        <div id="cc_pu_a_slider" class="cc_pu_a_slider"></div>
+                        <input id="cc_pu_a_hottext" class="cc_pu_a_hottext"/>
+                        <div id="cc_pu_a_label2">%</div>
+                </div>
+                
+        </div>
+    
+        </body>
+
+</html>
\ No newline at end of file
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.js b/js/panels/color/colorchippopup.reel/colorchippopup.js
new file mode 100755
index 00000000..414be8b7
--- /dev/null
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.js
@@ -0,0 +1,589 @@
+/* <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 Montage =                   require("montage/core/core").Montage,
+        Component =             require("montage/ui/component").Component,
+        Slider =                        require("js/components/slider.reel").Slider,
+        HotText =                       require("js/components/hottext.reel").HotText,
+        ColorWheel =            require("js/components/colorwheel.reel").ColorWheel,
+        GradientPicker =        require("js/components/gradientpicker.reel").GradientPicker;
+////////////////////////////////////////////////////////////////////////
+//Exporting as ColorPanelPopup
+exports.ColorChipPopup = Montage.create(Component, {
+        ////////////////////////////////////////////////////////////////////
+        //
+        hasTemplate: {
+        value: true
+    },
+    ////////////////////////////////////////////////////////////////////
+    //Storing color manager
+    _colorManager: {
+        enumerable: false,
+        value: false
+    },
+    ////////////////////////////////////////////////////////////////////
+    //Color manager
+    colorManager: {
+        enumerable: true,
+        get: function() {
+            return this._colorManager;
+        },
+        set: function(value) {
+                if (value !== this._colorManager) {
+                        this._colorManager = value;
+                }