1 files changed, 88 insertions, 98 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index b4563ea5..6e9d1121 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -4,11 +4,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-
+// namespace for the Ninja Canvas Runtime
+var NinjaCvsRt =  NinjaCvsRt || {};
 
 ///////////////////////////////////////////////////////////////////////
 //Loading webGL/canvas data
-function initWebGl (rootElement, directory) {
+NinjaCvsRt.initWebGl = function (rootElement, directory) {
         var cvsDataMngr, ninjaWebGlData = JSON.parse((document.querySelectorAll(['script[data-ninja-webgl]'])[0].innerHTML.replace('(', '')).replace(')', ''));
         if (ninjaWebGlData && ninjaWebGlData.data) {
                 for (var n=0; ninjaWebGlData.data[n]; n++) {
@@ -16,7 +17,7 @@ function initWebGl (rootElement, directory) {
                 }
         }
         //Creating data manager
-        cvsDataMngr = new CanvasDataManager();
+        cvsDataMngr = new NinjaCvsRt.CanvasDataManager();
         //Loading data to canvas(es)
         cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
 };
@@ -25,7 +26,7 @@ function initWebGl (rootElement, directory) {
 // Class ShapeRuntime
 //      Manages runtime shape display
 ///////////////////////////////////////////////////////////////////////
-function CanvasDataManager()
+NinjaCvsRt.CanvasDataManager = function () 
 {
         this.loadGLData = function(root,  valueArray,  assetPath )
         {
@@ -54,32 +55,13 @@ function CanvasDataManager()
                                         var canvas = this.findCanvasWithID( id, root );
                                         if (canvas)
                                         {
-                                                new GLRuntime( canvas, jObj,  assetPath );
+                                                new NinjaCvsRt.GLRuntime( canvas, jObj,  assetPath );
                                         }
                                 }
                         }
                 }
         };
 
-        this.collectGLData = function( elt,  dataArray )
-        {
-                if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
-                {
-                        var data = elt.elementModel.shapeModel.GLWorld.export( true );
-                        dataArray.push( data );
-                }
-
-                if (elt.children)
-                {
-                        var nKids = elt.children.length;
-                        for (var i=0;  i<nKids;  i++)
-                        {
-                                var child = elt.children[i];
-                                this.collectGLData( child, dataArray );
-                        }
-                }
-        };
-
         this.findCanvasWithID = function( id,  elt )
         {
                 var cid = elt.getAttribute( "data-RDGE-id" );
@@ -102,7 +84,7 @@ function CanvasDataManager()
 // Class GLRuntime
 //      Manages runtime fora WebGL canvas
 ///////////////////////////////////////////////////////////////////////
-function GLRuntime( canvas, jObj,  assetPath )
+NinjaCvsRt.GLRuntime = function ( canvas, jObj,  assetPath )
 {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
@@ -307,17 +289,17 @@ function GLRuntime( canvas, jObj,  assetPath )
                 switch (type)
                 {
                         case 1:
-                                obj = new RuntimeRectangle();
+                                obj = new NinjaCvsRt.RuntimeRectangle();
                                 obj.import( jObj, parent );
                                 break;
 
                         case 2:         // circle
-                                obj = new RuntimeOval();
+                                obj = new NinjaCvsRt.RuntimeOval();
                                 obj.import( jObj, parent );
                                 break;
 
                         case 3:         // line
-                                obj = new RuntimeLine();
+                                obj = new NinjaCvsRt.RuntimeLine();
                                 obj.import( jObj, parent );
                                 break;
 
@@ -457,7 +439,7 @@ function GLRuntime( canvas, jObj,  assetPath )
 // Class RuntimeGeomObj
 //      Super class for all geometry classes
 ///////////////////////////////////////////////////////////////////////
-function RuntimeGeomObj()
+NinjaCvsRt.RuntimeGeomObj = function ()
 {
     ///////////////////////////////////////////////////////////////////////
     // Constants
@@ -517,12 +499,12 @@ function RuntimeGeomObj()
                         var shaderName = matObj.material;
                         switch (shaderName)
                         {
-                                case "flat":                    mat = new RuntimeFlatMaterial();                                break;
-                                case "radialGradient":  mat = new RuntimeRadialGradientMaterial();              break;
-                                case "linearGradient":  mat = new RuntimeLinearGradientMaterial();              break;
-                                case "bumpMetal":               mat = new RuntimeBumpMetalMaterial();                   break;
-                                case "uber":                    mat = new RuntimeUberMaterial();                                break;
-                                case "plasma":                  mat = new RuntimePlasmaMaterial();                              break;
+                                case "flat":                    mat = new NinjaCvsRt.RuntimeFlatMaterial();                             break;
+                                case "radialGradient":  mat = new NinjaCvsRt.RuntimeRadialGradientMaterial();           break;
+                                case "linearGradient":  mat = new NinjaCvsRt.RuntimeLinearGradientMaterial();           break;
+                                case "bumpMetal":               mat = new NinjaCvsRt.RuntimeBumpMetalMaterial();                        break;
+                                case "uber":                    mat = new NinjaCvsRt.RuntimeUberMaterial();                             break;
+                                case "plasma":                  mat = new NinjaCvsRt.RuntimePlasmaMaterial();                           break;
 
                                 case "deform":
                                 case "water":
@@ -539,7 +521,7 @@ function RuntimeGeomObj()
                                 case "zinvert":
                                 case "keleidoscope":
                                 case "radialBlur":
-                                case "pulse":                   mat = new RuntimePulseMaterial();                               break;
+                                case "pulse":                   mat = new NinjaCvsRt.RuntimePulseMaterial();                            break;
 
                                 default:
                                         console.log( "material type: " + materialType + " is not supported" );
@@ -624,8 +606,8 @@ function RuntimeGeomObj()
         var rtnVec;
                 if (!len)  len = 1.0;
 
-        var sum = 0.0;
-        for (var i=0;  i<dimen;  i++)
+        var sum = 0.0, i = 0;
+        for (i = 0;  i<dimen;  i++)
             sum += vec[i]*vec[i];
         sum = Math.sqrt( sum );
 
@@ -633,7 +615,7 @@ function RuntimeGeomObj()
         {
             var scale = len/sum;
             rtnVec = [];
-            for (var i=0;  i<dimen;  i++)
+            for (i = 0;  i<dimen;  i++)
                 rtnVec[i] = vec[i]*scale;
         }
 
@@ -683,10 +665,10 @@ function RuntimeGeomObj()
 ///////////////////////////////////////////////////////////////////////
 // Class RuntimeRectangle
 ///////////////////////////////////////////////////////////////////////
-function RuntimeRectangle()
+NinjaCvsRt.RuntimeRectangle = function ()
 {
-        // inherit the members of RuntimeGeomObj
-        this.inheritedFrom = RuntimeGeomObj;
+        // inherit the members of NinjaCvsRt.RuntimeGeomObj
+        this.inheritedFrom = NinjaCvsRt.RuntimeGeomObj;
         this.inheritedFrom();
 
         this.import = function( jObj )
@@ -801,13 +783,14 @@ function RuntimeRectangle()
                 
                 // render the fill
                 ctx.beginPath();
+        var c = null, inset = 0;
                 if (this._fillColor)
                 {
-                        var c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";  
+                        c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";  
                         ctx.fillStyle = c;
 
                         ctx.lineWidth   = lw;
-                        var inset = Math.ceil( lw ) + 0.5;
+                        inset = Math.ceil( lw ) + 0.5;
                         this.renderPath( inset, ctx );
                         ctx.fill();
                         ctx.closePath();
@@ -817,11 +800,11 @@ function RuntimeRectangle()
                 ctx.beginPath();
                 if (this._strokeColor)
                 {
-                        var c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";  
+                        c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";  
                         ctx.strokeStyle = c;