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

Thanks Howard

Browse source
This commit is contained in:
Zach Fox 2018-01-03 17:23:35 -08:00
parent 8d4a6f01cb
commit ff4f582c7d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -151,7 +151,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
glm::vec3 normal; glm::vec3 normal;
boundingBox.findRayIntersection(cameraPosition, direction, distance, face, normal); boundingBox.findRayIntersection(cameraPosition, direction, distance, face, normal);
float offsetAngle = -CONTEXT_OVERLAY_OFFSET_ANGLE; float offsetAngle = -CONTEXT_OVERLAY_OFFSET_ANGLE;
if (DependencyManager::get<PointerManager>()->isLeftHand(event.getID())) { if (event.getID() == 1) { // "1" is left hand
offsetAngle *= -1.0f; offsetAngle *= -1.0f;
} }
contextOverlayPosition = cameraPosition + contextOverlayPosition = cameraPosition +

2
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -495,7 +495,7 @@ Script.include("/~/system/libraries/Xform.js");
var props = Entities.getEntityProperties(rayPickInfo.objectID); var props = Entities.getEntityProperties(rayPickInfo.objectID);
var pointerEvent = { var pointerEvent = {
type: "Move", type: "Move",
id: this.hand + 1, // 0 is reserved for hardware mouse id: _this.hand + 1, // 0 is reserved for hardware mouse
pos2D: projectOntoEntityXYPlane(rayPickInfo.objectID, rayPickInfo.intersection, props), pos2D: projectOntoEntityXYPlane(rayPickInfo.objectID, rayPickInfo.intersection, props),
pos3D: rayPickInfo.intersection, pos3D: rayPickInfo.intersection,
normal: rayPickInfo.surfaceNormal, normal: rayPickInfo.surfaceNormal,