Skip to content

feat(View): pointerSize property #26

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
merged 1 commit into from
Aug 3, 2021
Merged

feat(View): pointerSize property #26

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
96 changes: 67 additions & 29 deletions src/core/View.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,14 @@ export default class View extends Component {
if (this.props.pickingModes.indexOf('click') === -1) {
return;
}
const selection = this.pick(x, y, x, y);
const tolerance = this.getPointerSizeTolerance();
const selection = this.pick(
Math.floor(x - tolerance),
Math.floor(y - tolerance),
Math.ceil(x + tolerance),
Math.ceil(y + tolerance),
false
);

// Share the selection with the rest of the world
if (this.props.onClick) {
Expand All @@ -225,7 +232,15 @@ export default class View extends Component {
if (this.props.pickingModes.indexOf('hover') === -1) {
return;
}
const selection = this.pick(x, y, x, y);

const tolerance = this.getPointerSizeTolerance();
const selection = this.pick(
Math.floor(x - tolerance),
Math.floor(y - tolerance),
Math.ceil(x + tolerance),
Math.ceil(y + tolerance),
false
);

// Guard against trigger of empty selection
if (this.lastSelection.length === 0 && selection.length === 0) {
Expand All @@ -248,7 +263,7 @@ export default class View extends Component {
return;
}
const [x1, x2, y1, y2] = selection;
const pickResult = this.pick(x1, y1, x2, y2);
const pickResult = this.pick(x1, y1, x2, y2, true);

// Share the selection with the rest of the world
if (this.props.onSelect) {
Expand Down Expand Up @@ -287,6 +302,10 @@ export default class View extends Component {
);
}

getPointerSizeTolerance() {
return this.props.pointerSize / 2;
}

getScreenEventPositionFor(source) {
const bounds = this.containerRef.current.getBoundingClientRect();
const [canvasWidth, canvasHeight] = this.openglRenderWindow.getSize();
Expand Down Expand Up @@ -476,12 +495,12 @@ export default class View extends Component {
this.renderWindow.render();
}

pick(x1, y1, x2, y2) {
pick(x1, y1, x2, y2, useFrustrum = false) {
this.selector.setArea(x1, y1, x2, y2);
this.previousSelectedData = null;
if (this.selector.captureBuffers()) {
this.selections = this.selector.generateSelection(x1, y1, x2, y2) || [];
if (x1 !== x2 || y1 !== y2) {
if (useFrustrum) {
const frustrum = [
Array.from(
this.openglRenderWindow.displayToWorld(x1, y1, 0, this.renderer)
Expand Down Expand Up @@ -511,7 +530,8 @@ export default class View extends Component {
const representationIds = [];
this.selections.forEach((v) => {
const { prop } = v.getProperties();
const representationId = prop?.get('representationId').representationId;
const representationId =
prop?.get('representationId').representationId;
if (representationId) {
representationIds.push(representationId);
}
Expand All @@ -520,33 +540,45 @@ export default class View extends Component {
}
const ray = [
Array.from(
this.openglRenderWindow.displayToWorld(x1, y1, 0, this.renderer)
this.openglRenderWindow.displayToWorld(
Math.round((x1 + x2) / 2),
Math.round((y1 + y2) / 2),
0,
this.renderer
)
),
Array.from(
this.openglRenderWindow.displayToWorld(x1, y1, 1, this.renderer)
this.openglRenderWindow.displayToWorld(
Math.round((x1 + x2) / 2),
Math.round((y1 + y2) / 2),
1,
this.renderer
)
),
];
return this.selections.map((v) => {
const { prop, compositeID, displayPosition } = v.getProperties();

// Return false to mark this item for removal
if (prop == null) return false;

return {
worldPosition: Array.from(
this.openglRenderWindow.displayToWorld(
displayPosition[0],
displayPosition[1],
displayPosition[2],
this.renderer
)
),
displayPosition,
compositeID, // Not yet useful unless GlyphRepresentation
...prop.get('representationId'),
ray,
};
}).filter(Boolean);
return this.selections
.map((v) => {
const { prop, compositeID, displayPosition } = v.getProperties();

// Return false to mark this item for removal
if (prop == null) return false;

return {
worldPosition: Array.from(
this.openglRenderWindow.displayToWorld(
displayPosition[0],
displayPosition[1],
displayPosition[2],
this.renderer
)
),
displayPosition,
compositeID, // Not yet useful unless GlyphRepresentation
...prop.get('representationId'),
ray,
};
})
.filter(Boolean);
}
return [];
}
Expand Down Expand Up @@ -602,6 +634,7 @@ View.defaultProps = {
interactive: true,
pickingModes: [],
showCubeAxes: false,
pointerSize: 0,
};

View.propTypes = {
Expand Down Expand Up @@ -710,6 +743,11 @@ View.propTypes = {
*/
selectInfo: PropTypes.object,

/**
* Defines the tolerance of the click and hover selection.
*/
pointerSize: PropTypes.number,

/**
* Show/Hide Cube Axes for the given representation
*/
Expand Down