From 05a9ac41d87dfa4cacd27f7711bad165c4f5dfcc Mon Sep 17 00:00:00 2001
From: Octal <oliver@olivermakesco.de>
Date: Wed, 13 Dec 2023 21:41:51 -0600
Subject: [PATCH] Revert "Revert "Revert "Revert "Revert "Fix Vix's gooey
 sins"""""

This reverts commit 3e0a9c8673561b284a5183d6679de32846bcb375.
---
 Client/Rendering/GameRenderer.cs                     | 12 ++++++------
 .../{GUI/GUIRenderer.cs => Gui/GuiRenderer.cs}       |  8 ++++----
 .../VertexTypes/{GUIVertex.cs => GuiVertex.cs}       |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename Client/Rendering/{GUI/GUIRenderer.cs => Gui/GuiRenderer.cs} (90%)
 rename Client/Rendering/VertexTypes/{GUIVertex.cs => GuiVertex.cs} (78%)

diff --git a/Client/Rendering/GameRenderer.cs b/Client/Rendering/GameRenderer.cs
index 71a43b4..9896d5b 100644
--- a/Client/Rendering/GameRenderer.cs
+++ b/Client/Rendering/GameRenderer.cs
@@ -2,7 +2,7 @@
 using ImGuiNET;
 using Veldrid;
 using Voxel.Client.Rendering.Debug;
-using Voxel.Client.Rendering.GUI;
+using Voxel.Client.Rendering.Gui;
 using Voxel.Client.Rendering.World;
 using Voxel.Common.Util;
 
@@ -23,7 +23,7 @@ public class GameRenderer : Renderer {
 
 
     public readonly WorldRenderer WorldRenderer;
-    public readonly GUIRenderer GUIRenderer;
+    public readonly GuiRenderer GuiRenderer;
 
     public readonly BlitRenderer BlitRenderer;
     public readonly DebugRenderer DebugRenderer;
@@ -37,7 +37,7 @@ public GameRenderer(VoxelClient client) : base(client) {
         CameraStateManager = new(client.RenderSystem);
 
         WorldRenderer = new(client);
-        GUIRenderer = new(client);
+        GuiRenderer = new(client);
 
         BlitRenderer = new(client);
         DebugRenderer = new(client);
@@ -45,7 +45,7 @@ public GameRenderer(VoxelClient client) : base(client) {
 
     public override void CreatePipeline(MainFramebuffer framebuffer) {
         WorldRenderer.CreatePipeline(framebuffer);
-        GUIRenderer.CreatePipeline(framebuffer);
+        GuiRenderer.CreatePipeline(framebuffer);
 
         BlitRenderer.CreatePipeline(framebuffer);
         DebugRenderer.CreatePipeline(framebuffer);
@@ -72,7 +72,7 @@ public override void Render(double delta) {
         CameraStateManager.SetToCamera(MainCamera, Client.timeSinceLastTick);
 
         WorldRenderer.Render(delta);
-        GUIRenderer.Render(delta);
+        GuiRenderer.Render(delta);
 
         DebugRenderer.Render(delta);
 
@@ -98,7 +98,7 @@ public void SetMSAA(uint value) {
 
     public override void Dispose() {
         WorldRenderer.Dispose();
-        GUIRenderer.Dispose();
+        GuiRenderer.Dispose();
 
         BlitRenderer.Dispose();
         DebugRenderer.Dispose();
diff --git a/Client/Rendering/GUI/GUIRenderer.cs b/Client/Rendering/Gui/GuiRenderer.cs
similarity index 90%
rename from Client/Rendering/GUI/GUIRenderer.cs
rename to Client/Rendering/Gui/GuiRenderer.cs
index d2a1fd1..3957822 100644
--- a/Client/Rendering/GUI/GUIRenderer.cs
+++ b/Client/Rendering/Gui/GuiRenderer.cs
@@ -2,12 +2,12 @@
 using Veldrid;
 using Voxel.Client.Rendering.VertexTypes;
 
-namespace Voxel.Client.Rendering.GUI;
+namespace Voxel.Client.Rendering.Gui;
 
-public class GUIRenderer : Renderer, IDisposable {
-    public Pipeline GUIPipeline;
+public class GuiRenderer : Renderer, IDisposable {
+    public Pipeline GuiPipeline;
 
-    public GUIRenderer(VoxelClient client) : base(client) {
+    public GuiRenderer(VoxelClient client) : base(client) {
 
     }
 
diff --git a/Client/Rendering/VertexTypes/GUIVertex.cs b/Client/Rendering/VertexTypes/GuiVertex.cs
similarity index 78%
rename from Client/Rendering/VertexTypes/GUIVertex.cs
rename to Client/Rendering/VertexTypes/GuiVertex.cs
index e3050b9..6a5ee30 100644
--- a/Client/Rendering/VertexTypes/GUIVertex.cs
+++ b/Client/Rendering/VertexTypes/GuiVertex.cs
@@ -5,7 +5,7 @@
 
 namespace Voxel.Client.Rendering.VertexTypes; 
 
-public class GUIVertex {
+public class GuiVertex {
 
     public static readonly VertexLayoutDescription Layout = new(
         new VertexElementDescription("Position", VertexElementFormat.Float2, VertexElementSemantic.Position),
@@ -15,9 +15,9 @@ public class GUIVertex {
     public vec2 position;
     public vec2 uv;
 
-    public GUIVertex() {}
-    public GUIVertex(vec2 pos) : this(pos, vec2.Zero) {}
-    public GUIVertex(vec2 pos, vec2 uv) {
+    public GuiVertex() {}
+    public GuiVertex(vec2 pos) : this(pos, vec2.Zero) {}
+    public GuiVertex(vec2 pos, vec2 uv) {
         position = pos;
         this.uv = uv;
     }