Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed editor camera for real

Browse Source
This commit is contained in:
Simon Lübeß
2022-09-29 16:39:58 +02:00
parent f8544c8f64
commit 6958d27c30
3 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/ImGui/ImGuiExtension.bf
+17 -5
View File
@@ -89,16 +89,22 @@ namespace ImGui
return EditVector<4>(label, ref *(float[4]*)&value, (float[4])resetValues, dragSpeed, columnWidth, (float[4])minValue, (float[4])maxValue);
}
static (Color Default, Color Hovered, Color Active)[?] VectorButtonColors = .(
(Color(230, 25, 45), Color(150, 25, 45), Color(230, 90, 90)),
(Color(50, 190, 15), Color(50, 120, 15), Color(116, 190, 99)),
(Color(55, 55, 230), Color(55, 55, 150), Color(90, 90, 230)),
(Color(230, 25, 45), Color(230, 25, 45), Color(230, 25, 45)));
public static bool EditVector<NumComponents>(StringView label, ref float[NumComponents] value, float[NumComponents] resetValues = .(), float dragSpeed = 0.1f, float columnWidth = 100f, float[NumComponents] minValue = .(), float[NumComponents] maxValue = .()) where NumComponents : const int32
{
const String[?] componentNames = .("X", "Y", "Z", "W");
const String[?] componentIds = .("##X", "##Y", "##Z", "##W");
(Color Default, Color Hovered, Color Active)[?] ButtonColors = .(
/*(Color Default, Color Hovered, Color Active)[?] VectorButtonColors = .(
(Color(230, 25, 45), Color(150, 25, 45), Color(230, 90, 90)),
(Color(50, 190, 15), Color(50, 120, 15), Color(116, 190, 99)),
(Color(55, 55, 230), Color(55, 55, 150), Color(90, 90, 230)),
(Color(230, 25, 45), Color(230, 25, 45), Color(230, 25, 45)));
(Color(230, 25, 45), Color(230, 25, 45), Color(230, 25, 45)));*/
bool changed = false;
@@ -127,9 +133,9 @@ namespace ImGui
SameLine();
}
PushStyleColor(.Button, ButtonColors[i].Default.Value);
PushStyleColor(.ButtonHovered, ButtonColors[i].Hovered.Value);
PushStyleColor(.ButtonActive, ButtonColors[i].Active.Value);
PushStyleColor(.Button, VectorButtonColors[i].Default.Value);
PushStyleColor(.ButtonHovered, VectorButtonColors[i].Hovered.Value);
PushStyleColor(.ButtonActive, VectorButtonColors[i].Active.Value);
if (Button(componentNames[i], buttonSize))
{
@@ -150,5 +156,11 @@ namespace ImGui
return changed;
}
/// Draws a rectangle with the given color.
public static void DrawRect(Vec2 min, Vec2 max, Color color)
{
ImGui.GetForegroundDrawList().AddRect(min, max, ImGui.GetColorU32(color.Value));
}
}
}
GlitchyEngine/src/World/EditorCamera.bf
+14 -8
View File
@@ -37,6 +37,9 @@ namespace GlitchyEngine.World
// Gets whether or not the camera is currently being moved.
public bool InUse => BindMouse;
/// If true, the camera can be rotated/moved
public bool AllowMove;
public RenderTargetGroup RenderTarget
{
get => _renderTarget;
@@ -160,15 +163,18 @@ namespace GlitchyEngine.World
BindMouse = false;
if (Input.IsKeyPressed(.Alt))
if (AllowMove)
{
AltController(gameTime);
_isAltMode = true;
}
else
{
FirstPersonController(gameTime);
_isAltMode = false;
if (Input.IsKeyPressed(.Alt))
{
AltController(gameTime);
_isAltMode = true;
}
else
{
FirstPersonController(gameTime);
_isAltMode = false;
}
}
if (MouseCooldown != 0)