From 8abc6082c701084d505fa4fdf391a8cbf69e4fec Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 21 Sep 2026 15:58:57 -0400 Subject: Reorder UI Signed-off-by: Andrew Opalach --- Plugin.cs | 145 ++++++++++++++++++++++++++++---------------------------------- 1 file changed, 65 insertions(+), 80 deletions(-) diff --git a/Plugin.cs b/Plugin.cs index ae13e55..d49ab19 100755 --- a/Plugin.cs +++ b/Plugin.cs @@ -2408,7 +2408,70 @@ namespace NewCamera ImGui.Separator(); - if (ImGui.Checkbox("Enable Perspective Camera", ref enableOffsetPerspective)) + ImGui.PushItemWidth(width * 0.475f); + ImGui.Checkbox("Free Camera", ref enableFreeCamera); + ImGui.PushID("Settings"); + ImGui.DragFloat("Camera Speed", ref cameraSpeed, 0.01f, 0.0f, 0.0f, "%.4f"); + if (ImGui.BeginItemTooltip()) + { + ImGui.Text("Movement speed in free camera."); + ImGui.EndTooltip(); + } + ImGui.DragFloat("Speed Modifier", ref cameraSpeedModifier, 0.01f, 0.0f, 0.0f, "%.4f"); + if (ImGui.BeginItemTooltip()) + { + ImGui.Text("Value to multiply speed by when LT is held."); + ImGui.EndTooltip(); + } + ImGui.DragFloat("Camera Sensitivity", ref cameraSensitivity, 0.001f, 0.0f, 0.0f, "%.4f"); + if (ImGui.BeginItemTooltip()) + { + ImGui.Text("Look sensitivity in free camera."); + ImGui.EndTooltip(); + } + ImGui.DragFloat("Zoom Speed", ref cameraZoomSpeed, 0.01f, 0.0f, 0.0f, "%.4f"); + if (ImGui.InputFloat("Pitch Limit", ref cameraPitchLimit, 0.0f, 0.0f, null, ImGuiInputTextFlags.EnterReturnsTrue)) + { + if (cameraPitchLimit != -1.0f) + { + cameraPitchLimit = Math.Clamp(cameraPitchLimit, 0.0f, Config.Settings.MAX_PITCH_LIMIT); + } + } + if (ImGui.BeginItemTooltip()) + { + ImGui.Text($"-1.0 = Wrap around (go upside down), Max: {Config.Settings.MAX_PITCH_LIMIT:0.00}."); + ImGui.EndTooltip(); + } + ImGui.DragInt("Stick Deadzone", ref stickDeadzone, 5, 0); + if (ImGui.Button("Reset")) + { + Config.Settings camera = config.Camera; + cameraSpeed = camera.Speed; + cameraSpeedModifier = camera.SpeedModifier; + cameraSensitivity = camera.Sensitivity; + cameraZoomSpeed = camera.ZoomSpeed; + cameraPitchLimit = camera.PitchLimit; + stickDeadzone = camera.StickDeadzone; + alternateNearClip = camera.AlternateNearClip; + } + ImGui.SameLine(); + if (ImGui.Button("Save")) + { + Config.Settings camera = config.Camera; + camera.Speed = cameraSpeed; + camera.SpeedModifier = cameraSpeedModifier; + camera.Sensitivity = cameraSensitivity; + camera.ZoomSpeed = cameraZoomSpeed; + camera.PitchLimit = cameraPitchLimit; + camera.StickDeadzone = stickDeadzone; + config.Camera = camera; + ConfigManager.SaveConfig(this); + } + ImGui.PopID(); + + ImGui.Separator(); + + if (ImGui.Checkbox("Perspective Camera", ref enableOffsetPerspective)) { config.PerspectiveCameraEnabled = enableOffsetPerspective; if (enableOffsetPerspective) @@ -2427,7 +2490,6 @@ namespace NewCamera if (enableOffsetPerspective) { ImGui.PushID("Perspective"); - ImGui.PushItemWidth(width * 0.575f); ImGui.DragFloat("Field of View", ref cameraFov, 0.4f, 1.0f, 179.0f); ImGui.DragFloat("Roll", ref cameraRoll, 0.25f); if (freeCamera) @@ -2437,7 +2499,6 @@ namespace NewCamera ImGui.DragFloat("Forward", ref cameraForward, 0.25f); ImGui.DragFloat("Right", ref cameraRight, 0.25f); ImGui.DragFloat("Up", ref cameraUp, 0.025f); - ImGui.PopItemWidth(); if (ImGui.Checkbox("Disable Fading", ref disableFading)) { setDisableFading(disableFading); @@ -2518,83 +2579,7 @@ namespace NewCamera } ImGui.PopID(); } - - ImGui.Separator(); - - ImGui.Checkbox("Enable Free Camera", ref enableFreeCamera); - ImGui.PushID("Settings"); - ImGui.PushItemWidth(width * 0.575f); - ImGui.DragFloat("Camera Speed", ref cameraSpeed, 0.01f, 0.0f, 0.0f, "%.4f"); - if (ImGui.BeginItemTooltip()) - { - ImGui.Text("Movement speed in free camera."); - ImGui.EndTooltip(); - } - ImGui.DragFloat("Speed Modifier", ref cameraSpeedModifier, 0.01f, 0.0f, 0.0f, "%.4f"); - if (ImGui.BeginItemTooltip()) - { - ImGui.Text("Value to multiply speed by when LT is held."); - ImGui.EndTooltip(); - } - ImGui.DragFloat("Camera Sensitivity", ref cameraSensitivity, 0.001f, 0.0f, 0.0f, "%.4f"); - if (ImGui.BeginItemTooltip()) - { - ImGui.Text("Look sensitivity in free camera."); - ImGui.EndTooltip(); - } - ImGui.DragFloat("Zoom Speed", ref cameraZoomSpeed, 0.01f, 0.0f, 0.0f, "%.4f"); - if (ImGui.InputFloat("Pitch Limit", ref cameraPitchLimit, 0.0f, 0.0f, null, ImGuiInputTextFlags.EnterReturnsTrue)) - { - if (cameraPitchLimit != -1.0f) - { - cameraPitchLimit = Math.Clamp(cameraPitchLimit, 0.0f, Config.Settings.MAX_PITCH_LIMIT); - } - } - if (ImGui.BeginItemTooltip()) - { - ImGui.Text($"-1.0 = Wrap around (go upside down), Max: {Config.Settings.MAX_PITCH_LIMIT:0.00}."); - ImGui.EndTooltip(); - } - ImGui.DragInt("Stick Deadzone", ref stickDeadzone, 5, 0); ImGui.PopItemWidth(); - /* - if (ImGui.Button("Default")) - { - cameraSpeed = Config.Settings.DEFAULT_SPEED; - cameraSpeedModifier = Config.Settings.DEFAULT_SPEED_MODIFIER; - cameraSensitivity = Config.Settings.DEFAULT_SENSITIVITY; - cameraZoomSpeed = Config.Settings.DEFAULT_ZOOM_SPEED; - cameraPitchLimit = Config.Settings.DEFAULT_PITCH_LIMIT; - stickDeadzone = Config.Settings.DEFAULT_DEADZONE; - alternateNearClip = Config.Settings.DEFAULT_ALT_NEAR_CLIP; - } - ImGui.SameLine(); - */ - if (ImGui.Button("Reset")) - { - Config.Settings camera = config.Camera; - cameraSpeed = camera.Speed; - cameraSpeedModifier = camera.SpeedModifier; - cameraSensitivity = camera.Sensitivity; - cameraZoomSpeed = camera.ZoomSpeed; - cameraPitchLimit = camera.PitchLimit; - stickDeadzone = camera.StickDeadzone; - alternateNearClip = camera.AlternateNearClip; - } - ImGui.SameLine(); - if (ImGui.Button("Save")) - { - Config.Settings camera = config.Camera; - camera.Speed = cameraSpeed; - camera.SpeedModifier = cameraSpeedModifier; - camera.Sensitivity = cameraSensitivity; - camera.ZoomSpeed = cameraZoomSpeed; - camera.PitchLimit = cameraPitchLimit; - camera.StickDeadzone = stickDeadzone; - config.Camera = camera; - ConfigManager.SaveConfig(this); - } - ImGui.PopID(); ImGui.Separator(); @@ -2630,7 +2615,7 @@ namespace NewCamera ImGui.Checkbox("Orbit Player", ref orbitPlayer); if (ImGui.BeginItemTooltip()) { - ImGui.Text("Use left stick up/down to move the camera forward/back and d-pad up/down to set the Y target."); + ImGui.Text("Use Left Stick Up/Down to move the camera forward/back and D-Pad Up/Down to set the Y target."); ImGui.EndTooltip(); } if (!freeCamera) -- cgit v1.2.3-101-g0448