Ver código fonte

Moving to beta 2

David Catuhe 7 anos atrás
pai
commit
ee1bc83913

Diferenças do arquivo suprimidas por serem muito extensas
+ 12117 - 12117
Playground/babylon.d.txt


Diferenças do arquivo suprimidas por serem muito extensas
+ 9382 - 9382
dist/preview release/babylon.d.ts


Diferenças do arquivo suprimidas por serem muito extensas
+ 8 - 8
dist/preview release/babylon.js


+ 5 - 7
dist/preview release/babylon.max.js

@@ -11262,7 +11262,7 @@ var BABYLON;
         });
         Object.defineProperty(Engine, "Version", {
             get: function () {
-                return "3.2.0-beta.1";
+                return "3.2.0-beta.2";
             },
             enumerable: true,
             configurable: true
@@ -78589,15 +78589,14 @@ var BABYLON;
             if (!this._intersectsWithSphere(impostor, origin, radius)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var direction = impostorObjectCenter.subtract(origin);
             var ray = new BABYLON.Ray(origin, direction, radius);
             this._rays.push(ray);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;
@@ -78893,15 +78892,14 @@ var BABYLON;
             if (!this._intersectsWithCylinder(impostor)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var originOnPlane = new BABYLON.Vector3(this._origin.x, impostorObjectCenter.y, this._origin.z); // the distance to the origin as if both objects were on a plane (Y-axis)
             var originToImpostorDirection = impostorObjectCenter.subtract(originOnPlane);
             var ray = new BABYLON.Ray(originOnPlane, originToImpostorDirection, this._radius);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;

Diferenças do arquivo suprimidas por serem muito extensas
+ 8 - 8
dist/preview release/babylon.worker.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 5305 - 5305
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


Diferenças do arquivo suprimidas por serem muito extensas
+ 8 - 8
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


+ 5 - 7
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -11262,7 +11262,7 @@ var BABYLON;
         });
         Object.defineProperty(Engine, "Version", {
             get: function () {
-                return "3.2.0-beta.1";
+                return "3.2.0-beta.2";
             },
             enumerable: true,
             configurable: true
@@ -77874,15 +77874,14 @@ var BABYLON;
             if (!this._intersectsWithSphere(impostor, origin, radius)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var direction = impostorObjectCenter.subtract(origin);
             var ray = new BABYLON.Ray(origin, direction, radius);
             this._rays.push(ray);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;
@@ -78178,15 +78177,14 @@ var BABYLON;
             if (!this._intersectsWithCylinder(impostor)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var originOnPlane = new BABYLON.Vector3(this._origin.x, impostorObjectCenter.y, this._origin.z); // the distance to the origin as if both objects were on a plane (Y-axis)
             var originToImpostorDirection = impostorObjectCenter.subtract(originOnPlane);
             var ray = new BABYLON.Ray(originOnPlane, originToImpostorDirection, this._radius);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;

+ 5 - 7
dist/preview release/customConfigurations/minimalGLTFViewer/es6.js

@@ -11234,7 +11234,7 @@ var BABYLON;
         });
         Object.defineProperty(Engine, "Version", {
             get: function () {
-                return "3.2.0-beta.1";
+                return "3.2.0-beta.2";
             },
             enumerable: true,
             configurable: true
@@ -77846,15 +77846,14 @@ var BABYLON;
             if (!this._intersectsWithSphere(impostor, origin, radius)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var direction = impostorObjectCenter.subtract(origin);
             var ray = new BABYLON.Ray(origin, direction, radius);
             this._rays.push(ray);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;
@@ -78150,15 +78149,14 @@ var BABYLON;
             if (!this._intersectsWithCylinder(impostor)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var originOnPlane = new BABYLON.Vector3(this._origin.x, impostorObjectCenter.y, this._origin.z); // the distance to the origin as if both objects were on a plane (Y-axis)
             var originToImpostorDirection = impostorObjectCenter.subtract(originOnPlane);
             var ray = new BABYLON.Ray(originOnPlane, originToImpostorDirection, this._radius);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;

+ 5 - 7
dist/preview release/es6.js

@@ -11234,7 +11234,7 @@ var BABYLON;
         });
         Object.defineProperty(Engine, "Version", {
             get: function () {
-                return "3.2.0-beta.1";
+                return "3.2.0-beta.2";
             },
             enumerable: true,
             configurable: true
@@ -78561,15 +78561,14 @@ var BABYLON;
             if (!this._intersectsWithSphere(impostor, origin, radius)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var direction = impostorObjectCenter.subtract(origin);
             var ray = new BABYLON.Ray(origin, direction, radius);
             this._rays.push(ray);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;
@@ -78865,15 +78864,14 @@ var BABYLON;
             if (!this._intersectsWithCylinder(impostor)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var originOnPlane = new BABYLON.Vector3(this._origin.x, impostorObjectCenter.y, this._origin.z); // the distance to the origin as if both objects were on a plane (Y-axis)
             var originToImpostorDirection = impostorObjectCenter.subtract(originOnPlane);
             var ray = new BABYLON.Ray(originOnPlane, originToImpostorDirection, this._radius);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;

Diferenças do arquivo suprimidas por serem muito extensas
+ 6 - 6
dist/preview release/viewer/babylon.viewer.js


+ 5 - 7
dist/preview release/viewer/babylon.viewer.max.js

@@ -11350,7 +11350,7 @@ var BABYLON;
         });
         Object.defineProperty(Engine, "Version", {
             get: function () {
-                return "3.2.0-beta.1";
+                return "3.2.0-beta.2";
             },
             enumerable: true,
             configurable: true
@@ -78677,15 +78677,14 @@ var BABYLON;
             if (!this._intersectsWithSphere(impostor, origin, radius)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var direction = impostorObjectCenter.subtract(origin);
             var ray = new BABYLON.Ray(origin, direction, radius);
             this._rays.push(ray);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;
@@ -78981,15 +78980,14 @@ var BABYLON;
             if (!this._intersectsWithCylinder(impostor)) {
                 return null;
             }
-            if (impostor.object.getClassName() !== 'Mesh') {
+            if (impostor.object.getClassName() !== 'Mesh' && impostor.object.getClassName() !== 'InstancedMesh') {
                 return null;
             }
-            var impostorObject = impostor.object;
             var impostorObjectCenter = impostor.getObjectCenter();
             var originOnPlane = new BABYLON.Vector3(this._origin.x, impostorObjectCenter.y, this._origin.z); // the distance to the origin as if both objects were on a plane (Y-axis)
             var originToImpostorDirection = impostorObjectCenter.subtract(originOnPlane);
             var ray = new BABYLON.Ray(originOnPlane, originToImpostorDirection, this._radius);
-            var hit = ray.intersectsMesh(impostorObject);
+            var hit = ray.intersectsMesh(impostor.object);
             var contactPoint = hit.pickedPoint;
             if (!contactPoint) {
                 return null;

+ 1 - 1
src/Engine/babylon.engine.ts

@@ -597,7 +597,7 @@
         }
 
         public static get Version(): string {
-            return "3.2.0-beta.1";
+            return "3.2.0-beta.2";
         }
 
         // Updatable statics so stick with vars here