Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 00:28:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

handControllerGrab fix, maybe, hopefully

Browse source
This commit is contained in:
SamGondelman 2017-08-18 10:39:40 -07:00
parent 86cc938a47
commit c9f4958925
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/system/controllers/handControllerGrab.js
View file

@ -352,7 +352,7 @@ function projectOntoXYPlane(worldPos, position, rotation, dimensions, registrati
function projectOntoEntityXYPlane(entityID, worldPos) { function projectOntoEntityXYPlane(entityID, worldPos) {
var props = entityPropertiesCache.getProps(entityID); var props = entityPropertiesCache.getProps(entityID);
if (props) { if (props && props.position && props.rotation && props.dimensions && props.registrationPoint) {
return projectOntoXYPlane(worldPos, props.position, props.rotation, props.dimensions, props.registrationPoint); return projectOntoXYPlane(worldPos, props.position, props.rotation, props.dimensions, props.registrationPoint);
} }
} }
@ -368,16 +368,20 @@ function projectOntoOverlayXYPlane(overlayID, worldPos) {
var resolution = Overlays.getProperty(overlayID, "resolution"); var resolution = Overlays.getProperty(overlayID, "resolution");
resolution.z = 1; // Circumvent divide-by-zero. resolution.z = 1; // Circumvent divide-by-zero.
var scale = Overlays.getProperty(overlayID, "dimensions"); var scale = Overlays.getProperty(overlayID, "dimensions");
scale.z = 0.01; // overlay dimensions are 2D, not 3D. if (scale) {
dimensions = Vec3.multiplyVbyV(Vec3.multiply(resolution, INCHES_TO_METERS / dpi), scale); scale.z = 0.01; // overlay dimensions are 2D, not 3D.
dimensions = Vec3.multiplyVbyV(Vec3.multiply(resolution, INCHES_TO_METERS / dpi), scale);
}
} else { } else {
dimensions = Overlays.getProperty(overlayID, "dimensions"); dimensions = Overlays.getProperty(overlayID, "dimensions");
if (dimensions.z) { if (dimensions && dimensions.z) {
dimensions.z = 0.01; // overlay dimensions are 2D, not 3D. dimensions.z = 0.01; // overlay dimensions are 2D, not 3D.
} }
} }
return projectOntoXYPlane(worldPos, position, rotation, dimensions, DEFAULT_REGISTRATION_POINT); if (position && rotation && dimensions) {
return projectOntoXYPlane(worldPos, position, rotation, dimensions, DEFAULT_REGISTRATION_POINT);
}
} }
function handLaserIntersectItem(position, rotation, start) { function handLaserIntersectItem(position, rotation, start) {