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

Merge pull request #8261 from hyperlogic/feature/grab-script-improvements-iii

Browse source 
grab script improvements
This commit is contained in:
Ryan Downe Karpf 2016-07-18 16:46:38 -07:00 committed by GitHub
commit 6e71e369a4
1 changed files with 31 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -202,8 +202,7 @@ CONTROLLER_STATE_MACHINE[STATE_NEAR_GRABBING] = {
CONTROLLER_STATE_MACHINE[STATE_HOLD] = { CONTROLLER_STATE_MACHINE[STATE_HOLD] = {
name: "hold", name: "hold",
enterMethod: "nearGrabbingEnter", enterMethod: "nearGrabbingEnter",
updateMethod: "nearGrabbing", updateMethod: "nearGrabbing"
exitMethod: "holdExit"
}; };
CONTROLLER_STATE_MACHINE[STATE_NEAR_TRIGGER] = { CONTROLLER_STATE_MACHINE[STATE_NEAR_TRIGGER] = {
name: "trigger", name: "trigger",
@ -228,7 +227,7 @@ function colorPow(color, power) {
return { return {
red: Math.pow(color.red / 255.0, power) * 255, red: Math.pow(color.red / 255.0, power) * 255,
green: Math.pow(color.green / 255.0, power) * 255, green: Math.pow(color.green / 255.0, power) * 255,
blue: Math.pow(color.blue / 255.0, power) * 255, blue: Math.pow(color.blue / 255.0, power) * 255
}; };
} }
@ -271,14 +270,12 @@ function propsArePhysical(props) {
return isPhysical; return isPhysical;
} }
// currently disabled. var USE_ATTACH_POINT_SETTINGS = true;
var USE_ATTACH_POINT_SETTINGS = false;
var ATTACH_POINT_SETTINGS = "io.highfidelity.attachPoints"; var ATTACH_POINT_SETTINGS = "io.highfidelity.attachPoints";
function getAttachPointSettings() { function getAttachPointSettings() {
try { try {
var str = Settings.getValue(ATTACH_POINT_SETTINGS); var str = Settings.getValue(ATTACH_POINT_SETTINGS);
print("getAttachPointSettings = " + str);
if (str === "false") { if (str === "false") {
return {}; return {};
} else { } else {
@ -291,7 +288,6 @@ function getAttachPointSettings() {
} }
function setAttachPointSettings(attachPointSettings) { function setAttachPointSettings(attachPointSettings) {
var str = JSON.stringify(attachPointSettings); var str = JSON.stringify(attachPointSettings);
print("setAttachPointSettings = " + str);
Settings.setValue(ATTACH_POINT_SETTINGS, str); Settings.setValue(ATTACH_POINT_SETTINGS, str);
} }
function getAttachPointForHotspotFromSettings(hotspot, hand) { function getAttachPointForHotspotFromSettings(hotspot, hand) {
@ -765,9 +761,8 @@ function MyController(hand) {
} }
}; };
var SEARCH_SPHERE_ALPHA = 0.5;
this.searchSphereOn = function (location, size, color) { this.searchSphereOn = function (location, size, color) {
var rotation = Quat.lookAt(location, Camera.getPosition(), Vec3.UP); var rotation = Quat.lookAt(location, Camera.getPosition(), Vec3.UP);
var brightColor = colorPow(color, 0.06); var brightColor = colorPow(color, 0.06);
if (this.searchSphere === null) { if (this.searchSphere === null) {
@ -790,7 +785,7 @@ function MyController(hand) {
position: location, position: location,
rotation: rotation, rotation: rotation,
innerColor: brightColor, innerColor: brightColor,
outerColor: color, outerColor: color,
innerAlpha: 1.0, innerAlpha: 1.0,
outerAlpha: 0.0, outerAlpha: 0.0,
outerRadius: size * 1.2, outerRadius: size * 1.2,
@ -1961,12 +1956,12 @@ function MyController(hand) {
this.currentObjectRotation = grabbedProperties.rotation; this.currentObjectRotation = grabbedProperties.rotation;
this.currentVelocity = ZERO_VEC; this.currentVelocity = ZERO_VEC;
this.currentAngularVelocity = ZERO_VEC; this.currentAngularVelocity = ZERO_VEC;
this.prevDropDetected = false;
}; };
this.nearGrabbing = function (deltaTime, timestamp) { this.nearGrabbing = function (deltaTime, timestamp) {
var dropDetected = this.dropGestureProcess(deltaTime);
if (this.state == STATE_NEAR_GRABBING && this.triggerSmoothedReleased()) { if (this.state == STATE_NEAR_GRABBING && this.triggerSmoothedReleased()) {
this.callEntityMethodOnGrabbed("releaseGrab"); this.callEntityMethodOnGrabbed("releaseGrab");
this.setState(STATE_OFF, "trigger released"); this.setState(STATE_OFF, "trigger released");
@ -1975,6 +1970,16 @@ function MyController(hand) {
if (this.state == STATE_HOLD) { if (this.state == STATE_HOLD) {
var dropDetected = this.dropGestureProcess(deltaTime);
if (this.triggerSmoothedReleased()) {
this.waitForTriggerRelease = false;
}
if (dropDetected && this.prevDropDetected != dropDetected) {
this.waitForTriggerRelease = true;
}
// highlight the grabbed hotspot when the dropGesture is detected. // highlight the grabbed hotspot when the dropGesture is detected.
if (dropDetected) { if (dropDetected) {
entityPropertiesCache.addEntity(this.grabbedHotspot.entityID); entityPropertiesCache.addEntity(this.grabbedHotspot.entityID);
@ -1982,17 +1987,24 @@ function MyController(hand) {
equipHotspotBuddy.highlightHotspot(this.grabbedHotspot); equipHotspotBuddy.highlightHotspot(this.grabbedHotspot);
} }
if (dropDetected && this.triggerSmoothedGrab()) { if (dropDetected && !this.waitForTriggerRelease && this.triggerSmoothedGrab()) {
this.callEntityMethodOnGrabbed("releaseEquip"); this.callEntityMethodOnGrabbed("releaseEquip");
this.setState(STATE_OFF, "drop gesture detected");
return;
}
if (this.thumbPressed()) { // store the offset attach points into preferences.
this.callEntityMethodOnGrabbed("releaseEquip"); if (USE_ATTACH_POINT_SETTINGS && this.grabbedHotspot && this.grabbedEntity) {
this.setState(STATE_OFF, "drop via thumb press"); var props = Entities.getEntityProperties(this.grabbedEntity, ["localPosition", "localRotation"]);
if (props && props.localPosition && props.localRotation) {
storeAttachPointForHotspotInSettings(this.grabbedHotspot, this.hand, props.localPosition, props.localRotation);
}
}
var grabbedEntity = this.grabbedEntity;
this.release();
this.grabbedEntity = grabbedEntity;
this.setState(STATE_NEAR_GRABBING, "drop gesture detected");
return; return;
} }
this.prevDropDetected = dropDetected;
} }
this.heartBeat(this.grabbedEntity); this.heartBeat(this.grabbedEntity);
@ -2088,22 +2100,6 @@ function MyController(hand) {
} }
}; };
this.holdExit = function () {
// store the offset attach points into preferences.
if (USE_ATTACH_POINT_SETTINGS && this.grabbedHotspot && this.grabbedEntity) {
entityPropertiesCache.addEntity(this.grabbedEntity);
var props = entityPropertiesCache.getProps(this.grabbedEntity);
var entityXform = new Xform(props.rotation, props.position);
var avatarXform = new Xform(MyAvatar.orientation, MyAvatar.position);
var handRot = (this.hand === RIGHT_HAND) ? MyAvatar.getRightPalmRotation() : MyAvatar.getLeftPalmRotation();
var avatarHandPos = (this.hand === RIGHT_HAND) ? MyAvatar.rightHandPosition : MyAvatar.leftHandPosition;
var palmXform = new Xform(handRot, avatarXform.xformPoint(avatarHandPos));
var offsetXform = Xform.mul(palmXform.inv(), entityXform);
storeAttachPointForHotspotInSettings(this.grabbedHotspot, this.hand, offsetXform.pos, offsetXform.rot);
}
};
this.nearTriggerEnter = function () { this.nearTriggerEnter = function () {
this.clearEquipHaptics(); this.clearEquipHaptics();