Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 18:06:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix avatar driving in gracefulControls

Browse source
This commit is contained in:
Ryan Huffman 2017-05-26 13:17:22 -07:00
parent e2f966b313
commit 0bd849d691
1 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
script-archive/gracefulControls.js
View file

@ -35,6 +35,7 @@ var BRAKE_PARAMETERS = {
MOUSE_SENSITIVITY: 0.5, MOUSE_SENSITIVITY: 0.5,
} }
var DRIVE_AVATAR_ENABLED = true;
var UPDATE_RATE = 90; var UPDATE_RATE = 90;
var USE_INTERVAL = true; var USE_INTERVAL = true;
@ -50,7 +51,13 @@ var KEY_UP = "e";
var KEY_DOWN = "c"; var KEY_DOWN = "c";
var KEY_TOGGLE= "SPACE"; var KEY_TOGGLE= "SPACE";
var KEY_DISABLE = "ESC"; var KEY_DISABLE = "ESC";
var CAPTURED_KEYS = [KEY_BRAKE, KEY_FORWARD, KEY_BACKWARD, KEY_LEFT, KEY_RIGHT, KEY_UP, KEY_DOWN, KEY_TOGGLE]; var CAPTURED_KEYS;
if (DRIVE_AVATAR_ENABLED) {
CAPTURED_KEYS = [KEY_TOGGLE, KEY_BRAKE, KEY_FORWARD, KEY_BACKWARD, KEY_LEFT, KEY_RIGHT, KEY_UP, KEY_DOWN];
} else {
CAPTURED_KEYS = [KEY_TOGGLE];
}
// Global Variables // Global Variables
var keys = {}; var keys = {};
@ -143,28 +150,35 @@ function update(dt) {
MyAvatar.headPitch = newPitch; MyAvatar.headPitch = newPitch;
pitchFromMouse -= pitchMove; pitchFromMouse -= pitchMove;
// If force isn't being applied in a direction, add drag;
if (targetVelocity.x == 0) {
targetVelocity.x -= (velocity.x * movementParameters.DRAG_COEFFICIENT * dt);
}
if (targetVelocity.z == 0) {
targetVelocity.z -= (velocity.z * movementParameters.DRAG_COEFFICIENT * dt);
}
velocity = Vec3.sum(velocity, targetVelocity);
var maxSpeed = movementParameters.MAX_SPEED; if (DRIVE_AVATAR_ENABLED) {
velocity.x = Math.max(-maxSpeed, Math.min(maxSpeed, velocity.x)); // If force isn't being applied in a direction, add drag;
velocity.z = Math.max(-maxSpeed, Math.min(maxSpeed, velocity.z)); var drag = Math.min(movementParameters.DRAG_COEFFICIENT * dt, 1.0);
var v = Vec3.multiplyQbyV(MyAvatar.headOrientation, velocity); if (targetVelocity.x == 0) {
targetVelocity.x -= (velocity.x * drag);
}
if (targetVelocity.z == 0) {
targetVelocity.z -= (velocity.z * drag);
}
velocity = Vec3.sum(velocity, targetVelocity);
if (targetVelocityVertical == 0) { var maxSpeed = movementParameters.MAX_SPEED;
targetVelocityVertical -= (velocityVertical * movementParameters.DRAG_COEFFICIENT * dt); velocity.x = Math.max(-maxSpeed, Math.min(maxSpeed, velocity.x));
velocity.z = Math.max(-maxSpeed, Math.min(maxSpeed, velocity.z));
var v = Vec3.multiplyQbyV(MyAvatar.headOrientation, velocity);
if (targetVelocityVertical == 0) {
targetVelocityVertical -= (velocityVertical * movementParameters.DRAG_COEFFICIENT * dt);
}
velocityVertical += targetVelocityVertical;
velocityVertical = Math.max(-maxSpeed, Math.min(maxSpeed, velocityVertical));
v.y += velocityVertical;
MyAvatar.motorReferenceFrame = 'world';
MyAvatar.motorVelocity = v;
MyAvatar.motorTimescale = 1;
Vec3.print('vel', v);
} }
velocityVertical += targetVelocityVertical;
velocityVertical = Math.max(-maxSpeed, Math.min(maxSpeed, velocityVertical));
v.y += velocityVertical;
MyAvatar.setVelocity(v);
} }
function vecToString(vec) { function vecToString(vec) {