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

added rotation ability to grab script

Browse source
This commit is contained in:
Eric Levin 2015-05-04 18:14:46 -07:00
parent d52d3513a4
commit 39efde7e8c
1 changed files with 79 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
examples/grab.js
View file

@ -18,10 +18,22 @@ var deltaMouse = {
z: 0 z: 0
} }
var entityProps; var entityProps;
var targetPosition;
var moveUpDown = false; var moveUpDown = false;
var CLOSE_ENOUGH = 0.001;
var currentPosition, currentVelocity, cameraEntityDistance; var FULL_STRENGTH = 0.11;
var SPRING_RATE = 1.5;
var DAMPING_RATE = 0.80;
var ANGULAR_DAMPING_RATE = 0.40;
var SCREEN_TO_METERS = 0.001;
var currentPosition, currentVelocity, cameraEntityDistance, currentRotation;
var velocityTowardTarget, desiredVelocity, addedVelocity, newVelocity, dPosition, camYaw, distanceToTarget, targetPosition;
var shouldRotate = false;
var dQ, theta, axisAngle, dT;
var angularVelocity = {
x: 0,
y: 0,
z: 0
};
var grabSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/CloseClamp.wav"); var grabSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/CloseClamp.wav");
var releaseSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/ReleaseClamp.wav"); var releaseSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/ReleaseClamp.wav");
@ -54,8 +66,8 @@ function mousePressEvent(event) {
var props = Entities.getEntityProperties(grabbedEntity) var props = Entities.getEntityProperties(grabbedEntity)
isGrabbing = true; isGrabbing = true;
targetPosition = props.position; targetPosition = props.position;
currentPosition = props.position; currentPosition = props.position;
currentVelocity = props.velocity; currentVelocity = props.velocity;
updateDropLine(targetPosition); updateDropLine(targetPosition);
Audio.playSound(grabSound, { Audio.playSound(grabSound, {
position: props.position, position: props.position,
@ -64,12 +76,20 @@ function mousePressEvent(event) {
} }
} }
function updateDropLine(position) { function updateDropLine(position) {
Overlays.editOverlay(dropLine, { Overlays.editOverlay(dropLine, {
visible: true, visible: true,
start: { x: position.x, y: position.y + DROP_DISTANCE, z: position.z }, start: {
end: { x: position.x, y: position.y - DROP_DISTANCE, z: position.z } x: position.x,
}) y: position.y + DROP_DISTANCE,
z: position.z
},
end: {
x: position.x,
y: position.y - DROP_DISTANCE,
z: position.z
}
})
} }
@ -99,14 +119,26 @@ function mouseMoveEvent(event) {
deltaMouse.z = 0; deltaMouse.z = 0;
} }
// Update the target position by the amount the mouse moved // Update the target position by the amount the mouse moved
var camYaw = Quat.safeEulerAngles(Camera.getOrientation()).y; camYaw = Quat.safeEulerAngles(Camera.getOrientation()).y;
var dPosition = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, camYaw, 0), deltaMouse); dPosition = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, camYaw, 0), deltaMouse);
// Adjust target position for the object by the mouse move if (!shouldRotate) {
cameraEntityDistance = Vec3.distance(Camera.getPosition(), currentPosition); // Adjust target position for the object by the mouse move
cameraEntityDistance = Vec3.distance(Camera.getPosition(), currentPosition);
// Scale distance we want to move by the distance from the camera to the grabbed object // Scale distance we want to move by the distance from the camera to the grabbed object
// TODO: Correct SCREEN_TO_METERS to be correct for the actual FOV, resolution // TODO: Correct SCREEN_TO_METERS to be correct for the actual FOV, resolution
var SCREEN_TO_METERS = 0.001; targetPosition = Vec3.sum(targetPosition, Vec3.multiply(dPosition, cameraEntityDistance * SCREEN_TO_METERS));
targetPosition = Vec3.sum(targetPosition, Vec3.multiply(dPosition, cameraEntityDistance * SCREEN_TO_METERS)); } else if (shouldRotate) {
var transformedDeltaMouse = {
x: deltaMouse.z,
y: deltaMouse.x,
z: deltaMouse.y
};
transformedDeltaMouse = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, camYaw, 0), transformedDeltaMouse);
dQ = Quat.fromVec3Degrees(transformedDeltaMouse);
theta = 2 * Math.acos(dQ.w);
axisAngle = Quat.axis(dQ);
angularVelocity = Vec3.multiply((theta / dT), axisAngle);
}
} }
prevMouse.x = event.x; prevMouse.x = event.x;
prevMouse.y = event.y; prevMouse.y = event.y;
@ -118,46 +150,59 @@ function keyReleaseEvent(event) {
if (event.text === "SHIFT") { if (event.text === "SHIFT") {
moveUpDown = false; moveUpDown = false;
} }
if (event.text === "SPACE") {
shouldRotate = false;
}
} }
function keyPressEvent(event) { function keyPressEvent(event) {
if (event.text === "SHIFT") { if (event.text === "SHIFT") {
moveUpDown = true; moveUpDown = true;
} }
if (event.text === "SPACE") {
shouldRotate = true;
}
} }
function update(deltaTime) { function update(deltaTime) {
dT = deltaTime;
if (isGrabbing) { if (isGrabbing) {
entityProps = Entities.getEntityProperties(grabbedEntity); entityProps = Entities.getEntityProperties(grabbedEntity);
currentPosition = entityProps.position; currentPosition = entityProps.position;
currentVelocity = entityProps.velocity; currentVelocity = entityProps.velocity;
currentRotation = entityProps.rotation;
var dPosition = Vec3.subtract(targetPosition, currentPosition); var dPosition = Vec3.subtract(targetPosition, currentPosition);
var CLOSE_ENOUGH = 0.001;
var FULL_STRENGTH = 0.025; distanceToTarget = Vec3.length(dPosition);
var distanceToTarget = Vec3.length(dPosition); if (distanceToTarget > CLOSE_ENOUGH) {
if (distanceToTarget / cameraEntityDistance > CLOSE_ENOUGH) {
// compute current velocity in the direction we want to move // compute current velocity in the direction we want to move
var velocityTowardTarget = Vec3.dot(currentVelocity, Vec3.normalize(dPosition)); velocityTowardTarget = Vec3.dot(currentVelocity, Vec3.normalize(dPosition));
velocityTowardTarget = Vec3.multiply(dPosition, velocityTowardTarget);
// compute the speed we would like to be going toward the target position // compute the speed we would like to be going toward the target position
var SPRING_RATE = 1.5;
var DAMPING_RATE = 0.80; desiredVelocity = Vec3.multiply(dPosition, (1.0 / deltaTime) * SPRING_RATE);
var desiredVelocity = Vec3.multiply(dPosition, (1.0 / deltaTime) * SPRING_RATE);
// compute how much we want to add to the existing velocity // compute how much we want to add to the existing velocity
var addedVelocity = Vec3.subtract(desiredVelocity, velocityTowardTarget); addedVelocity = Vec3.subtract(desiredVelocity, velocityTowardTarget);
// If target is too far, roll off the force as inverse square of distance // If target is too far, roll off the force as inverse square of distance
if (distanceToTarget / cameraEntityDistance > FULL_STRENGTH) { if (distanceToTarget / cameraEntityDistance > FULL_STRENGTH) {
addedVelocity = Vec3.multiply(addedVelocity, Math.pow(FULL_STRENGTH / distanceToTarget, 2.0)); addedVelocity = Vec3.multiply(addedVelocity, Math.pow(FULL_STRENGTH / distanceToTarget, 2.0));
} }
var newVelocity = Vec3.sum(currentVelocity, addedVelocity); newVelocity = Vec3.sum(currentVelocity, addedVelocity);
// Add Damping // Add Damping
newVelocity = Vec3.subtract(newVelocity, Vec3.multiply(newVelocity, DAMPING_RATE)); newVelocity = Vec3.subtract(newVelocity, Vec3.multiply(newVelocity, DAMPING_RATE));
// Update entity // Update entity
Entities.editEntity(grabbedEntity, {
velocity: newVelocity //add damping to angular velocity:
}) }
} if (shouldRotate) {
angularVelocity = Vec3.subtract(angularVelocity, Vec3.multiply(angularVelocity, ANGULAR_DAMPING_RATE));
}
Entities.editEntity(grabbedEntity, {
velocity: newVelocity,
angularVelocity: angularVelocity
})
updateDropLine(targetPosition); updateDropLine(targetPosition);
} }
} }
@ -167,5 +212,4 @@ Controller.mousePressEvent.connect(mousePressEvent);
Controller.mouseReleaseEvent.connect(mouseReleaseEvent); Controller.mouseReleaseEvent.connect(mouseReleaseEvent);
Controller.keyPressEvent.connect(keyPressEvent); Controller.keyPressEvent.connect(keyPressEvent);
Controller.keyReleaseEvent.connect(keyReleaseEvent); Controller.keyReleaseEvent.connect(keyReleaseEvent);
Script.update.connect(update); Script.update.connect(update);