Merge branch 'SevenDotOneCommits' of https://github.com/ericmueller/ninja into v0.7.1

7 files changed, 74 insertions, 6 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 4181dd89..7c2554df 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -289,7 +289,7 @@ NinjaCvsRt.GLRuntime = Object.create(Object.prototype, {
             this.renderer.cameraManager().setActiveCamera(cam);
 
             // change clear color
-            this.renderer.setClearColor([1.0, 1.0, 1.0, 0.0]);
+            this.renderer.setClearColor([0.0, 0.0, 0.0, 0.0]);
 
             // create an empty scene graph
             this.myScene = new RDGE.SceneGraph();
diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js
index 4ff95cc4..f0600793 100755
--- a/js/helper-classes/RDGE/src/core/script/MeshManager.js
+++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js
@@ -201,11 +201,31 @@ RDGE.MeshManager.prototype.onLoaded = function (meshName) {
 };
 
 RDGE.MeshManager.prototype.exportJSON = function () {
+    
     for (var m in this.modelMap) {
         this.modelMap[m].primitive.built = false;
     }
 
-    return JSON.stringify(this.modelMap);
+    function replacer(key, value) {
+        if (key === "bufferStreams")
+        {
+            var nStreams = value.length;
+            for (iStream=0;  iStream<nStreams;  iStream++)
+            {
+                var arr = value[iStream];
+                var n = arr.length;
+                for (var i=0;  i<n;  i++)
+                {
+                    var val = arr[i];
+                    arr[i] = val.toFixed ? Number(val.toFixed(4)) : val;
+                }
+            }
+        }
+
+        return value;
+    }
+
+    return JSON.stringify(this.modelMap, replacer);
 };
 
 RDGE.MeshManager.prototype.importJSON = function (jsonMeshExport) {
diff --git a/js/helper-classes/RDGE/src/core/script/renderer.js b/js/helper-classes/RDGE/src/core/script/renderer.js
index 889cd62e..52158514 100755
--- a/js/helper-classes/RDGE/src/core/script/renderer.js
+++ b/js/helper-classes/RDGE/src/core/script/renderer.js
@@ -363,6 +363,8 @@ RDGE._renderer = function (canvas) {
         if (mips === undefined)
             mips = true;
 
+        //console.log( "createTexture " + url + ", unloadedCount: " + this.unloadedTextureCount + ", world " + RDGE.globals.engine.getContext().renderer._world._worldCount );
+
         if (texture) {
             texture.image = new Image();
             texture.image.src = url;
@@ -380,7 +382,7 @@ RDGE._renderer = function (canvas) {
             texture.image.onerror = function () {
                 this.context.renderer.unloadedTextureCount--;
                 if (texture.callback) texture.callback(texture);
-                //console.log( "Error loading texture: " + texture.image.src );
+                console.log( "Error loading texture: " + texture.image.src );
                 if (this.context.renderer.unloadedTextureCount < 0)
                     console.log("more textures loaded then created...");
             };
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index ca2f07cc..b9f9863f 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -439,6 +439,11 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
     // in the case of a procedurally built scene an init state is not needed for loading data
     this._canvas.rdgeid = this._canvas.getAttribute( "data-RDGE-id" );
     if (this._useWebGL) {
+        // make sure the id is unique
+        var id = this.uniqueifyID( this._canvas.rdgeid );
+        this._canvas.rdgeid = id;
+        this._canvas.setAttribute( "data-rdge-id", id );
+
         rdgeStarted = true;
         RDGE.globals.engine.unregisterCanvas( this._canvas );
         RDGE.globals.engine.registerCanvas(this._canvas, this);
@@ -673,13 +678,35 @@ World.prototype.updateMaterials = function( obj, time ) {
         var n = matArray.length;
         for (var i=0;  i<n;  i++) {
             matArray[i].update( time );
-    }
+        }
     }
 
     this.updateMaterials( obj.getNext(),  time );
     this.updateMaterials( obj.getChild(), time );
 };
 
+
+World.prototype.uniqueifyID = function( id )
+{
+    var ctx = RDGE.globals.engine.getContext( id );
+    while ( ctx )
+    {
+        var num = 0;
+        var index = id.indexOf( "_" );
+        if (index >= 0)
+        {
+            var subStr = id.substr( index+1);
+            num = Number( subStr ) + 1;
+            id = id.substr( 0,  index );
+        }
+
+        id = id + "_" + num;
+        ctx = RDGE.globals.engine.getContext( id );
+    }
+
+    return id;
+}
+
 // return the origin of the world in NDC
 World.prototype.getNDCOrigin = function() {
   var pt = MathUtils.transformPoint( [0,0,0], this.getCameraMatInverse() );
@@ -973,7 +1000,6 @@ World.prototype.importJSON = function (jObj)
         // start RDGE
         rdgeStarted = true;
         var id = this._canvas.getAttribute( "data-RDGE-id" );
-        this._canvas.rdgeid = id;
         RDGE.globals.engine.registerCanvas(this._canvas, this);
         RDGE.RDGEStart(this._canvas);
         this._canvas.task.stop()
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 12f5c5a1..164d31ee 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -864,6 +864,17 @@ BrushStroke.prototype.drawToContext = function(ctx, drawStageWorldPts, stageWorl
 }; //this.drawToCanvas()
 
 
+
+BrushStroke.prototype._fixCoordPrecision = function(coord, precision){
+    var i=0;
+    var numPoints = coord.length;
+    for (i=0;i<numPoints;i++){
+        coord[i][0] = parseFloat((coord[i][0]).toFixed(precision));
+        coord[i][1] = parseFloat((coord[i][1]).toFixed(precision));
+        coord[i][2] = parseFloat((coord[i][2]).toFixed(precision));
+    }
+};
+
 BrushStroke.prototype.exportJSON = function(){
     var retObject= new Object();
     //the type of this object
@@ -873,9 +884,10 @@ BrushStroke.prototype.exportJSON = function(){
     //the geometry for this object
     retObject.localPoints = this._LocalPoints.slice(0);
     this._copyCoordinates3D(this._LocalPoints, retObject.localPoints); //todo is this necessary in addition to the slice(0) above?
+    this._fixCoordPrecision(retObject.localPoints, 4);
     retObject.origLocalPoints = this._OrigLocalPoints.slice(0);
     this._copyCoordinates3D(this._OrigLocalPoints, retObject.origLocalPoints); //todo <ditto>
-
+    this._fixCoordPrecision(retObject.origLocalPoints, 4);
     retObject.stageWorldCenter = [this._stageWorldCenter[0],this._stageWorldCenter[1],this._stageWorldCenter[2]];
     retObject.planeMat = this._planeMat;
     retObject.planeMatInv = this._planeMatInv;
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index e8571e9d..227a772a 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -263,6 +263,10 @@ var Material = function GLMaterial( world ) {
         var material = this._materialNode;
         if (material)  technique = material.shaderProgram[this.getTechniqueName()];
 
+        // make sure RDGE has the correct context
+        if (this.getWorld())
+            RDGE.globals.engine.setContext( this.getWorld().getCanvas().rdgeid );
+
         if(prop === "gradient") {
             this.setGradientData(value);
         } else {
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index c772e36c..d12ba7d2 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -569,7 +569,11 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     var alignArray = new Array();
                     snapManager.snapAlignToElementBounds( this._clickedObject, delta, alignArray );
                     if (alignArray.length > 0)
+                    {
+                        alignArray.push( hitRec );
+                        snapManager.sortHitRecords( alignArray );
                         hitRec = alignArray[0];
+                    }
                 }
             }