small qol

Author: 4sval

Editor/Widgets/ViewportWidget.cs

@@ -254,7 +254,7 @@ private void DrawComponentControlsOverlay(CameraComponent camera, ActorComponent
 
     private void DrawOrbitCircle(InteractiveCameraComponent camera, ActorComponent? component, Vector2 contentPos, Vector2 contentSize)
     {
-        var orbitCenter = camera.LocalTransform.Position - camera.Forward * camera.OrbitDistance;
+        var orbitCenter = camera.GetLocalTransform().Position - camera.Forward * camera.OrbitDistance;
         var circleY = component is SpatialComponent spatial ? spatial.GizmoMatrix.Translation.Y : 0f;
         var viewProj = camera.ViewMatrix * camera.ProjectionMatrix;
 

Snooper/Core/Managers/SceneManager.cs

@@ -82,7 +82,7 @@ public override void Update(float delta)
 
         if (RootActor != null && MainViewport?.Camera is { } camera && camera.IsDirty(DirtyFlags.Transform))
         {
-            UpdatePartitionActorsRecursive(RootActor, camera.LocalTransform.Position);
+            UpdatePartitionActorsRecursive(RootActor, camera.GetLocalTransform().Position);
         }
 
         base.Update(delta);

Snooper/Rendering/Actors/Actor.cs

@@ -151,12 +151,12 @@ public bool IsDescendantOf(Actor other)
         return false;
     }
 
-    public bool AttachTo(Actor newParent, SpatialComponent? attachTo = null, string? socket = null, bool keepWorldTransform = true)
+    public bool AttachTo(Actor newParent, SpatialComponent? attachTo = null, string? socket = null)
     {
         if (!CanAttachTo(newParent, attachTo, out var relation)) return false;
 
         if (_parent != newParent) MoveUnder(newParent);
-        RootComponent?.AttachTo(relation, socket, keepWorldTransform);
+        RootComponent?.AttachTo(relation, socket);
 
         Log.Verbose("{Actor} attached to {Target}", Name, relation?.Name ?? newParent.Name);
         return true;
@@ -212,15 +212,15 @@ private void MoveUnder(Actor newParent)
         manager.IncrementRevision();
     }
 
-    public bool Detach(bool keepWorldTransform = true)
+    public bool Detach()
     {
         if (ActorManager is not SceneManager { RootActor: { } root })
         {
             Log.Warning("{Actor} has no scene root to be detached to", Name);
             return false;
         }
 
-        return root != this && AttachTo(root, root.RootComponent, null, keepWorldTransform);
+        return root != this && AttachTo(root, root.RootComponent);
     }
 
     internal void OnChildAdded(Actor actor)

Snooper/Rendering/Actors/CameraActor.cs

@@ -4,7 +4,7 @@ namespace Snooper.Rendering.Actors;
 
 public class CameraActor : Actor
 {
-    public CameraComponent CameraComponent { get; }
+    public SceneCameraComponent CameraComponent { get; }
 
     public CameraActor(string name) : base(name)
     {

Snooper/Rendering/Actors/CellActor.cs

@@ -100,7 +100,7 @@ private void AddWorld(FSoftObjectPath world)
         var w = new WorldActor(world.Load<UWorld>());
         if (w.RootComponent != null && RootComponent != null)
         {
-            w.RootComponent.SetLocalTransform(RootComponent.LocalTransform.Inverse());
+            w.RootComponent.SetLocalTransform(RootComponent.GetLocalTransform().Inverse());
         }
 
         Children.Add(w);

Snooper/Rendering/Actors/HierarchicalActor.cs

@@ -58,7 +58,7 @@ public void SetVisibilityByDistance(Vector3 position, float minDistance = 0f)
     {
         foreach (var cell in Children.OfType<CellActor>().Where(x => x is { IsNonSpatiallyLoaded: false, DataLayers.Length: 0 }))
         {
-            var distance = Vector3.Distance(position, cell.RootComponent?.LocalTransform.Position ?? Vector3.Zero);
+            var distance = Vector3.Distance(position, cell.RootComponent?.GetLocalTransform().Position ?? Vector3.Zero);
             cell.IsVisible = distance > minDistance && distance <= LoadingRange;
         }
     }

Snooper/Rendering/Components/Primitive/PrimitiveComponent.cs

@@ -163,19 +163,56 @@ protected virtual void CopyCachedData(TInstanceData[] data, TInstanceData[] cach
 
     }
 
-    protected override (Vector3, float) GetTeleportPosition(CameraComponent camera)
+    protected override (Vector3, float) GetTeleportPosition(CameraComponent camera, Quaternion rotation)
     {
-        var vHalfFov = camera.FieldOfViewRadians / 2f;
-        var hHalfFov = MathF.Atan(MathF.Tan(vHalfFov) * camera.AspectRatio);
-        var limitingHalfFov = MathF.Min(vHalfFov, hHalfFov);
+        var upLimit = MathF.Tan(camera.FieldOfViewRadians / 2f);
+        var sideLimit = upLimit * camera.AspectRatio;
+
+        var forward = Vector3.Transform(Settings.ForwardVector, rotation);
+        var right = Vector3.Transform(Settings.RightVector, rotation);
+        var up = Vector3.Transform(Settings.UpVector, rotation);
 
-        var sphereRadius = Descriptor.Bounds.Extents.Length();
-        var distance = sphereRadius / MathF.Tan(limitingHalfFov) * 1.25f;
         var center = Vector3.Transform(Descriptor.Bounds.Center, GizmoMatrix);
 
+        var distance = 0f;
+        for (var i = 0; i < 8; i++)
+        {
+            var offset = Vector3.Transform(GetBoundsCorner(i), GizmoMatrix) - center;
+            var depth = Vector3.Dot(offset, -forward);
+
+            distance = MathF.Max(distance, MathF.Abs(Vector3.Dot(offset, right)) / sideLimit - depth);
+            distance = MathF.Max(distance, MathF.Abs(Vector3.Dot(offset, up)) / upLimit - depth);
+        }
+
         return (center, MathF.Max(distance, 0.1f));
     }
 
+    private Vector3 GetBoundsCorner(int index)
+    {
+        var extents = Descriptor.Bounds.Extents;
+
+        return Descriptor.Bounds.Center + new Vector3(
+            (index & 1) == 0 ? -extents.X : extents.X,
+            (index & 2) == 0 ? -extents.Y : extents.Y,
+            (index & 4) == 0 ? -extents.Z : extents.Z);
+    }
+
+    public void SnapToGround()
+    {
+        var lowest = float.MaxValue;
+        for (var i = 0; i < 8; i++)
+        {
+            lowest = MathF.Min(lowest, Vector3.Transform(GetBoundsCorner(i), WorldMatrix).Y);
+        }
+
+        if (lowest == 0f || !Matrix4x4.Invert(GetRelationMatrix(), out var invRelation))
+            return;
+
+        var transform = GetLocalTransform();
+        transform.Position -= Vector3.TransformNormal(new Vector3(0f, lowest, 0f), invRelation);
+        SetLocalTransform(transform);
+    }
+
     protected override void BeginPlay(ActorManager scene)
     {
         base.BeginPlay(scene);
@@ -288,13 +325,13 @@ public override void DrawControls()
 
             ImGui.BeginGroup();
             ImGui.SetNextItemWidth(-1);
-            if (ImGui.BeginCombo("##SectionCombo", $"{_sectionIndex}: {GetMaterialName(selected.MaterialIndex)}"))
+            if (ImGui.BeginCombo("##SectionCombo", $"{_sectionIndex}: {selected.Name}"))
             {
                 for (var i = 0; i < lod.Sections.Length; i++)
                 {
                     var isSelected = i == _sectionIndex;
 
-                    if (ImGui.Selectable($"{i}: {GetMaterialName(lod.Sections[i].MaterialIndex)}##Section{i}", isSelected))
+                    if (ImGui.Selectable($"{i}: {lod.Sections[i].Name}##Section{i}", isSelected))
                     {
                         _sectionIndex = i;
                         _materialLayerIndex = 0;
@@ -331,11 +368,6 @@ public override void DrawControls()
         });
     }
 
-    private string GetMaterialName(uint materialIndex) =>
-        materialIndex < Materials.Length && Materials[materialIndex] is { } section
-            ? section.MaterialDataContainer?.Name ?? Settings.NoName
-            : Settings.NoName;
-
     private void DrawInfoPopup()
     {
         var viewport = ImGui.GetMainViewport();

Snooper/Rendering/Components/Transforms/Transform.cs

@@ -11,6 +11,8 @@ public class Transform() : ICloneable
     public Quaternion Rotation = Quaternion.Identity;
     public Vector3 Scale = Vector3.One;
 
+    private const float Deg2Rad = MathF.PI / 180.0f;
+
     private Transform(Transform other) : this()
     {
         Position = other.Position;
@@ -34,6 +36,11 @@ public Transform(Quaternion rotation) : this(Vector3.Zero, rotation)
 
     }
 
+    public Transform(Vector3 position, Vector3 rotation) : this(position, Quaternion.CreateFromYawPitchRoll(rotation.X * Deg2Rad, rotation.Y * Deg2Rad, rotation.Z * Deg2Rad))
+    {
+
+    }
+
     public Transform(FVector position, FQuat rotation, FVector scale) : this()
     {
         Position = new Vector3(position.X, position.Z, position.Y) * Settings.GlobalScale;

Snooper/Rendering/Components/Transforms/TransformComponent.cs

@@ -95,7 +95,7 @@ public string? AttachSocketName
         }
     }
 
-    public Transform LocalTransform
+    protected Transform LocalTransform
     {
         get;
         private set
@@ -167,7 +167,7 @@ public Matrix4x4 GetRelationMatrix()
         return relationMatrix;
     }
 
-    public bool AttachTo(SpatialComponent? newRelation, string? socket = null, bool keepWorldTransform = true)
+    public bool AttachTo(SpatialComponent? newRelation, string? socket = null)
     {
         if (newRelation == Relation && socket == AttachSocketName) return true;
 
@@ -177,7 +177,8 @@ public bool AttachTo(SpatialComponent? newRelation, string? socket = null, bool
         if (Relation != newRelation) return false;
 
         AttachSocketName = socket;
-        if (keepWorldTransform) KeepWorldTransform(worldBefore);
+        if (socket == null) KeepWorldTransform(worldBefore);
+        else SetLocalTransform(Transform.Identity);
 
         return true;
     }
@@ -276,14 +277,17 @@ protected virtual void ResetLocalTransform(int index = -1)
 
     public virtual Matrix4x4[] GetWorldMatrices(int index = -1) => [WorldMatrix];
 
-    protected virtual (Vector3, float) GetTeleportPosition(CameraComponent camera) => (GizmoMatrix.Translation, 2.50f);
+    protected virtual (Vector3, float) GetTeleportPosition(CameraComponent camera, Quaternion rotation) => (GizmoMatrix.Translation, 2.50f);
 
     public void TeleportTo()
     {
-        if (Actor?.ActorManager is not SceneManager { MainViewport.Camera: { } camera })
+        if (Actor?.ActorManager is not SceneManager manager)
             return;
 
-        var (center, distance) = GetTeleportPosition(camera);
+        var camera = manager.MainViewport?.Camera ?? manager.RootActor?.Children.OfType<CameraActor>().FirstOrDefault()?.CameraComponent;
+        if (camera is null) return;
+
+        var (center, distance) = GetTeleportPosition(camera, camera.LocalTransform.Rotation);
         camera.TeleportTo(center, distance);
     }
 
@@ -590,8 +594,7 @@ private void DrawSocketEntry(SocketEntry entry)
         var selected = entry.Value == AttachSocketName;
         if (ImGui.Selectable(entry.Label, selected))
         {
-            // keep the local transform: picking a socket means "put it there", not "hold it where it is"
-            AttachTo(Relation, entry.Value, keepWorldTransform: false);
+            AttachTo(Relation, entry.Value);
         }
         if (selected) ImGui.SetItemDefaultFocus();
     }

Snooper/Rendering/Systems/AudioSystem.cs

@@ -86,7 +86,7 @@ protected override void OnComponentUpdate(AudioComponent component, float delta)
         if (component.IsDirty(DirtyFlags.Transform))
         {
             source.SetPosition(component.WorldMatrix.Translation);
-            source.SetDirection(Vector3.Transform(Vector3.UnitZ, component.LocalTransform.Rotation));
+            source.SetDirection(Vector3.Transform(Vector3.UnitZ, component.GetLocalTransform().Rotation));
         }
 
         if (component.ShouldPlay && !source.IsPlaying)
@@ -104,8 +104,9 @@ protected override void OnExecute(CameraComponent camera)
         if (_context == ALContext.Null) return;
 
         var position = camera.WorldMatrix.Translation;
-        var forward = Vector3.Transform(Vector3.UnitZ, camera.LocalTransform.Rotation);
-        var up      = Vector3.Transform(Vector3.UnitY, camera.LocalTransform.Rotation);
+        var rotation = camera.GetLocalTransform().Rotation;
+        var forward = Vector3.Transform(Vector3.UnitZ, rotation);
+        var up      = Vector3.Transform(Vector3.UnitY, rotation);
 
         ALC.MakeContextCurrent(_context);
         AL.Listener(ALListener3f.Position, position.X, position.Y, position.Z);
@@ -140,7 +141,7 @@ protected override void OnActorComponentRemoved(AudioComponent component, EEndPl
 
         var source = new AudioSource(buffer);
         source.SetPosition(component.WorldMatrix.Translation);
-        source.SetDirection(Vector3.Transform(Vector3.UnitZ, component.LocalTransform.Rotation));
+        source.SetDirection(Vector3.Transform(Vector3.UnitZ, component.GetLocalTransform().Rotation));
         source.SetLooping(true);
         source.SetGain(component.VolumeMultiplier * LinearToLogarithmicVolume(_volume));
         source.SetReferenceDistance(component.AttenuationDistance);