|
@@ -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;
|