Merge pull request #145 from gwenael-hagenmuller/ourOwnBabylonJS

OurOwnBabylonJS and BoundingInfo

Babylon/Mesh/babylon.mesh.js

@@ -305,20 +305,21 @@ var BABYLON = BABYLON || {};
     };
 
     BABYLON.Mesh.prototype._updateBoundingInfo = function () {
-        if (this._boundingInfo) {
-            this._scaleFactor = Math.max(this.scaling.x, this.scaling.y);
-            this._scaleFactor = Math.max(this._scaleFactor, this.scaling.z);
+        
+        this._boundingInfo = this._boundingInfo || new BABYLON.BoundingInfo(this._absolutePosition, this._absolutePosition);
+        
+        this._scaleFactor = Math.max(this.scaling.x, this.scaling.y);
+        this._scaleFactor = Math.max(this._scaleFactor, this.scaling.z);
 
-            if (this.parent && this.parent._scaleFactor)
-                this._scaleFactor = this._scaleFactor * this.parent._scaleFactor;
+        if (this.parent && this.parent._scaleFactor)
+            this._scaleFactor = this._scaleFactor * this.parent._scaleFactor;
 
-            this._boundingInfo._update(this._worldMatrix, this._scaleFactor);
+        this._boundingInfo._update(this._worldMatrix, this._scaleFactor);
 
-            for (var subIndex = 0; subIndex < this.subMeshes.length; subIndex++) {
-                var subMesh = this.subMeshes[subIndex];
+        for (var subIndex = 0; subIndex < this.subMeshes.length; subIndex++) {
+            var subMesh = this.subMeshes[subIndex];
 
-                subMesh.updateBoundingInfo(this._worldMatrix, this._scaleFactor);
-            }
+            subMesh.updateBoundingInfo(this._worldMatrix, this._scaleFactor);
         }
     };
 

Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/babylonJS.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <files xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="babylonJS.xsd">
+  <script src="Babylon/Tools/babylon.sceneSerializer.js"></script>
   <script src="Babylon/Physics/babylon.physicsEngine.js"></script>
   <script src="Babylon/Tools/babylon.filesInput.js"></script>
   <script src="Babylon/Collisions/babylon.pickingInfo.js"></script>
@@ -24,6 +25,7 @@
   <script src="Babylon/Layer/babylon.layer.js"></script>
   <script src="Babylon/Sprites/babylon.sprite.js"></script>
   <script src="Babylon/Sprites/babylon.spriteManager.js"></script>
+  <script src="Babylon/Loading/Plugins/babylon.babylonFileLoader.js"></script>
   <script src="Babylon/Loading/babylon.sceneLoader.js"></script>
   <script src="Babylon/Tools/babylon.database.js"></script>
   <script src="Babylon/Materials/babylon.multiMaterial.js"></script>
@@ -59,10 +61,8 @@
   <script src="Babylon/Culling/babylon.boundingBox.js"></script>
   <script src="Babylon/Culling/babylon.boundingSphere.js"></script>
   <script src="Babylon/babylon.engine.js"></script>
-  <script src="Babylon/Math/babylon.tools.js"></script>
-  <script src="Babylon/Tools/babylon.math.js"></script>
-  <script src="Babylon/babylon.node.js"></script>
-  <script src="Babylon/Tools/babylon.sceneSerializer.js"></script>
   <script src="Babylon/Math/babylon.axis.js"></script>
-  <script src="Babylon/Loading/Plugins/babylon.babylonFileLoader.js"></script>
+  <script src="Babylon/Math/babylon.math.js"></script>
+  <script src="Babylon/Tools/babylon.tools.js"></script>
+  <script src="Babylon/babylon.node.js"></script>
 </files>