Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 03:15:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

restore old camera state

Browse source
This commit is contained in:
ZappoMan 2017-07-06 10:41:46 -07:00
parent 10341af819
commit c3c9df0cd0
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/system/controllers/godView.js
View file

@ -52,9 +52,6 @@ function keyPressEvent(event) {
function mousePress(event) { function mousePress(event) {
if (godView) { if (godView) {
var pickRay = Camera.computePickRay(event.x, event.y); var pickRay = Camera.computePickRay(event.x, event.y);
Vec3.print("pr.o:", pickRay.origin);
Vec3.print("pr.d:", pickRay.direction);
Vec3.print("c.p:", Camera.position);
var pointingAt = Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction,300)); var pointingAt = Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction,300));
var moveToPosition = { x: pointingAt.x, y: MyAvatar.position.y, z: pointingAt.z }; var moveToPosition = { x: pointingAt.x, y: MyAvatar.position.y, z: pointingAt.z };
moveTo(moveToPosition); moveTo(moveToPosition);
@ -62,9 +59,11 @@ function mousePress(event) {
} }
var oldCameraMode = Camera.mode;
function startGodView() { function startGodView() {
if (!godView) { if (!godView) {
Camera.mode = "first person"; oldCameraMode = Camera.mode;
MyAvatar.position = Vec3.sum(MyAvatar.position, {x:0, y: GOD_VIEW_HEIGHT, z: 0}); MyAvatar.position = Vec3.sum(MyAvatar.position, {x:0, y: GOD_VIEW_HEIGHT, z: 0});
Camera.mode = "independent"; Camera.mode = "independent";
Camera.position = Vec3.sum(MyAvatar.position, {x:0, y: GOD_CAMERA_OFFSET, z: 0}); Camera.position = Vec3.sum(MyAvatar.position, {x:0, y: GOD_CAMERA_OFFSET, z: 0});
@ -75,7 +74,7 @@ function startGodView() {
function endGodView() { function endGodView() {
if (godView) { if (godView) {
Camera.mode = "first person"; Camera.mode = oldCameraMode;
MyAvatar.position = Vec3.sum(MyAvatar.position, {x:0, y: (-1 * GOD_VIEW_HEIGHT) + ABOVE_GROUND_DROP, z: 0}); MyAvatar.position = Vec3.sum(MyAvatar.position, {x:0, y: (-1 * GOD_VIEW_HEIGHT) + ABOVE_GROUND_DROP, z: 0});
godView = false; godView = false;
} }