|
@@ -11644,6 +11644,9 @@ var BABYLON;
|
|
|
var engine = this.camera.getEngine();
|
|
|
this._pointerInput = function (p, s) {
|
|
|
var evt = p.event;
|
|
|
+ if (evt.pointerType === "touch") {
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (p.type === BABYLON.PointerEventTypes.POINTERDOWN) {
|
|
|
try {
|
|
|
evt.srcElement.setPointerCapture(evt.pointerId);
|
|
@@ -11854,14 +11857,13 @@ var BABYLON;
|
|
|
};
|
|
|
this._pointerInput = function (p, s) {
|
|
|
var evt = p.event;
|
|
|
+ if (evt.pointerType === "mouse") {
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (p.type === BABYLON.PointerEventTypes.POINTERDOWN) {
|
|
|
- if (evt.pointerType === "mouse") {
|
|
|
- return;
|
|
|
- }
|
|
|
if (!noPreventDefault) {
|
|
|
evt.preventDefault();
|
|
|
}
|
|
|
- // evt.srcElement.setPointerCapture(evt.pointerId);
|
|
|
_this._pointerPressed.push(evt.pointerId);
|
|
|
if (_this._pointerPressed.length !== 1) {
|
|
|
return;
|
|
@@ -11872,13 +11874,9 @@ var BABYLON;
|
|
|
};
|
|
|
}
|
|
|
else if (p.type === BABYLON.PointerEventTypes.POINTERUP) {
|
|
|
- if (evt.pointerType === "mouse") {
|
|
|
- return;
|
|
|
- }
|
|
|
if (!noPreventDefault) {
|
|
|
evt.preventDefault();
|
|
|
}
|
|
|
- // evt.srcElement.releasePointerCapture(evt.pointerId);
|
|
|
var index = _this._pointerPressed.indexOf(evt.pointerId);
|
|
|
if (index === -1) {
|
|
|
return;
|
|
@@ -11892,9 +11890,6 @@ var BABYLON;
|
|
|
_this._offsetY = null;
|
|
|
}
|
|
|
else if (p.type === BABYLON.PointerEventTypes.POINTERMOVE) {
|
|
|
- if (evt.pointerType === "mouse") {
|
|
|
- return;
|
|
|
- }
|
|
|
if (!noPreventDefault) {
|
|
|
evt.preventDefault();
|
|
|
}
|
|
@@ -31192,7 +31187,7 @@ var BABYLON;
|
|
|
return;
|
|
|
}
|
|
|
this._boundingBias = value.clone();
|
|
|
- this.updateExtend();
|
|
|
+ this.updateBoundingInfo(true, null);
|
|
|
},
|
|
|
enumerable: true,
|
|
|
configurable: true
|
|
@@ -31255,24 +31250,27 @@ var BABYLON;
|
|
|
if (kind === BABYLON.VertexBuffer.PositionKind) {
|
|
|
var stride = vertexBuffer.getStrideSize();
|
|
|
this._totalVertices = data.length / stride;
|
|
|
+ this.updateBoundingInfo(updateExtends, data);
|
|
|
+ }
|
|
|
+ this.notifyUpdate(kind);
|
|
|
+ };
|
|
|
+ Geometry.prototype.updateBoundingInfo = function (updateExtends, data) {
|
|
|
+ if (updateExtends) {
|
|
|
+ this.updateExtend(data);
|
|
|
+ }
|
|
|
+ var meshes = this._meshes;
|
|
|
+ var numOfMeshes = meshes.length;
|
|
|
+ for (var index = 0; index < numOfMeshes; index++) {
|
|
|
+ var mesh = meshes[index];
|
|
|
+ mesh._resetPointsArrayCache();
|
|
|
if (updateExtends) {
|
|
|
- this.updateExtend(data);
|
|
|
- }
|
|
|
- var meshes = this._meshes;
|
|
|
- var numOfMeshes = meshes.length;
|
|
|
- for (var index = 0; index < numOfMeshes; index++) {
|
|
|
- var mesh = meshes[index];
|
|
|
- mesh._resetPointsArrayCache();
|
|
|
- if (updateExtends) {
|
|
|
- mesh._boundingInfo = new BABYLON.BoundingInfo(this._extend.minimum, this._extend.maximum);
|
|
|
- for (var subIndex = 0; subIndex < mesh.subMeshes.length; subIndex++) {
|
|
|
- var subMesh = mesh.subMeshes[subIndex];
|
|
|
- subMesh.refreshBoundingInfo();
|
|
|
- }
|
|
|
+ mesh._boundingInfo = new BABYLON.BoundingInfo(this._extend.minimum, this._extend.maximum);
|
|
|
+ for (var subIndex = 0; subIndex < mesh.subMeshes.length; subIndex++) {
|
|
|
+ var subMesh = mesh.subMeshes[subIndex];
|
|
|
+ subMesh.refreshBoundingInfo();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- this.notifyUpdate(kind);
|
|
|
};
|
|
|
Geometry.prototype.getTotalVertices = function () {
|
|
|
if (!this.isReady()) {
|