From c596f85c55b4f1e515fa4441fb02b76200ec24b8 Mon Sep 17 00:00:00 2001 From: 4sval Date: Mon, 9 Jan 2023 20:08:12 +0100 Subject: [PATCH] teleport at computed position --- FModel/Views/Snooper/Camera.cs | 6 +++--- FModel/Views/Snooper/SnimGui.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FModel/Views/Snooper/Camera.cs b/FModel/Views/Snooper/Camera.cs index e320314f..7ad20d56 100644 --- a/FModel/Views/Snooper/Camera.cs +++ b/FModel/Views/Snooper/Camera.cs @@ -36,13 +36,13 @@ public Camera() } public void Setup(FBox box) => Teleport(FVector.ZeroVector, box, true); - public void Teleport(FVector instancePos, FBox box, bool updateAll = false) + public void Teleport(Vector3 instancePos, FBox box, bool updateAll = false) { box.GetCenterAndExtents(out var center, out var extents); - center += instancePos; + center += new FVector(instancePos.X, instancePos.Z, instancePos.Y); var distance = extents.AbsMax(); - Position = new Vector3(instancePos.X, center.Z, instancePos.Y + distance * 2); + Position = new Vector3(instancePos.X, center.Z, instancePos.Z + distance * 2); Direction = new Vector3(center.X, center.Z, center.Y); if (updateAll) { diff --git a/FModel/Views/Snooper/SnimGui.cs b/FModel/Views/Snooper/SnimGui.cs index 361550f4..e94db7e0 100644 --- a/FModel/Views/Snooper/SnimGui.cs +++ b/FModel/Views/Snooper/SnimGui.cs @@ -351,7 +351,7 @@ private void DrawOuliner(Snooper s) ImGui.EndDisabled(); if (ImGui.Selectable("Teleport To")) { - var instancePos = model.Transforms[model.SelectedInstance].Position; + var instancePos = model.Transforms[model.SelectedInstance].Matrix.Translation; s.Renderer.CameraOp.Teleport(instancePos, model.Box); }