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

1 files changed, 208 insertions, 1 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index ba03c347..7edc90d8 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -393,6 +393,17 @@ exports.PiData = Montage.create( Montage, {
                     ],
                     [
                         {
+                            type: "checkbox",
+                            id: "animate",
+                            prop: "animate",
+                            defaultValue: true,
+                            value: "Animate",
+                            checked: true,
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        }
+                    ],
+                    [
+                        {
                             type: "dropdown",
                             id:   "strokeMaterial",
                             prop:   "strokeMaterial",
@@ -402,6 +413,13 @@ exports.PiData = Montage.create( Montage, {
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                             enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
                             divider : true
+                        },
+                        {
+                            type: "button",
+                            id: "editStrokeMaterial",
+                            prop: "editStrokeMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                         }
                     ],
                     [
@@ -414,6 +432,13 @@ exports.PiData = Montage.create( Montage, {
                             dataField: "_name",
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                             enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        },
+                        {
+                            type: "button",
+                            id: "editFillMaterial",
+                            prop: "editFillMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                         }
                     ]
                 ]
@@ -472,6 +497,17 @@ exports.PiData = Montage.create( Montage, {
                     ],
                     [
                         {
+                            type: "checkbox",
+                            id: "animate",
+                            prop: "animate",
+                            defaultValue: true,
+                            value: "Animate",
+                            checked: true,
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        }
+                    ],
+                    [
+                        {
                             type: "dropdown",
                             id:   "strokeMaterial",
                             prop:   "strokeMaterial",
@@ -481,6 +517,13 @@ exports.PiData = Montage.create( Montage, {
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                             enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
                             divider : true
+                        },
+                        {
+                            type: "button",
+                            id: "editStrokeMaterial",
+                            prop: "editStrokeMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                         }
                     ]
                 ]
@@ -559,6 +602,17 @@ exports.PiData = Montage.create( Montage, {
                     ],
                     [
                         {
+                            type: "checkbox",
+                            id: "animate",
+                            prop: "animate",
+                            defaultValue: true,
+                            value: "Animate",
+                            checked: true,
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        }
+                    ],
+                    [
+                        {
                             type: "dropdown",
                             id:   "strokeMaterial",
                             prop:   "strokeMaterial",
@@ -568,6 +622,13 @@ exports.PiData = Montage.create( Montage, {
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                             enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
                             divider : true
+                        },
+                        {
+                            type: "button",
+                            id: "editStrokeMaterial",
+                            prop: "editStrokeMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                         }
                     ],
                     [
@@ -580,12 +641,158 @@ exports.PiData = Montage.create( Montage, {
                             dataField: "_name",
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                             enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        },
+                        {
+                            type: "button",
+                            id: "editFillMaterial",
+                            prop: "editFillMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                         }
                     ]
                 ]
             }
         ]
-    }
+    },
+    SubpathPi: {
+        value: [
+            {
+                label: "Stroke",
+
+                Section: [
+                    [
+                        {
+                            type : "color",
+                            prop: "border",
+                            id : "stroke"
+                        },
+                        {
+                            type : "color",
+                            id : "fill",
+                            prop: "background",
+                            divider : true
+                        }
+                    ],
+                    [
+                        {
+                            type : "hottext",
+                            id : "strokeSize",
+                            prop : "strokeSize",
+                            label : "Stroke",
+                            valueMutator: parseFloat,
+                            min :   1,
+                            max :   100,
+                            value : 1,
+                            unit : "px",
+                            acceptableUnits: ["pt", "px"]
+                        }
+                    ]
+                ]
+            }
+        ]
+    },
+    BrushStrokePi: {
+        value: [
+            {
+                label: "Stroke",
+
+                Section: [
+                    [
+                        {
+                            type : "color",
+                            prop: "border",
+                            id : "stroke"
+                        },
+                        {
+                            type : "color",
+                            id : "fill",
+                            prop: "background",
+                            visible : false,
+                            divider : true
+                        }
+                    ],
+                    [
+                        {
+                            type : "hottext",
+                            id : "strokeSize",
+                            prop : "strokeSize",
+                            label : "Stroke",
+                            valueMutator: parseInt,
+                            min :   1,
+                            max :   100,
+                            value : 1,
+                            unit : "px",
+                            acceptableUnits: ["pt", "px"]
+                        },
+                        {
+                            type : "hottext",
+                            id : "strokeHardness",
+                            prop : "strokeHardness",
+                            label : "Hardness",