Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	js/ninja.reel/ninja.html

25 files changed, 548 insertions, 2369 deletions

diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 942eb528..08057778 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -133,6 +133,9 @@ function GLCircle()
         if (!world)  throw( "null world in buildBuffers" );
 
                 if (!world._useWebGL)  return;
+                
+                // make sure RDGE has the correct context
+                g_Engine.setContext( world.getCanvas().uuid );
 
          // create the gl buffer
         var gl = world.getGLContext();
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index 67379b52..5ec51230 100755
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -28,6 +28,8 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
     this._strokeWidth = 0.25;
 
     this._strokeStyle = "Solid";
+    this._scaleX = 1.0;
+    this._scaleY = 1.0;
 
     if (arguments.length > 0)
     {
@@ -44,13 +46,9 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         this._strokeColor = strokeColor;
 
         this._strokeStyle = strokeStyle;
+        this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
     }
 
-    this._scaleX = 1.0;
-    this._scaleY = 1.0;
-
-    this._scaleX = (world._viewportWidth)/(world._viewportHeight);
-
     this._strokeVerticesLen = 0;
 
     this.m_world = world;
@@ -104,7 +102,64 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         this.setSlope            = function(m)          {  this._slope = m;                             }
 
     this.geomType       = function()                            {  return this.GEOM_TYPE_LINE;  }
-    
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+        ///////////////////////////////////////////////////////////////////////
+        this.export = function()
+        {
+                var rtnStr = "type: " + this.geomType() + "\n";
+
+                rtnStr += "xoff: "                      + this._xOffset         + "\n";
+                rtnStr += "yoff: "                      + this._yOffset         + "\n";
+                rtnStr += "width: "                     + this._width           + "\n";
+                rtnStr += "height: "            + this._height          + "\n";
+                rtnStr += "xAdj: "                  + this._xAdj                + "\n";
+                rtnStr += "yAdj: "                  + this._yAdj                + "\n";
+                rtnStr += "strokeWidth: "       + this._strokeWidth     + "\n";
+                rtnStr += "strokeColor: "       + String(this._strokeColor)  + "\n";
+                rtnStr += "strokeStyle: "       + this._strokeStyle     + "\n";
+                rtnStr += "slope: "             + String(this._slope)   + "\n";
+
+                rtnStr += "strokeMat: ";
+                if (this._strokeMaterial)
+                        rtnStr += this._strokeMaterial.getName();
+                else
+                        rtnStr += "flatMaterial";
+                rtnStr += "\n";
+
+                return rtnStr;
+        }
+
+        this.import = function( importStr )
+        {
+                this._xOffset                   = Number( this.getPropertyFromString( "xoff: ",                 importStr )  );
+                this._yOffset                   = Number( this.getPropertyFromString( "yoff: ",                 importStr )  );
+                this._width                             = Number( this.getPropertyFromString( "width: ",                importStr )  );
+                this._height                    = Number( this.getPropertyFromString( "height: ",               importStr )  );
+        this._xAdj                          = Number( this.getPropertyFromString( "xAdj: ",                     importStr )  );
+        this._yAdj                          = Number( this.getPropertyFromString( "yAdj: ",                     importStr )  );
+                this._strokeWidth               = Number( this.getPropertyFromString( "strokeWidth: ",  importStr )  );
+                var slope                       = this.getPropertyFromString( "slope: ",        importStr );
+        if(isNaN(Number(slope)))
+            this._slope             = slope;
+        else
+            this._slope         = Number(slope);
+
+                var strokeMaterialName  = this.getPropertyFromString( "strokeMat: ",    importStr );
+                this._strokeStyle               = this.getPropertyFromString( "strokeStyle: ",  importStr );
+                this._strokeColor               = eval( "[" + this.getPropertyFromString( "strokeColor: ",      importStr ) + "]" );
+
+                var strokeMat = MaterialsLibrary.getMaterial( strokeMaterialName );
+                if (!strokeMat)
+                {
+                        console.log( "object material not found in library: " + strokeMaterialName );
+                        strokeMat = new FlatMaterial();
+                }
+                this._strokeMaterial = strokeMat;
+
+        }
+
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
@@ -114,6 +169,9 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         var world = this.getWorld();
         if (!world)  throw( "null world in buildBuffers" );
                 if (!world._useWebGL)  return;
+                
+                // make sure RDGE has the correct context
+                g_Engine.setContext( world.getCanvas().uuid );
 
          // create the gl buffer
         var gl = world.getGLContext();
diff --git a/js/helper-classes/RDGE/GLMaterial.js b/js/helper-classes/RDGE/GLMaterial.js
index e72b7908..642fab05 100755
--- a/js/helper-classes/RDGE/GLMaterial.js
+++ b/js/helper-classes/RDGE/GLMaterial.js
@@ -31,6 +31,11 @@ function GLMaterial( world )
 
         this._texture;
 
+        // vertex deformation variables
+        this._hasVertexDeformation = false;
+        this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
+        this._vertexDeformationTolerance = 0.1;
+
         // RDGE variables
         this._shader;
         this._materialNode;
@@ -66,6 +71,12 @@ function GLMaterial( world )
         // Any material needing continuous rendering should override this method
         this.isAnimated                 = function()                    {  return false;                                        }
 
+        // the vertex shader can apply deformations requiring refinement in
+        // certain areas.
+        this.hasVertexDeformation                       = function()    {  return this._hasVertexDeformation;                   }
+        this.getVertexDeformationRange          = function()    {  return this._vertexDeformationRange.slice(); }       
+        this.getVertexDeformationTolerance      = function()    {  return this._vertexDeformationTolerance;             }
+
 
     ///////////////////////////////////////////////////////////////////////
     // Common Material Methods
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index 2899e476..4216fe53 100755
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -180,7 +180,7 @@ function GLRectangle()
                 this._strokeStyle               = Number( this.getPropertyFromString( "strokeStyle: ",  importStr )  );
                 var strokeMaterialName  = this.getPropertyFromString( "strokeMat: ",    importStr );
                 var fillMaterialName    = this.getPropertyFromString( "fillMat: ",              importStr );
-                this._strokeStyle               =  Number( this.getPropertyFromString( "strokeColor: ", importStr )  );
+                this._strokeStyle               =  this.getPropertyFromString( "strokeStyle: ", importStr );
                 this._fillColor                 =  eval( "[" + this.getPropertyFromString( "fillColor: ",       importStr ) + "]" );
                 this._strokeColor               =  eval( "[" + this.getPropertyFromString( "strokeColor: ",     importStr ) + "]" );
                 this._tlRadius                  =  Number( this.getPropertyFromString( "tlRadius: ",    importStr )  );
@@ -210,8 +210,11 @@ function GLRectangle()