Merge branch 'master' of github.com:Motorola-Mobility/ninja

2 files changed, 24 insertions, 2 deletions

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...");
             };