Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/three/renderer/controls/EnvironmentControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from 'three';
import { PivotPointMesh } from './PivotPointMesh.js';
import { PointerTracker } from './PointerTracker.js';
import { mouseToCoords, makeRotateAroundPoint, setRaycasterFromCamera } from './utils.js';
import { adjustedPointerToCoords, makeRotateAroundPoint, setRaycasterFromCamera } from './utils.js';

export const NONE = 0;
export const DRAG = 1;
Expand Down Expand Up @@ -271,7 +271,7 @@ export class EnvironmentControls extends EventDispatcher {

// the "pointer" for zooming and rotating should be based on the center point
pointerTracker.getCenterPoint( _pointer );
mouseToCoords( _pointer.x, _pointer.y, domElement, _pointer );
adjustedPointerToCoords( _pointer, domElement, _pointer );
setRaycasterFromCamera( raycaster, _pointer, camera );

// prevent the drag distance from getting too severe by limiting the drag point
Expand Down Expand Up @@ -988,7 +988,7 @@ export class EnvironmentControls extends EventDispatcher {
if ( zoomIntoPoint ) {

// get the mouse position after zoom
mouseToCoords( _pointer.x, _pointer.y, domElement, _mouseAfter );
adjustedPointerToCoords( _pointer, domElement, _mouseAfter );
_mouseAfter.unproject( camera );

// shift the camera on the near plane so the mouse is in the same spot
Expand Down Expand Up @@ -1056,7 +1056,7 @@ export class EnvironmentControls extends EventDispatcher {

const { domElement, raycaster, camera, zoomDirection, pointerTracker } = this;
pointerTracker.getLatestPoint( _pointer );
mouseToCoords( _pointer.x, _pointer.y, domElement, _mouseBefore );
adjustedPointerToCoords( _pointer, domElement, _mouseBefore );
setRaycasterFromCamera( raycaster, _mouseBefore, camera );
zoomDirection.copy( raycaster.ray.direction ).normalize();
this.zoomDirectionSet = true;
Expand Down Expand Up @@ -1087,7 +1087,7 @@ export class EnvironmentControls extends EventDispatcher {
// If using an orthographic camera we have to account for the mouse position when picking the point
if ( camera.isOrthographicCamera && pointerTracker.getLatestPoint( _zoomPointPointer ) ) {

mouseToCoords( _zoomPointPointer.x, _zoomPointPointer.y, domElement, _zoomPointPointer );
adjustedPointerToCoords( _zoomPointPointer, domElement, _zoomPointPointer );
setRaycasterFromCamera( raycaster, _zoomPointPointer, camera );

} else {
Expand Down Expand Up @@ -1152,7 +1152,7 @@ export class EnvironmentControls extends EventDispatcher {

// get the pointer and plane
pointerTracker.getCenterPoint( _pointer );
mouseToCoords( _pointer.x, _pointer.y, domElement, _pointer );
adjustedPointerToCoords( _pointer, domElement, _pointer );

_plane.setFromNormalAndCoplanarPoint( up, pivotPoint );
setRaycasterFromCamera( raycaster, _pointer, camera );
Expand Down
4 changes: 2 additions & 2 deletions src/three/renderer/controls/GlobeControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Group,
} from 'three';
import { DRAG, ZOOM, EnvironmentControls, NONE } from './EnvironmentControls.js';
import { makeRotateAroundPoint, mouseToCoords, setRaycasterFromCamera } from './utils.js';
import { makeRotateAroundPoint, adjustedPointerToCoords, setRaycasterFromCamera } from './utils.js';
import { Ellipsoid } from '../math/Ellipsoid.js';
import { WGS84_ELLIPSOID } from '../math/GeoConstants.js';

Expand Down Expand Up @@ -427,7 +427,7 @@ export class GlobeControls extends EnvironmentControls {

// get the pointer and ray
pointerTracker.getCenterPoint( _pointer );
mouseToCoords( _pointer.x, _pointer.y, domElement, _pointer );
adjustedPointerToCoords( _pointer, domElement, _pointer );
setRaycasterFromCamera( raycaster, _pointer, camera );

// transform to ellipsoid frame
Expand Down
8 changes: 4 additions & 4 deletions src/three/renderer/controls/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ export function makeRotateAroundPoint( point, quat, target ) {

}

// get the three.js pointer coords from an event
export function mouseToCoords( clientX, clientY, element, target ) {
// get the three.js pointer coords from an adjusted pointer (via PointerTracker)
export function adjustedPointerToCoords( pointer, element, target ) {

target.x = ( ( clientX - element.offsetLeft ) / element.clientWidth ) * 2 - 1;
target.y = - ( ( clientY - element.offsetTop ) / element.clientHeight ) * 2 + 1;
target.x = ( pointer.x / element.clientWidth ) * 2 - 1;
target.y = - ( pointer.y / element.clientHeight ) * 2 + 1;

if ( target.isVector3 ) {

Expand Down
Loading