Skip to content

Commit

Permalink
Showing 2 changed files with 2 additions and 9 deletions.
3 changes: 1 addition & 2 deletions Source/Scene/CameraEventAggregator.js
Original file line number Diff line number Diff line change
@@ -71,7 +71,6 @@ define([
aggregator._buttonsDown++;
isDown[key] = true;
pressTime[key] = new Date();
Cartesian2.clone(event.position, eventStartPosition[key]);
}, ScreenSpaceEventType.PINCH_START, modifier);

aggregator._eventHandler.setInputAction(function() {
@@ -418,7 +417,7 @@ define([
}
//>>includeEnd('debug');

if (type === CameraEventType.WHEEL) {
if (type === CameraEventType.WHEEL || type === CameraEventType.PINCH) {
return this._currentMousePosition;
}

8 changes: 1 addition & 7 deletions Source/Scene/ScreenSpaceCameraController.js
Original file line number Diff line number Diff line change
@@ -1687,13 +1687,7 @@ define([
*/
ScreenSpaceCameraController.prototype.destroy = function() {
this._tweens.removeAll();
this._spinHandler = this._spinHandler && this._spinHandler.destroy();
this._translateHandler = this._translateHandler && this._translateHandler.destroy();
this._lookHandler = this._lookHandler && this._lookHandler.destroy();
this._rotateHandler = this._rotateHandler && this._rotateHandler.destroy();
this._zoomHandler = this._zoomHandler && this._zoomHandler.destroy();
this._zoomWheelHandler = this._zoomWheelHandler && this._zoomWheelHandler.destroy();
this._pinchHandler = this._pinchHandler && this._pinchHandler.destroy();
this._aggregator = this._aggregator && this._aggregator.destroy();
return destroyObject(this);
};

0 comments on commit a6e430c

Please sign in to comment.