Browse Source

Merge pull request #878 from RaananW/previewbuild

Updating current build
Raanan Weber 9 years ago
parent
commit
8a78c153d1

File diff suppressed because it is too large
+ 21 - 19
dist/preview release/babylon.core.js


File diff suppressed because it is too large
+ 1108 - 1108
dist/preview release/babylon.d.ts


File diff suppressed because it is too large
+ 29 - 25
dist/preview release/babylon.js


File diff suppressed because it is too large
+ 6055 - 6048
dist/preview release/babylon.max.js


File diff suppressed because it is too large
+ 28 - 24
dist/preview release/babylon.noworker.js


+ 2 - 2
src/Materials/babylon.effect.js

@@ -134,7 +134,7 @@ var BABYLON;
                 return;
                 return;
             }
             }
             var vertexShaderUrl;
             var vertexShaderUrl;
-            if (vertex[0] === "." || vertex[0] === "/") {
+            if (vertex[0] === "." || vertex[0] === "/" || vertex.indexOf("http") > -1) {
                 vertexShaderUrl = vertex;
                 vertexShaderUrl = vertex;
             }
             }
             else {
             else {
@@ -160,7 +160,7 @@ var BABYLON;
                 return;
                 return;
             }
             }
             var fragmentShaderUrl;
             var fragmentShaderUrl;
-            if (fragment[0] === "." || fragment[0] === "/") {
+            if (fragment[0] === "." || fragment[0] === "/" || fragment.indexOf("http") > -1) {
                 fragmentShaderUrl = fragment;
                 fragmentShaderUrl = fragment;
             }
             }
             else {
             else {

+ 1 - 0
src/Physics/Plugins/babylon.cannonJSPlugin.js

@@ -139,6 +139,7 @@ var BABYLON;
                 case BABYLON.PhysicsEngine.MeshImpostor:
                 case BABYLON.PhysicsEngine.MeshImpostor:
                     var rawVerts = mesh.getVerticesData(BABYLON.VertexBuffer.PositionKind);
                     var rawVerts = mesh.getVerticesData(BABYLON.VertexBuffer.PositionKind);
                     var rawFaces = mesh.getIndices();
                     var rawFaces = mesh.getIndices();
+                    BABYLON.Tools.Warn("MeshImpostor only collides against spheres.");
                     returnValue = new CANNON.Trimesh(rawVerts, rawFaces); //this._createConvexPolyhedron(rawVerts, rawFaces, mesh);
                     returnValue = new CANNON.Trimesh(rawVerts, rawFaces); //this._createConvexPolyhedron(rawVerts, rawFaces, mesh);
                     break;
                     break;
                 case BABYLON.PhysicsEngine.HeightmapImpostor:
                 case BABYLON.PhysicsEngine.HeightmapImpostor: