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

fix grab transitions between vert and horiz planes

Browse source
This commit is contained in:
Andrew Meadows 2015-07-14 09:23:05 -07:00
parent 7610fe48c2
commit 69db9aa01a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
examples/grab.js
View file

@ -43,9 +43,10 @@ var gMaxGrabDistance;
// elevationAzimuth // elevationAzimuth
var gGrabMode = "xzplane"; var gGrabMode = "xzplane";
// gGrabOffset allows the user to grab an object off-center. It points from ray's intersection // gGrabOffset allows the user to grab an object off-center. It points from the object's center
// with the move-plane to object center (at the moment the grab is initiated). Future target positions // to the point where the ray intersects the grab plane (at the moment the grab is initiated).
// are relative to the ray's intersection by the same offset. // Future target positions of the ray intersection are on the same plane, and the offset is subtracted
// to compute the target position of the object's center.
var gGrabOffset = { x: 0, y: 0, z: 0 }; var gGrabOffset = { x: 0, y: 0, z: 0 };
var gTargetPosition; var gTargetPosition;
@ -152,7 +153,6 @@ function computeNewGrabPlane() {
maybeResetMousePosition = true; maybeResetMousePosition = true;
} }
gGrabMode = "xzPlane"; gGrabMode = "xzPlane";
gPointOnPlane = gCurrentPosition;
gPlaneNormal = { x: 0, y: 1, z: 0 }; gPlaneNormal = { x: 0, y: 1, z: 0 };
if (gLiftKey) { if (gLiftKey) {
if (!gRotateKey) { if (!gRotateKey) {
@ -163,7 +163,7 @@ function computeNewGrabPlane() {
gGrabMode = "rotate"; gGrabMode = "rotate";
} }
gPointOnPlane = Vec3.subtract(gCurrentPosition, gGrabOffset); gPointOnPlane = Vec3.sum(gCurrentPosition, gGrabOffset);
var xzOffset = Vec3.subtract(gPointOnPlane, Camera.getPosition()); var xzOffset = Vec3.subtract(gPointOnPlane, Camera.getPosition());
xzOffset.y = 0; xzOffset.y = 0;
gXzDistanceToGrab = Vec3.length(xzOffset); gXzDistanceToGrab = Vec3.length(xzOffset);
@ -220,8 +220,8 @@ function mousePressEvent(event) {
nearestPoint = Vec3.multiply(distanceToGrab, pickRay.direction); nearestPoint = Vec3.multiply(distanceToGrab, pickRay.direction);
gPointOnPlane = Vec3.sum(cameraPosition, nearestPoint); gPointOnPlane = Vec3.sum(cameraPosition, nearestPoint);
// compute the grab offset // compute the grab offset (points from object center to point of grab)
gGrabOffset = Vec3.subtract(gStartPosition, gPointOnPlane); gGrabOffset = Vec3.subtract(gPointOnPlane, gStartPosition);
computeNewGrabPlane(); computeNewGrabPlane();
@ -258,6 +258,7 @@ function mouseMoveEvent(event) {
if (Vec3.length(entityProperties.gravity) != 0) { if (Vec3.length(entityProperties.gravity) != 0) {
gOriginalGravity = entityProperties.gravity; gOriginalGravity = entityProperties.gravity;
} }
gCurrentPosition = entityProperties.position;
var actionArgs = {}; var actionArgs = {};
@ -287,6 +288,7 @@ function mouseMoveEvent(event) {
var pointOnCylinder = Vec3.multiply(planeNormal, gXzDistanceToGrab); var pointOnCylinder = Vec3.multiply(planeNormal, gXzDistanceToGrab);
pointOnCylinder = Vec3.sum(Camera.getPosition(), pointOnCylinder); pointOnCylinder = Vec3.sum(Camera.getPosition(), pointOnCylinder);
newTargetPosition = mouseIntersectionWithPlane(pointOnCylinder, planeNormal, event); newTargetPosition = mouseIntersectionWithPlane(pointOnCylinder, planeNormal, event);
gPointOnPlane = Vec3.sum(newTargetPosition, gGrabOffset);
} else { } else {
var cameraPosition = Camera.getPosition(); var cameraPosition = Camera.getPosition();
newTargetPosition = mouseIntersectionWithPlane(gPointOnPlane, gPlaneNormal, event); newTargetPosition = mouseIntersectionWithPlane(gPointOnPlane, gPlaneNormal, event);
@ -298,7 +300,7 @@ function mouseMoveEvent(event) {
newTargetPosition = Vec3.sum(relativePosition, cameraPosition); newTargetPosition = Vec3.sum(relativePosition, cameraPosition);
} }
} }
gTargetPosition = Vec3.sum(newTargetPosition, gGrabOffset); gTargetPosition = Vec3.subtract(newTargetPosition, gGrabOffset);
actionArgs = {targetPosition: gTargetPosition, linearTimeScale: 0.1}; actionArgs = {targetPosition: gTargetPosition, linearTimeScale: 0.1};
} }
gPreviousMouse = { x: event.x, y: event.y }; gPreviousMouse = { x: event.x, y: event.y };