Skip to content

Extend Picker to pick individual Points objects. #379

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

Merged
vidartf merged 1 commit into from
Aug 10, 2022
Merged

Extend Picker to pick individual Points objects. #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion js/scripts/three-class-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,14 @@ module.exports = {
event: new Types.String('click', {
help: 'The DOM MouseEvent type to trigger the pick',
}),
lineThreshold: new Types.Float(1.0, {
nullable: false,
help: 'The threshold value for line picking',
}),
pointThreshold: new Types.Float(1.0, {
nullable: false,
help: 'The threshold value for point picking',
}),
all: new Types.Bool(false, {
help: 'Wether to send info on all object intersections beneath the picked point, or only the first one. See ``picked``.',
}),
Expand All @@ -276,6 +284,10 @@ module.exports = {
point: new Types.Vector3(0, 0, 0, {
help: 'The coordinates of the picked point (all zero if no object picked)',
}),
instanceId: new Types.Int(null, {
nullable: true,
help: 'The InstanceID if picking a multi-instanced object',
}),
face: new Types.Vector3(0, 0, 0, {
help: 'The vertex indices of the picked face (all zero if no face picked)',
}),
Expand All @@ -285,6 +297,10 @@ module.exports = {
faceVertices: new Types.VectorArray({
help: 'The three vertices that make up the picked face, as vectors (empty if no face picked)',
}),
index: new Types.Int(null, {
nullable: true,
help: 'The index of a picked Points instance',
}),
faceIndex: new Types.Int(null, {
nullable: true,
help: 'The index of the face picked (null if no face picked)',
Expand All @@ -310,7 +326,8 @@ module.exports = {
},
propsDefinedByThree: [
'distance', 'point', 'face', 'faceNormal', 'faceVertices',
'faceIndex', 'object', 'picked', 'uv', 'indices'],
'faceIndex', 'object', 'picked', 'uv', 'indices', 'instanceId',
'index'],
constructorArgs: ['controlling'],
},

Expand Down
14 changes: 12 additions & 2 deletions js/src/controls/Picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ var PickerModel = PickerAutogen.PickerModel.extend({

onPick: function() {
var mouse = this.obj.pickCoordinates;
var objects = pick(mouse, this.camera, this.get('controlling').obj);
var objects = pick(mouse, this.camera, this.get('controlling').obj,
this.get('lineThreshold'), this.get('pointThreshold')
);

var info = getinfo(objects.length > 0 ? objects[0] : null);

Expand Down Expand Up @@ -102,8 +104,12 @@ PickerControls.prototype = Object.create( THREE.EventDispatcher.prototype );
PickerControls.prototype.constructor = PickerControls;


function pick(mouse, camera, root) {
function pick(mouse, camera, root, lineThreshold, pointThreshold) {
var raycaster = new THREE.Raycaster();
raycaster.params = {
'Points': { 'threshold': pointThreshold },
'Line': { 'threshold': lineThreshold }
};
raycaster.setFromCamera( mouse, camera );
return raycaster.intersectObject(root, true);
}
Expand Down Expand Up @@ -134,6 +140,8 @@ function getinfo(o) {
faceIndex: o.faceIndex !== undefined && o.faceIndex !== null ? o.faceIndex : null,
object: o.object.ipymodel,
uv: o.uv ? [o.uv.x, o.uv.y] : [0, 0],
instanceId: o.instanceId !== undefined ? o.instanceId : null,
index: o.index !== undefined ? o.index : null,
};
}
return {
Expand All @@ -146,6 +154,8 @@ function getinfo(o) {
faceIndex: null,
object: null,
uv: [0, 0],
instanceId: null,
index: null,
};
}

Expand Down