43 files changed, 2647 insertions, 2198 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 9fc9b576..e62af921 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -166,10 +166,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                     }
                     break;
                 case "editStrokeMaterial":
-                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "strokeMaterial")});
+                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "strokeMaterial"),  useSelection: true,  whichMaterial: 'stroke'});
                     break;
                 case "editFillMaterial":
-                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "fillMaterial")});
+                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "fillMaterial"),  useSelection: true,  whichMaterial: 'fill'});
                     break;
                 case "animate":
                     if(value)
diff --git a/js/helper-classes/RDGE/src/tools/compile-rdge-core.bat b/js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
deleted file mode 100644
index 50a9a460..00000000
--- a/js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
+++ /dev/null
@@ -1 +0,0 @@
-java -jar ./compiler.jar --compilation_level SIMPLE_OPTIMIZATIONS --manage_closure_dependencies --js ../core/script/math/vec2.js --js ../core/script/math/vec3.js --js ../core/script/math/vec4.js --js ../core/script/math/mat4.js --js ../core/script/math/quat.js --js ../core/script/objectManager.js --js ../core/script/precompiled.js --js ../core/script/renderer.js --js ../core/script/renderUtils.js --js ../core/script/jshader.js --js ../core/script/jpass.js --js ../core/script/RenderProcs.js --js ../core/script/RenderInitProcs.js --js ../core/script/MeshManager.js --js ../core/script/ShaderManager.js --js ../core/script/ScreenQuad.js --js ../core/script/box.js --js ../core/script/camera.js --js ../core/script/shadowLight.js --js ../core/script/utilities.js --js ../core/script/engine.js --js ../core/script/scenegraphNodes.js --js ../core/script/scenegraph.js --js ../core/script/lightmanager.js --js ../core/script/rendercontext.js --js ../core/script/particle.js --js ../core/script/run_state.js --js ../core/script/init_state.js --js ../core/script/runtime.js --js_output_file ../../rdge-compiled.js
diff --git a/js/helper-classes/RDGE/src/tools/compile-rdge-core.sh b/js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
deleted file mode 100644
index ed6d521a..00000000
--- a/js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -jar ./compiler.jar --compilation_level SIMPLE_OPTIMIZATIONS --manage_closure_dependencies --js ../core/script/math/vec2.js --js ../core/script/math/vec3.js --js ../core/script/math/vec4.js --js ../core/script/math/mat4.js --js ../core/script/math/quat.js --js ../core/script/objectManager.js --js ../core/script/precompiled.js --js ../core/script/renderer.js --js ../core/script/renderUtils.js --js ../core/script/jshader.js --js ../core/script/jpass.js --js ../core/script/RenderProcs.js --js ../core/script/RenderInitProcs.js --js ../core/script/MeshManager.js --js ../core/script/ShaderManager.js --js ../core/script/ScreenQuad.js --js ../core/script/box.js --js ../core/script/camera.js --js ../core/script/shadowLight.js --js ../core/script/utilities.js --js ../core/script/engine.js --js ../core/script/scenegraphNodes.js --js ../core/script/scenegraph.js --js ../core/script/lightmanager.js --js ../core/script/rendercontext.js --js ../core/script/particle.js --js ../core/script/run_state.js --js ../core/script/init_state.js --js ../core/script/runtime.js --js_output_file rdge-compiled.js
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 0dde9af4..8068284e 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -29,13 +29,19 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
     }
 
     this._canvas = canvas;
-        if (this._useWebGL) {
-        if(preserveDrawingBuffer) {
+        if (this._useWebGL)
+        {
+        if(preserveDrawingBuffer)
+                {
             this._glContext = canvas.getContext("experimental-webgl", {preserveDrawingBuffer: true});
-        } else {
+        }
+                else
+                {
                     this._glContext = canvas.getContext("experimental-webgl");
         }
-    } else {
+    }
+        else
+        {
                 this._2DContext = canvas.getContext( "2d" );
     }
     
@@ -77,6 +83,9 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         // keep a counter for generating node names
         this._nodeCounter = 0;
 
+    // for sending notifications to listeners
+    this._notifier = new Notifier();
+
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -119,6 +128,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 
     // Flag to play/pause animation at authortime
     this._previewAnimation = true;
+  
   ////////////////////////////////////////////////////////////////////////////////////
   // RDGE
   // local variables
@@ -143,7 +153,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         this.setCameraMat( camMat );
     
     // post-load processing of the scene
-    this.init = function() {
+    this.init = function()
+        {
                 var ctx1 = RDGE.globals.engine.ctxMan.handleToObject(this._canvas.rdgeCtxHandle),
                         ctx2 = RDGE.globals.engine.getContext();
                 if (ctx1 != ctx2)  console.log( "***** different contexts *****" );
@@ -169,14 +180,14 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         
                 // create some lights
                 // light 1
-                this.light = RDGE.createLightNode("myLight");
-                this.light.setPosition([0,0,1.2]);
-                this.light.setDiffuseColor([0.75,0.9,1.0,1.0]);
+//              this.light = RDGE.createLightNode("myLight");
+//              this.light.setPosition([0,0,1.2]);
+//              this.light.setDiffuseColor([0.75,0.9,1.0,1.0]);
         
                 // light 2
-                this.light2 = RDGE.createLightNode("myLight2");
-                this.light2.setPosition([-0.5,0,1.2]);
-                this.light2.setDiffuseColor([1.0,0.9,0.75,1.0]);
+//              this.light2 = RDGE.createLightNode("myLight2");
+//              this.light2.setPosition([-0.5,0,1.2]);
+//              this.light2.setDiffuseColor([1.0,0.9,0.75,1.0]);
         
                 // create a light transform
                 var lightTr = RDGE.createTransformNode("lightTr");
@@ -185,8 +196,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                 lightTr.attachMaterial(RDGE.createMaterialNode("lights"));
         
                 // enable light channels 1, 2 - channel 0 is used by the default shader
-                lightTr.materialNode.enableLightChannel(1, this.light);
-                lightTr.materialNode.enableLightChannel(2, this.light2);
+//              lightTr.materialNode.enableLightChannel(1, this.light);
+//              lightTr.materialNode.enableLightChannel(2, this.light2);
      
                 // all added objects are parented to the light node
                 this._rootNode = lightTr;
@@ -201,19 +212,21 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         };
     
         // main code for handling user interaction and updating the scene   
-        this.update = function(dt) {
+        this.update = function(dt)
+        {
                 if (!dt)  dt = 0.2;
         
                 dt = 0.01;      // use our own internal throttle
                 this.elapsed += dt;
         
-                if (this._useWebGL) {
+                if (this._useWebGL)
+                {
                         // changed the global position uniform of light 0, another way to change behavior of a light