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

Merge pull request #8781 from ZappoMan/tweakGrabPoint

Browse source 
adjust grab indicators
This commit is contained in:
Brad Hefta-Gaub 2016-10-12 07:08:16 -07:00 committed by GitHub
commit 0f1e61e240
3 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
View file

@ -374,7 +374,8 @@ void HmdDisplayPlugin::updateFrameData() {
} }
// this offset needs to match GRAB_POINT_SPHERE_OFFSET in scripts/system/libraries/controllers.js // this offset needs to match GRAB_POINT_SPHERE_OFFSET in scripts/system/libraries/controllers.js
static const vec3 GRAB_POINT_SPHERE_OFFSET = vec3(0.1f, 0.04f, -0.32f); //static const vec3 GRAB_POINT_SPHERE_OFFSET = vec3(0.1f, 0.04f, -0.32f);
static const vec3 GRAB_POINT_SPHERE_OFFSET = vec3(0.0f, 0.0f, -0.175f);
vec3 grabPointOffset = GRAB_POINT_SPHERE_OFFSET; vec3 grabPointOffset = GRAB_POINT_SPHERE_OFFSET;
if (i == 0) { if (i == 0) {
grabPointOffset.x *= -1.0f; // this changes between left and right hands grabPointOffset.x *= -1.0f; // this changes between left and right hands

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

@ -112,7 +112,7 @@ var CHECK_TOO_FAR_UNEQUIP_TIME = 0.3; // seconds, duration between checks
var GRAB_POINT_SPHERE_RADIUS = NEAR_GRAB_RADIUS; var GRAB_POINT_SPHERE_RADIUS = NEAR_GRAB_RADIUS;
var GRAB_POINT_SPHERE_COLOR = { red: 20, green: 90, blue: 238 }; var GRAB_POINT_SPHERE_COLOR = { red: 240, green: 240, blue: 240 };
var GRAB_POINT_SPHERE_ALPHA = 0.85; var GRAB_POINT_SPHERE_ALPHA = 0.85;
@ -1075,12 +1075,6 @@ function MyController(hand) {
var controllerLocation = getControllerWorldLocation(this.handToController(), true); var controllerLocation = getControllerWorldLocation(this.handToController(), true);
var worldHandPosition = controllerLocation.position; var worldHandPosition = controllerLocation.position;
if (controllerLocation.valid) {
this.grabPointSphereOn();
} else {
this.grabPointSphereOff();
}
var candidateEntities = Entities.findEntities(worldHandPosition, MAX_EQUIP_HOTSPOT_RADIUS); var candidateEntities = Entities.findEntities(worldHandPosition, MAX_EQUIP_HOTSPOT_RADIUS);
entityPropertiesCache.addEntities(candidateEntities); entityPropertiesCache.addEntities(candidateEntities);
var potentialEquipHotspot = this.chooseBestEquipHotspot(candidateEntities); var potentialEquipHotspot = this.chooseBestEquipHotspot(candidateEntities);
@ -1103,9 +1097,11 @@ function MyController(hand) {
if (!this.grabPointIntersectsEntity) { if (!this.grabPointIntersectsEntity) {
Controller.triggerHapticPulse(1, 20, this.hand); Controller.triggerHapticPulse(1, 20, this.hand);
this.grabPointIntersectsEntity = true; this.grabPointIntersectsEntity = true;
this.grabPointSphereOn();
} }
} else { } else {
this.grabPointIntersectsEntity = false; this.grabPointIntersectsEntity = false;
this.grabPointSphereOff();
} }
}; };
@ -1427,12 +1423,6 @@ function MyController(hand) {
var controllerLocation = getControllerWorldLocation(this.handToController(), true); var controllerLocation = getControllerWorldLocation(this.handToController(), true);
var handPosition = controllerLocation.position; var handPosition = controllerLocation.position;
if (controllerLocation.valid) {
this.grabPointSphereOn();
} else {
this.grabPointSphereOff();
}
var rayPickInfo = this.calcRayPickInfo(this.hand); var rayPickInfo = this.calcRayPickInfo(this.hand);
if (rayPickInfo.entityID) { if (rayPickInfo.entityID) {

3
scripts/system/libraries/controllers.js
View file

@ -10,9 +10,10 @@
// var GRAB_POINT_SPHERE_OFFSET = { x: 0, y: 0.2, z: 0 }; // var GRAB_POINT_SPHERE_OFFSET = { x: 0, y: 0.2, z: 0 };
// var GRAB_POINT_SPHERE_OFFSET = { x: 0.1, y: 0.175, z: 0.04 }; // var GRAB_POINT_SPHERE_OFFSET = { x: 0.1, y: 0.175, z: 0.04 };
// var GRAB_POINT_SPHERE_OFFSET = { x: 0.1, y: 0.32, z: 0.04 };
// this offset needs to match the one in libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp // this offset needs to match the one in libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
var GRAB_POINT_SPHERE_OFFSET = { x: 0.1, y: 0.32, z: 0.04 }; var GRAB_POINT_SPHERE_OFFSET = { x: 0.0, y: 0.175, z: 0.0 };
getGrabPointSphereOffset = function(handController) { getGrabPointSphereOffset = function(handController) {
if (handController === Controller.Standard.RightHand) { if (handController === Controller.Standard.RightHand) {