Merge branch 'master' into pentool

109 files changed, 6368 insertions, 6224 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 104c22cc..eeafaab6 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -17,7 +17,7 @@ NinjaCvsRt.initWebGl = function (rootElement, directory) {
                 }
         }
         //Creating data manager
-        cvsDataMngr = new NinjaCvsRt.CanvasDataManager();
+        cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
         //Loading data to canvas(es)
         cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
 };
@@ -26,1062 +26,870 @@ NinjaCvsRt.initWebGl = function (rootElement, directory) {
 // Class ShapeRuntime
 //      Manages runtime shape display
 ///////////////////////////////////////////////////////////////////////
-NinjaCvsRt.CanvasDataManager = function () 
-{
-        this.loadGLData = function(root,  valueArray,  assetPath )
-        {
-                if (assetPath)
-                        this._assetPath = assetPath.slice();
-
-                var value = valueArray;
-                var nWorlds = value.length;
-                for (var i=0;  i<nWorlds;  i++)
-                {
-                        var importStr = value[i];
-
-                        // there should be some version information in
-                        // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
-                        // be in the first 24 characters).
-                        var index = importStr.indexOf( ';' );
-                        if ((importStr[0] === 'v') && (index < 24))
-                        {
-                                // JSON format.  pull off the version info
-                                importStr = importStr.substr( index+1 );
-
+NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, {
+
+    loadGLData: {
+        value: function(root, valueArray, assetPath) {
+            if (assetPath)
+                this._assetPath = assetPath.slice();
+
+            var value = valueArray;
+            var nWorlds = value.length;
+            for (var i=0;  i<nWorlds;  i++)
+            {
+                var importStr = value[i];
+
+                // there should be some version information in
+                // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
+                // be in the first 24 characters).
+                var index = importStr.indexOf( ';' );
+                if ((importStr[0] === 'v') && (index < 24))
+                {
+                    // JSON format.  pull off the version info
+                    importStr = importStr.substr( index+1 );
+