Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

80 files changed, 2212 insertions, 1613 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index a35f473d..ee9f24a4 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -121,13 +121,12 @@ NinjaCvsRt.GLRuntime = function ( canvas, jObj,  assetPath )
         // all "live" materials
         this._materials = [];
 
-        // provide the mapping for the asset directory
-        if (assetPath)
-        {
-                this._assetPath = assetPath.slice();
-                if (this._assetPath[this._assetPath.length-1] != '/')
-                        this._assetPath += '/';
-        }
+    // provide the mapping for the asset directory
+    if (assetPath) {
+        this._assetPath = assetPath.slice();
+        if (this._assetPath[this._assetPath.length - 1] != '/')
+            this._assetPath += '/';
+    }
 
         if(this._assetPath !== undefined) {
                 RDGE.globals.engine.setAssetPath(this._assetPath);
@@ -289,23 +288,23 @@ NinjaCvsRt.GLRuntime = function ( canvas, jObj,  assetPath )
 
         this.importObject = function( jObj,  parent )
         {
-                var type = jObj.type
+                var type = jObj.type;
                 var obj;
                 switch (type)
                 {
                         case 1:
                                 obj = new NinjaCvsRt.RuntimeRectangle();
-                                obj.importJSON( jObj, parent );
+                                obj.importJSON( jObj );
                                 break;
 
                         case 2:         // circle
                                 obj = new NinjaCvsRt.RuntimeOval();
-                                obj.importJSON( jObj, parent );
+                                obj.importJSON( jObj );
                                 break;
 
                         case 3:         // line
                                 obj = new NinjaCvsRt.RuntimeLine();
-                                obj.importJSON( jObj, parent );
+                                obj.importJSON( jObj );
                                 break;
 
                         default:
@@ -514,7 +513,7 @@ NinjaCvsRt.RuntimeGeomObj = function ()
                                 case "pulse":                   mat = new NinjaCvsRt.RuntimePulseMaterial();                            break;
 
                                 default:
-                                        console.log( "material type: " + materialType + " is not supported" );
+                                        console.log( "material type: " + shaderName + " is not supported" );
                                         break;
                         }
 
@@ -638,7 +637,7 @@ NinjaCvsRt.RuntimeGeomObj = function ()
         
                 return mat;     
         };
-        
+
         this.MatrixRotationZ = function( angle )
         {
                 var mat = this.MatrixIdentity(4);
@@ -742,7 +741,7 @@ NinjaCvsRt.RuntimeRectangle = function ()
                                 ctx.quadraticCurveTo( width-inset, inset,  width-inset-rad, inset );
 
                         // do the top of the rectangle
-                        pt = [inset, inset]
+                        pt = [inset, inset];
                         rad = tlRad - inset;
                         if (rad < 0)  rad = 0;
                         pt[0] += rad;
@@ -771,34 +770,81 @@ NinjaCvsRt.RuntimeRectangle = function ()
                 var     w = world.getViewportWidth(),