Skip to content

Update DragControls.js #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theo-armour wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update DragControls.js #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions DragControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ THREE.DragControls = function(_camera, _objects, _domElement) {
if (_objects instanceof THREE.Scene) {
_objects = _objects.children;
}
var _projector = new THREE.Projector();
// var _projector = new THREE.Projector();

var _mouse = new THREE.Vector3(),
_offset = new THREE.Vector3();
Expand Down Expand Up @@ -116,7 +116,11 @@ THREE.DragControls = function(_camera, _objects, _domElement) {
_mouse.x = (event.clientX / _domElement.width) * 2 - 1;
_mouse.y = -(event.clientY / _domElement.height) * 2 + 1;

var ray = _projector.pickingRay(_mouse, _camera);
var vector = new THREE.Vector3( mouse.x, mouse.y, 0.5 ).unproject( camera );

var ray = new THREE.Raycaster( camera.position, vector.sub( camera.position ).normalize() );

// var ray = _projector.pickingRay(_mouse, _camera);

if (me.enabled && _selected) {
var targetPos = ray.ray.direction.clone().multiplyScalar(_selected.distance).add(ray.ray.origin);
Expand Down Expand Up @@ -156,15 +160,19 @@ THREE.DragControls = function(_camera, _objects, _domElement) {
_mouse.x = (event.clientX / _domElement.width) * 2 - 1;
_mouse.y = -(event.clientY / _domElement.height) * 2 + 1;

var ray = _projector.pickingRay(_mouse, _camera);
var vector = new THREE.Vector3( mouse.x, mouse.y, 0.5 ).unproject( camera );

var ray = new THREE.Raycaster( camera.position, vector.sub( camera.position ).normalize() );

// var ray = _projector.pickingRay(_mouse, _camera);
var intersects = ray.intersectObjects(_objects);

var hit = intersects.length > 0;

if (hit) {
_selected = intersects[0];

_offset.copy(_selected.point).subSelf(_selected.object.position);
_offset.copy(_selected.point).sub(_selected.object.position);

_domElement.style.cursor = 'move';

Expand Down