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

Initial Commit..

Browse source 
If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x.
This will help user to grab the entity in lesser time.
This commit is contained in:
volansystech 2017-04-13 02:51:30 +05:30
parent 76ef2b5d9f
commit 7bc3435cfa
1 changed files with 22 additions and 3 deletions

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

@ -75,7 +75,8 @@ var WEB_TOUCH_Y_OFFSET = 0.05; // how far forward (or back with a negative numbe
//
// distant manipulation
//
var shouldTravelAtRapidPace = false;
var accelarationStartingPoint = 0;
var DISTANCE_HOLDING_RADIUS_FACTOR = 3.5; // multiplied by distance between hand and object
var DISTANCE_HOLDING_ACTION_TIMEFRAME = 0.1; // how quickly objects move to their new position
var DISTANCE_HOLDING_UNITY_MASS = 1200; // The mass at which the distance holding action timeframe is unmodified
@ -2524,7 +2525,19 @@ function MyController(hand) {
// compute the mass for the purpose of energy and how quickly to move object
this.mass = this.getMass(grabbedProperties.dimensions, grabbedProperties.density);
this.shouldTravelAtRapidPace = false;
var distanceToObject = Vec3.length(Vec3.subtract(MyAvatar.position, grabbedProperties.position));
if(distanceToObject >= 15){ // Apply Rapid Pace only if distanceToObject is far than 15.
this.shouldTravelAtRapidPace = true;
var MyAvatarHipsPosition = MyAvatar.getJointPosition("Hips");
var distanceToHandFromAvatarHips = worldControllerPosition.x - MyAvatarHipsPosition.x;
var ACCELERATION_START_THRESHOLD = 0.90;
this.accelarationStartingPoint = (distanceToHandFromAvatarHips * ACCELERATION_START_THRESHOLD);
}else{
this.shouldTravelAtRapidPace = false;
}
var timeScale = this.distanceGrabTimescale(this.mass, distanceToObject);
this.actionID = NULL_UUID;
@ -2619,16 +2632,22 @@ function MyController(hand) {
this.grabRadius * RADIAL_GRAB_AMPLIFIER);
}
if(this.shouldTravelAtRapidPace = true){
var MyAvatarHipsPosition = MyAvatar.getJointPosition("Hips");
var distanceToHandFromAvatarHips_x = worldControllerPosition.x - MyAvatarHipsPosition.x;
if(distanceToHandFromAvatarHips_x <= this.accelarationStartingPoint){
var RAPID_PACE_RATE = 2;
this.grabRadius = (this.grabRadius / RAPID_PACE_RATE);
}
}
// don't let grabRadius go all the way to zero, because it can't come back from that
var MINIMUM_GRAB_RADIUS = 0.1;
if (this.grabRadius < MINIMUM_GRAB_RADIUS) {
this.grabRadius = MINIMUM_GRAB_RADIUS;
}
var newTargetPosition = Vec3.multiply(this.grabRadius, Quat.getUp(worldControllerRotation));
newTargetPosition = Vec3.sum(newTargetPosition, worldControllerPosition);
newTargetPosition = Vec3.sum(newTargetPosition, this.offsetPosition);
var objectToAvatar = Vec3.subtract(this.currentObjectPosition, MyAvatar.position);
var handControllerData = getEntityCustomData('handControllerKey', this.grabbedThingID, defaultMoveWithHeadData);
if (handControllerData.disableMoveWithHead !== true) {