Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 02:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Initial Commit of far to near grab conversion. Works only if object drawn at chest level And Object is near by to hand.

Browse source
This commit is contained in:
volansystech 2017-04-07 21:55:26 +05:30
parent 76ef2b5d9f
commit e0b08a5e4e
1 changed files with 27 additions and 0 deletions

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

@ -189,6 +189,10 @@ var blacklist = [];
var FORBIDDEN_GRAB_NAMES = ["Grab Debug Entity", "grab pointer"];
var FORBIDDEN_GRAB_TYPES = ["Unknown", "Light", "PolyLine", "Zone"];
var MAX_SECONDARY_PRESS_VALUE = 1;
var MIN_SECONDARY_PRESS_VALUE = 0;
var farToNearGrab = false;
var holdEnabled = true;
var nearGrabEnabled = true;
var farGrabEnabled = true;
@ -2082,6 +2086,15 @@ function MyController(hand) {
return true;
};
this.entityIsFartoNearGrabbable = function (objectPosition, handPosition, maxDistance) {
var distanceToObjectFromHand = Vec3.length(Vec3.subtract(handPosition, objectPosition));
if (distanceToObjectFromHand > maxDistance) {
return false;
}
return true;
};
this.chooseNearEquipHotspots = function(candidateEntities, distance) {
var equippableHotspots = flatten(candidateEntities.map(function(entityID) {
return _this.collectEquipHotspots(entityID);
@ -2661,6 +2674,15 @@ function MyController(hand) {
this.grabbedThingID);
var distanceToObject = Vec3.length(Vec3.subtract(MyAvatar.position, this.currentObjectPosition));
var controllerLocation = getControllerWorldLocation(this.handToController(), true);
var handPosition = controllerLocation.position;
//Far to Near Grab: If object is draw by user inside NEAR_GRAB_MAX_DISTANCE, grab it
if (this.entityIsFartoNearGrabbable(this.currentObjectPosition, handPosition, NEAR_GRAB_MAX_DISTANCE)) {
this.secondaryPress(MAX_SECONDARY_PRESS_VALUE);
this.farToNearGrab = true;
this.setState(STATE_NEAR_GRABBING, "near grab entity '" + this.grabbedThingID + "'");
}
var success = Entities.updateAction(this.grabbedThingID, this.actionID, {
targetPosition: newTargetPosition,
linearTimeScale: this.distanceGrabTimescale(this.mass, distanceToObject),
@ -3036,6 +3058,11 @@ function MyController(hand) {
this.nearGrabbing = function(deltaTime, timestamp) {
this.grabPointSphereOff();
if (this.farToNearGrab && !this.triggerClicked) {
this.farToNearGrab = false;
this.secondaryPress(MIN_SECONDARY_PRESS_VALUE);
}
if (this.state == STATE_NEAR_GRABBING && (!this.triggerClicked && this.secondaryReleased())) {
this.callEntityMethodOnGrabbed("releaseGrab");
this.setState(STATE_OFF, "trigger released");