Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

1 files changed, 154 insertions, 8 deletions

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()
                 // get the world
                 var world = this.getWorld();
                 if (!world)  throw( "null world in buildBuffers" );
-
+                //console.log( "GLRectangle.buildBuffers " + world._worldCount );
                 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();
@@ -284,6 +287,7 @@ function GLRectangle()
                 xFill -= strokeSize;
                 yFill -= strokeSize;
                 var fillMaterial = this.makeFillMaterial();
+                //console.log( "fillMaterial: " + fillMaterial.getName() );
                 var fillPrim = this.createFill([x,y],  2*xFill,  2*yFill,  tlRadius, blRadius, brRadius, trRadius, fillMaterial);
         this._primArray.push( fillPrim );
                 this._materialNodeArray.push( fillMaterial.getMaterialNode() );
@@ -418,7 +422,7 @@ function GLRectangle()
         this.createStroke = function(ctr,  width,  height,  strokeWidth,  tlRad, blRad, brRad, trRad, material)
         {
                 // create the geometry
-                var prim = RectangleStroke.create( ctr,  width, height, strokeWidth,  tlRad, blRad,  brRad, trRad)
+                var prim = RectangleStroke.create( ctr,  width, height, strokeWidth,  tlRad, blRad,  brRad, trRad, material)
                 return prim;
         }
 
@@ -428,9 +432,9 @@ function GLRectangle()
                 // special the (common) case of no rounded corners
                 var prim
                 if ((tlRad <= 0) && (blRad <= 0) && (brRad <= 0) && (trRad <= 0))
-                        prim = RectangleGeometry.create( ctr, width, height );
+                        prim = RectangleGeometry.create( ctr, width, height, material );
                 else
-                        prim = RectangleFill.create( ctr,  width, height,  tlRad, blRad,  brRad, trRad);
+                        prim = RectangleFill.create( ctr,  width, height,  tlRad, blRad,  brRad, trRad, material);
 
                 return prim;
         }
@@ -679,7 +683,7 @@ function GLRectangle()
  }
 
 RectangleFill = {};
-RectangleFill.create = function( rectCtr,  width, height, tlRad, blRad,  brRad, trRad)
+RectangleFill.create = function( rectCtr,  width, height, tlRad, blRad,  brRad, trRad,  material)
 {
         var x = rectCtr[0],  y = rectCtr[1],  z = 0.0;
         var     hw = 0.5*width,  hh = 0.5*height;
@@ -766,6 +770,17 @@ RectangleFill.create = function( rectCtr,  width, height, tlRad, blRad,  brRad,
                 j++;
         }
 
+        //refine the mesh for vertex deformations
+        if (material)
+        {
+                if (material.hasVertexDeformation())
+                {
+                        var paramRange = material.getVertexDeformationRange();
+                        var tolerance = material.getVertexDeformationTolerance();
+                        nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );
+                }
+        }
+
         // create the RDGE primitive
         var prim = ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
         return prim;
@@ -838,7 +853,7 @@ RectangleFill.getRoundedCorner = function(ctr, startPt,  vertices)
 
 
 RectangleStroke = {};
-RectangleStroke.create = function( rectCtr,  width, height, strokeWidth,  tlRad, blRad,  brRad, trRad)
+RectangleStroke.create = function( rectCtr,  width, height, strokeWidth,  tlRad, blRad,  brRad, trRad, material)
 {
         var x = rectCtr[0],  y = rectCtr[1],  z = 0.0;
         var     hw = 0.5*width,  hh = 0.5*height,  sw = strokeWidth;
@@ -1029,8 +1044,20 @@ RectangleStroke.create = function( rectCtr,  width, height, strokeWidth,  tlRad,
                 k++;
         }
 
+        //refine the mesh for vertex deformations
+        if (material)
+        {
+                if (material.hasVertexDeformation())
+                {
+                        var paramRange = material.getVertexDeformationRange();
+                        var tolerance = material.getVertexDeformationTolerance();
+                        nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );
+                }
+        }
+
         // create the RDGE primitive
         var prim = ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+        //var prim = ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.LINES, nVertices);
         return prim;
 }
 
@@ -1073,7 +1100,7 @@ RectangleStroke.getUV		= RectangleFill.getUV;
 
 // Helper function for generating Three.js geometry
 RectangleGeometry = {};
-RectangleGeometry.create = function( ctr,  width, height )
+RectangleGeometry.create = function( ctr,  width, height, material )
 {
         var x = ctr[0],  y = ctr[1],  z = 0.0;
         var     hw = 0.5*width,  hh = 0.5*height;
@@ -1111,8 +1138,20 @@ RectangleGeometry.create = function( ctr,  width, height )
         RectangleGeometry.pushIndices( 2, 1, 0 );
         RectangleGeometry.pushIndices( 0, 3, 2 );
 
+        //refine the mesh for vertex deformations
+        if (material)
+        {
+                if (material.hasVertexDeformation())
+                {
+                        var paramRange = material.getVertexDeformationRange();
+                        var tolerance = material.getVertexDeformationTolerance();
+                        nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );
+                }
+        }
+
         // create the RDGE primitive
         var prim = ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+        //var prim = ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.LINES, nVertices);
         return prim;
 }
 
@@ -1182,3 +1221,110 @@ ShapePrimitive.create = function(coords,  normals,  uvs,  indices, primType, ver
 
         return prim;
 }
+
+
+ShapePrimitive.refineMesh = function( verts, norms, uvs, indices, nVertices,  paramRange,  tolerance )
+{
+        // get the param range
+        var pUMin = paramRange[0],  pVMin = paramRange[1],
+                pUMax = paramRange[2],  pVMax = paramRange[3];
+        var iTriangle = 0;
+        var nTriangles = indices.length/3;
+        var index = 0;
+        while (iTriangle < nTriangles)
+        {
+                // get the indices of the 3 vertices
+                var i0 = indices[index],
+                        i1 = indices[index+1],
+                        i2 = indices[index+2];
+
+                // get the uv values
+                //var vrtIndex = 3*iTriangle;
+                var iuv0 = 2 * i0,
+                        iuv1 = 2 * i1,
+                        iuv2 = 2 * i2;
+                var u0 = uvs[iuv0],  v0 = uvs[iuv0+1],
+                        u1 = uvs[iuv1],  v1 = uvs[iuv1+1],
+                        u2 = uvs[iuv2],  v2 = uvs[iuv2+1];
+
+                // find the u and v range
+                var uMin = u0,  vMin = v0;
+                if (u1 < uMin)  uMin = u1;  if (v1 < vMin)  vMin = v1;
+                if (u2 < uMin)  uMin = u2;  if (v2 < vMin)  vMin = v2;
+                var uMax = u0,  vMax = v0;
+                if (u1 > uMax)  uMax = u1;  if (v1 > vMax)  vMax = v1;
+                if (u2 > uMax)  uMax = u2;  if (v2 > vMax)  vMax = v2;
+
+                // if the parameter range of the triangle is outside the
+                // desired parameter range, advance to the next polygon and continue