Skip to content
This repository has been archived by the owner on Nov 25, 2024. It is now read-only.

Commit

Permalink
Revert "Revert "Revert "Revert "Fix Vix's gooey sins""""
Browse files Browse the repository at this point in the history
This reverts commit ae145b1.
  • Loading branch information
EtheraelEspeon committed Dec 14, 2023
1 parent ae145b1 commit 3e0a9c8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

}

Expand Down
12 changes: 6 additions & 6 deletions Client/Rendering/GameRenderer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -37,15 +37,15 @@ 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);
}

public override void CreatePipeline(MainFramebuffer framebuffer) {
WorldRenderer.CreatePipeline(framebuffer);
GuiRenderer.CreatePipeline(framebuffer);
GUIRenderer.CreatePipeline(framebuffer);

BlitRenderer.CreatePipeline(framebuffer);
DebugRenderer.CreatePipeline(framebuffer);
Expand All @@ -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);

Expand All @@ -98,7 +98,7 @@ public void SetMSAA(uint value) {

public override void Dispose() {
WorldRenderer.Dispose();
GuiRenderer.Dispose();
GUIRenderer.Dispose();

BlitRenderer.Dispose();
DebugRenderer.Dispose();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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;
}
Expand Down

0 comments on commit 3e0a9c8

Please sign in to comment.