From 9e0a578efc07b5b6eb0e954e85c8c45137822cd7 Mon Sep 17 00:00:00 2001 From: Tefek <493msi@gmail.com> Date: Tue, 18 Aug 2020 17:43:18 +0200 Subject: [PATCH] Removed stuff planned for the fontrenderer2 branch. --- .../tefek/pluto/engine/gui/IGUIPipeline.java | 6 - .../tefek/pluto/engine/gui/IGUIRenderer.java | 6 - .../pluto/engine/gui/font/FontRenderer2.java | 106 ------------------ .../engine/gui/pipeline/BasicGUIPipeline.java | 12 -- .../gui/pipeline/EnumGUIPipelineCommand.java | 12 -- 5 files changed, 142 deletions(-) delete mode 100644 plutogui/src/main/java/cz/tefek/pluto/engine/gui/IGUIPipeline.java delete mode 100644 plutogui/src/main/java/cz/tefek/pluto/engine/gui/IGUIRenderer.java delete mode 100644 plutogui/src/main/java/cz/tefek/pluto/engine/gui/font/FontRenderer2.java delete mode 100644 plutogui/src/main/java/cz/tefek/pluto/engine/gui/pipeline/BasicGUIPipeline.java delete mode 100644 plutogui/src/main/java/cz/tefek/pluto/engine/gui/pipeline/EnumGUIPipelineCommand.java diff --git a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/IGUIPipeline.java b/plutogui/src/main/java/cz/tefek/pluto/engine/gui/IGUIPipeline.java deleted file mode 100644 index 32e7256..0000000 --- a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/IGUIPipeline.java +++ /dev/null @@ -1,6 +0,0 @@ -package cz.tefek.pluto.engine.gui; - -public interface IGUIPipeline -{ - void flush(); -} diff --git a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/IGUIRenderer.java b/plutogui/src/main/java/cz/tefek/pluto/engine/gui/IGUIRenderer.java deleted file mode 100644 index de48820..0000000 --- a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/IGUIRenderer.java +++ /dev/null @@ -1,6 +0,0 @@ -package cz.tefek.pluto.engine.gui; - -public interface IGUIRenderer -{ - void flush(); -} diff --git a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/font/FontRenderer2.java b/plutogui/src/main/java/cz/tefek/pluto/engine/gui/font/FontRenderer2.java deleted file mode 100644 index da3a55e..0000000 --- a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/font/FontRenderer2.java +++ /dev/null @@ -1,106 +0,0 @@ -package cz.tefek.pluto.engine.gui.font; - -import org.joml.Vector2fc; - -import cz.tefek.pluto.engine.gui.IGUIPipeline; -import cz.tefek.pluto.engine.gui.IGUIRenderer; - -public class FontRenderer2 implements IGUIRenderer -{ - private static final FontRenderer2 INSTANCE_IMMEDIATE = new FontRenderer2(); - private static final FontRenderer2 INSTANCE_DEFERRED = new FontRenderer2(); - - private final IGUIPipeline deferPipeline; - - private static final float DEFAULT_SIZE = 24; - - private float x; - private float y; - private String drawnText; - private float size = DEFAULT_SIZE; - - private FontRenderer2(IGUIPipeline deferPipeline) - { - this.deferPipeline = deferPipeline; - } - - private FontRenderer2() - { - this.deferPipeline = null; - } - - public FontRenderer2 at(float x, float y) - { - this.x = x; - this.y = y; - - return this; - } - - public FontRenderer2 at(Vector2fc pos) - { - this.x = pos.x(); - this.y = pos.y(); - - return this; - } - - public FontRenderer2 size(float size) - { - this.size = size; - - return this; - } - - public FontRenderer2 string(Object text) - { - this.drawnText = String.valueOf(text); - - return this; - } - - public FontRenderer2 fstring(String format, Object... items) - { - this.drawnText = String.format(format, items); - - return this; - } - - public FontRenderer2 reset() - { - this.size = DEFAULT_SIZE; - this.drawnText = ""; - this.x = 0; - this.y = 0; - - return this; - } - - @Override - public void flush() - { - if (this.deferPipeline != null) - { - // Defer rendering to the pipeline - } - else - { - // Draw in immediate mode - } - } - - public static FontRenderer2 immediate() - { - return INSTANCE_IMMEDIATE.reset(); - } - - public static FontRenderer2 deferred() - { - return INSTANCE_DEFERRED.reset(); - } - - public static FontRenderer2 draw() - { - return deferred(); - } -} diff --git a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/pipeline/BasicGUIPipeline.java b/plutogui/src/main/java/cz/tefek/pluto/engine/gui/pipeline/BasicGUIPipeline.java deleted file mode 100644 index 3c50cde..0000000 --- a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/pipeline/BasicGUIPipeline.java +++ /dev/null @@ -1,12 +0,0 @@ -package cz.tefek.pluto.engine.gui.pipeline; - -import cz.tefek.pluto.engine.gui.IGUIPipeline; - -public class BasicGUIPipeline implements IGUIPipeline -{ - @Override - public void flush() - { - - } -} diff --git a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/pipeline/EnumGUIPipelineCommand.java b/plutogui/src/main/java/cz/tefek/pluto/engine/gui/pipeline/EnumGUIPipelineCommand.java deleted file mode 100644 index c79db60..0000000 --- a/plutogui/src/main/java/cz/tefek/pluto/engine/gui/pipeline/EnumGUIPipelineCommand.java +++ /dev/null @@ -1,12 +0,0 @@ -package cz.tefek.pluto.engine.gui.pipeline; - -public enum EnumGUIPipelineCommand -{ - MOVE_XY, - SCALE_XY, - MOVE_UV, - SCALE_UV, - ROTATE, - SET_TEXTURE, - DRAW; -}