diff --git a/src/main/java/speiger/src/coreengine/Testing.java b/src/main/java/speiger/src/coreengine/Testing.java index 03142ab..611911e 100644 --- a/src/main/java/speiger/src/coreengine/Testing.java +++ b/src/main/java/speiger/src/coreengine/Testing.java @@ -3,8 +3,8 @@ package speiger.src.coreengine; import java.nio.file.Path; import speiger.src.coreengine.application.Application; -import speiger.src.coreengine.rendering.input.window.Window; -import speiger.src.coreengine.rendering.input.window.WindowProvider; +import speiger.src.coreengine.rendering.inputOld.window.Window; +import speiger.src.coreengine.rendering.inputOld.window.WindowProvider; public class Testing extends Application { public static void main(String... args) { diff --git a/src/main/java/speiger/src/coreengine/application/Application.java b/src/main/java/speiger/src/coreengine/application/Application.java index 9a68051..b1ee402 100644 --- a/src/main/java/speiger/src/coreengine/application/Application.java +++ b/src/main/java/speiger/src/coreengine/application/Application.java @@ -12,14 +12,14 @@ import speiger.src.collections.objects.utils.ObjectLists; import speiger.src.coreengine.assets.AssetManager; import speiger.src.coreengine.assets.base.IAssetPackage; import speiger.src.coreengine.assets.reloader.ResourceReloader; -import speiger.src.coreengine.rendering.gui.GuiManager; -import speiger.src.coreengine.rendering.gui.base.DebugOverlay; -import speiger.src.coreengine.rendering.gui.renderer.provider.FontManager; -import speiger.src.coreengine.rendering.input.Keyboard; -import speiger.src.coreengine.rendering.input.Mouse; -import speiger.src.coreengine.rendering.input.camera.Camera; -import speiger.src.coreengine.rendering.input.window.Window; -import speiger.src.coreengine.rendering.input.window.WindowProvider; +import speiger.src.coreengine.rendering.guiOld.GuiManager; +import speiger.src.coreengine.rendering.guiOld.base.DebugOverlay; +import speiger.src.coreengine.rendering.guiOld.renderer.provider.FontManager; +import speiger.src.coreengine.rendering.inputOld.Keyboard; +import speiger.src.coreengine.rendering.inputOld.Mouse; +import speiger.src.coreengine.rendering.inputOld.camera.Camera; +import speiger.src.coreengine.rendering.inputOld.window.Window; +import speiger.src.coreengine.rendering.inputOld.window.WindowProvider; import speiger.src.coreengine.rendering.shaderOld.ProjectionBuffer; import speiger.src.coreengine.rendering.shaderOld.ShaderTracker; import speiger.src.coreengine.rendering.texturesOld.base.TextureManager; diff --git a/src/main/java/speiger/src/coreengine/application/ApplicationExecutor.java b/src/main/java/speiger/src/coreengine/application/ApplicationExecutor.java index cb88f52..75f562a 100644 --- a/src/main/java/speiger/src/coreengine/application/ApplicationExecutor.java +++ b/src/main/java/speiger/src/coreengine/application/ApplicationExecutor.java @@ -6,7 +6,7 @@ import org.lwjgl.opengl.GL11; import speiger.src.collections.objects.queues.ObjectArrayFIFOQueue; import speiger.src.collections.objects.queues.ObjectPriorityQueue; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.rendering.utils.AllocationTracker; import speiger.src.coreengine.rendering.utils.GLStamper; import speiger.src.coreengine.rendering.utils.GLStamper.GLStamp; diff --git a/src/main/java/speiger/src/coreengine/application/BaseUIManager.java b/src/main/java/speiger/src/coreengine/application/BaseUIManager.java index 55c2e13..925731d 100644 --- a/src/main/java/speiger/src/coreengine/application/BaseUIManager.java +++ b/src/main/java/speiger/src/coreengine/application/BaseUIManager.java @@ -1,7 +1,7 @@ package speiger.src.coreengine.application; -import speiger.src.coreengine.rendering.gui.GuiManager; -import speiger.src.coreengine.rendering.gui.base.DebugOverlay; +import speiger.src.coreengine.rendering.guiOld.GuiManager; +import speiger.src.coreengine.rendering.guiOld.base.DebugOverlay; import speiger.src.coreengine.rendering.models.buffers.UniformBuffer; import speiger.src.coreengine.utils.collections.FlagHolder; import speiger.src.coreengine.utils.profiler.EmptyProfiler; diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/animation/GuiAnimation.java b/src/main/java/speiger/src/coreengine/rendering/gui/animation/GuiAnimation.java similarity index 75% rename from src/main/java/speiger/src/coreengine/rendering/newGui/animation/GuiAnimation.java rename to src/main/java/speiger/src/coreengine/rendering/gui/animation/GuiAnimation.java index 16b544a..e39f8b9 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/animation/GuiAnimation.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/animation/GuiAnimation.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.newGui.animation; +package speiger.src.coreengine.rendering.gui.animation; public class GuiAnimation { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/TestComponent.java b/src/main/java/speiger/src/coreengine/rendering/gui/components/TestComponent.java new file mode 100644 index 0000000..ffe902b --- /dev/null +++ b/src/main/java/speiger/src/coreengine/rendering/gui/components/TestComponent.java @@ -0,0 +1,14 @@ +package speiger.src.coreengine.rendering.gui.components; + +import speiger.src.coreengine.rendering.gui.components.base.GuiComponent; +import speiger.src.coreengine.rendering.gui.components.base.IInteractable; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; + +public class TestComponent extends GuiComponent implements IInteractable { + public TestComponent(IGuiBox box) { + super(box); + } + + @Override + public void init() {} +} diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/GuiComponent.java b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/GuiComponent.java similarity index 92% rename from src/main/java/speiger/src/coreengine/rendering/newGui/components/base/GuiComponent.java rename to src/main/java/speiger/src/coreengine/rendering/gui/components/base/GuiComponent.java index 987ebd1..f5e030e 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/GuiComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/GuiComponent.java @@ -1,12 +1,12 @@ -package speiger.src.coreengine.rendering.newGui.components.base; +package speiger.src.coreengine.rendering.gui.components.base; import java.util.List; import java.util.function.Consumer; import speiger.src.collections.objects.lists.ObjectArrayList; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.newGui.layout.constraints.ConstraintContainer; -import speiger.src.coreengine.rendering.newGui.renderer.IUIRenderer; +import speiger.src.coreengine.rendering.gui.layout.constraints.ConstraintContainer; +import speiger.src.coreengine.rendering.gui.renderer.IUIRenderer; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; import speiger.src.coreengine.utils.collections.CollectionUtils; import speiger.src.coreengine.utils.collections.FlagObject; import speiger.src.coreengine.utils.misc.ICastable; diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IComponentRenderer.java b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/IComponentRenderer.java similarity index 56% rename from src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IComponentRenderer.java rename to src/main/java/speiger/src/coreengine/rendering/gui/components/base/IComponentRenderer.java index 4bbe548..8b2757c 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IComponentRenderer.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/IComponentRenderer.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.newGui.components.base; +package speiger.src.coreengine.rendering.gui.components.base; -import speiger.src.coreengine.rendering.newGui.renderer.IUIRenderer; +import speiger.src.coreengine.rendering.gui.renderer.IUIRenderer; public interface IComponentRenderer { public void renderComponent(T component, IUIRenderer renderer, int mouseX, int mouseY, float particalTicks); diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IInteractable.java b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/IInteractable.java similarity index 91% rename from src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IInteractable.java rename to src/main/java/speiger/src/coreengine/rendering/gui/components/base/IInteractable.java index 2fc23d5..980c76a 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IInteractable.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/IInteractable.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.newGui.components.base; +package speiger.src.coreengine.rendering.gui.components.base; public interface IInteractable { diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IInteractableContainer.java b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/IInteractableContainer.java similarity index 95% rename from src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IInteractableContainer.java rename to src/main/java/speiger/src/coreengine/rendering/gui/components/base/IInteractableContainer.java index f0a7a28..0d1b2e2 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IInteractableContainer.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/IInteractableContainer.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.newGui.components.base; +package speiger.src.coreengine.rendering.gui.components.base; import java.util.List; diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/ILayoutComponent.java b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/ILayoutComponent.java similarity index 91% rename from src/main/java/speiger/src/coreengine/rendering/newGui/components/base/ILayoutComponent.java rename to src/main/java/speiger/src/coreengine/rendering/gui/components/base/ILayoutComponent.java index b2e9453..11c5ec3 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/ILayoutComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/ILayoutComponent.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.newGui.components.base; +package speiger.src.coreengine.rendering.gui.components.base; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; public interface ILayoutComponent { public void calculateBounds(ILayoutScanner output); diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IListableComponent.java b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/IListableComponent.java similarity index 94% rename from src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IListableComponent.java rename to src/main/java/speiger/src/coreengine/rendering/gui/components/base/IListableComponent.java index bc85dae..e1f7c6b 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/IListableComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/IListableComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.newGui.components.base; +package speiger.src.coreengine.rendering.gui.components.base; import java.util.function.Consumer; diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/InteractionContainer.java b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/InteractionContainer.java similarity index 89% rename from src/main/java/speiger/src/coreengine/rendering/newGui/components/base/InteractionContainer.java rename to src/main/java/speiger/src/coreengine/rendering/gui/components/base/InteractionContainer.java index 1980b7d..ee6b38f 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/components/base/InteractionContainer.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/components/base/InteractionContainer.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.newGui.components.base; +package speiger.src.coreengine.rendering.gui.components.base; import java.util.List; import java.util.function.BooleanSupplier; @@ -7,7 +7,7 @@ import speiger.src.collections.ints.sets.IntOpenHashSet; import speiger.src.collections.ints.sets.IntSet; import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.utils.ObjectLists; -import speiger.src.coreengine.rendering.newGui.components.base.IInteractableContainer.IRecursiveInteractionContainer; +import speiger.src.coreengine.rendering.gui.components.base.IInteractableContainer.IRecursiveInteractionContainer; public class InteractionContainer implements IRecursiveInteractionContainer { List children = new ObjectArrayList<>(); diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/misc/ICheckBox.java b/src/main/java/speiger/src/coreengine/rendering/gui/components/misc/ICheckBox.java deleted file mode 100644 index 81cbc9e..0000000 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/misc/ICheckBox.java +++ /dev/null @@ -1,10 +0,0 @@ -package speiger.src.coreengine.rendering.gui.components.misc; - -import speiger.src.coreengine.rendering.gui.GuiComponent; - -public interface ICheckBox -{ - public boolean isChecked(); - - public T setChecked(boolean value); -} diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/layout/constraints/ConstraintContainer.java b/src/main/java/speiger/src/coreengine/rendering/gui/layout/constraints/ConstraintContainer.java similarity index 85% rename from src/main/java/speiger/src/coreengine/rendering/newGui/layout/constraints/ConstraintContainer.java rename to src/main/java/speiger/src/coreengine/rendering/gui/layout/constraints/ConstraintContainer.java index 3d23c88..0e6d927 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/layout/constraints/ConstraintContainer.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/layout/constraints/ConstraintContainer.java @@ -1,7 +1,7 @@ -package speiger.src.coreengine.rendering.newGui.layout.constraints; +package speiger.src.coreengine.rendering.gui.layout.constraints; -import speiger.src.coreengine.rendering.newGui.components.base.GuiComponent; -import speiger.src.coreengine.rendering.newGui.layout.constraints.IConstraint.Target; +import speiger.src.coreengine.rendering.gui.components.base.GuiComponent; +import speiger.src.coreengine.rendering.gui.layout.constraints.IConstraint.Target; public class ConstraintContainer { private static final int CONSTRAINT_LENGTH = 4; diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/layout/constraints/Constraints.java b/src/main/java/speiger/src/coreengine/rendering/gui/layout/constraints/Constraints.java similarity index 88% rename from src/main/java/speiger/src/coreengine/rendering/newGui/layout/constraints/Constraints.java rename to src/main/java/speiger/src/coreengine/rendering/gui/layout/constraints/Constraints.java index b586c2e..7b4c0ae 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/layout/constraints/Constraints.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/layout/constraints/Constraints.java @@ -1,10 +1,10 @@ -package speiger.src.coreengine.rendering.newGui.layout.constraints; +package speiger.src.coreengine.rendering.gui.layout.constraints; import java.util.function.BooleanSupplier; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.newGui.components.base.GuiComponent; -import speiger.src.coreengine.rendering.newGui.layout.constraints.IConstraint.ISimpleConstraint; +import speiger.src.coreengine.rendering.gui.components.base.GuiComponent; +import speiger.src.coreengine.rendering.gui.layout.constraints.IConstraint.ISimpleConstraint; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; public class Constraints { public static record Pixels(float value, boolean inverted) implements ISimpleConstraint { diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/layout/constraints/IConstraint.java b/src/main/java/speiger/src/coreengine/rendering/gui/layout/constraints/IConstraint.java similarity index 78% rename from src/main/java/speiger/src/coreengine/rendering/newGui/layout/constraints/IConstraint.java rename to src/main/java/speiger/src/coreengine/rendering/gui/layout/constraints/IConstraint.java index 2bc9bf2..9da5f5c 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/layout/constraints/IConstraint.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/layout/constraints/IConstraint.java @@ -1,14 +1,14 @@ -package speiger.src.coreengine.rendering.newGui.layout.constraints; +package speiger.src.coreengine.rendering.gui.layout.constraints; import java.util.function.BooleanSupplier; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.newGui.components.base.GuiComponent; -import speiger.src.coreengine.rendering.newGui.layout.constraints.Constraints.Center; -import speiger.src.coreengine.rendering.newGui.layout.constraints.Constraints.Conditional; -import speiger.src.coreengine.rendering.newGui.layout.constraints.Constraints.Parent; -import speiger.src.coreengine.rendering.newGui.layout.constraints.Constraints.Pixels; -import speiger.src.coreengine.rendering.newGui.layout.constraints.Constraints.Relative; +import speiger.src.coreengine.rendering.gui.components.base.GuiComponent; +import speiger.src.coreengine.rendering.gui.layout.constraints.Constraints.Center; +import speiger.src.coreengine.rendering.gui.layout.constraints.Constraints.Conditional; +import speiger.src.coreengine.rendering.gui.layout.constraints.Constraints.Parent; +import speiger.src.coreengine.rendering.gui.layout.constraints.Constraints.Pixels; +import speiger.src.coreengine.rendering.gui.layout.constraints.Constraints.Relative; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; public interface IConstraint { public void apply(GuiComponent owner, GuiComponent child, Target target); diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/layout/layouts/ILayout.java b/src/main/java/speiger/src/coreengine/rendering/gui/layout/layouts/ILayout.java similarity index 61% rename from src/main/java/speiger/src/coreengine/rendering/newGui/layout/layouts/ILayout.java rename to src/main/java/speiger/src/coreengine/rendering/gui/layout/layouts/ILayout.java index 15b9668..63d574a 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/layout/layouts/ILayout.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/layout/layouts/ILayout.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.newGui.layout.layouts; +package speiger.src.coreengine.rendering.gui.layout.layouts; -import speiger.src.coreengine.rendering.newGui.components.base.GuiComponent; +import speiger.src.coreengine.rendering.gui.components.base.GuiComponent; public interface ILayout { public default ILayout add(GuiComponent comp) { return add(comp, null); } diff --git a/src/main/java/speiger/src/coreengine/rendering/newGui/renderer/IUIRenderer.java b/src/main/java/speiger/src/coreengine/rendering/gui/renderer/IUIRenderer.java similarity index 78% rename from src/main/java/speiger/src/coreengine/rendering/newGui/renderer/IUIRenderer.java rename to src/main/java/speiger/src/coreengine/rendering/gui/renderer/IUIRenderer.java index e65d6d2..6aa28a8 100644 --- a/src/main/java/speiger/src/coreengine/rendering/newGui/renderer/IUIRenderer.java +++ b/src/main/java/speiger/src/coreengine/rendering/gui/renderer/IUIRenderer.java @@ -1,7 +1,7 @@ -package speiger.src.coreengine.rendering.newGui.renderer; +package speiger.src.coreengine.rendering.gui.renderer; import speiger.src.coreengine.math.vector.quaternion.Quaternion; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; public interface IUIRenderer { public boolean isInScissors(IGuiBox box); diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/GuiBase.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/GuiBase.java similarity index 86% rename from src/main/java/speiger/src/coreengine/rendering/gui/GuiBase.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/GuiBase.java index b6c87f1..a2c51eb 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/GuiBase.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/GuiBase.java @@ -1,25 +1,25 @@ -package speiger.src.coreengine.rendering.gui; +package speiger.src.coreengine.rendering.guiOld; import java.util.function.IntToLongFunction; import speiger.src.collections.ints.maps.impl.hash.Int2LongOpenHashMap; import speiger.src.collections.ints.maps.interfaces.Int2LongMap; import speiger.src.collections.ints.sets.IntSet; -import speiger.src.coreengine.rendering.gui.base.DebugOverlay; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.base.IKeyComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain; -import speiger.src.coreengine.rendering.gui.renderer.FontRenderer; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; -import speiger.src.coreengine.rendering.input.events.MouseEvent; -import speiger.src.coreengine.rendering.input.events.MouseEvent.MouseClickEvent; -import speiger.src.coreengine.rendering.input.events.MouseEvent.MouseMoveEvent; -import speiger.src.coreengine.rendering.input.events.MouseEvent.MouseScrollEvent; -import speiger.src.coreengine.rendering.input.window.ScaledResolution; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.guiOld.base.DebugOverlay; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.base.IKeyComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.renderer.FontRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; +import speiger.src.coreengine.rendering.inputOld.events.MouseEvent; +import speiger.src.coreengine.rendering.inputOld.events.MouseEvent.MouseClickEvent; +import speiger.src.coreengine.rendering.inputOld.events.MouseEvent.MouseMoveEvent; +import speiger.src.coreengine.rendering.inputOld.events.MouseEvent.MouseScrollEvent; +import speiger.src.coreengine.rendering.inputOld.window.ScaledResolution; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.utils.profiler.IProfiler; public abstract class GuiBase diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/GuiComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/GuiComponent.java similarity index 91% rename from src/main/java/speiger/src/coreengine/rendering/gui/GuiComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/GuiComponent.java index f6a510e..77f2700 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/GuiComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/GuiComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui; +package speiger.src.coreengine.rendering.guiOld; import java.util.List; import java.util.Map; @@ -13,23 +13,23 @@ import speiger.src.collections.objects.sets.ObjectLinkedOpenHashSet; import speiger.src.coreengine.assets.AssetLocation; import speiger.src.coreengine.math.collision2d.Plane; import speiger.src.coreengine.math.vector.doubles.Vec2d; -import speiger.src.coreengine.rendering.gui.base.GuiScreenBase; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.base.IKeyComponent; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.animations.Animator; -import speiger.src.coreengine.rendering.gui.helper.box.GuiBox; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.renderer.FontRenderer; -import speiger.src.coreengine.rendering.gui.renderer.IComponentRenderer; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; -import speiger.src.coreengine.rendering.input.Keyboard; -import speiger.src.coreengine.rendering.input.bindings.utils.BindingType; -import speiger.src.coreengine.rendering.input.bindings.utils.ModType; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.guiOld.base.GuiScreenBase; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.base.IKeyComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.animations.Animator; +import speiger.src.coreengine.rendering.guiOld.helper.box.GuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.renderer.FontRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.IComponentRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; +import speiger.src.coreengine.rendering.inputOld.Keyboard; +import speiger.src.coreengine.rendering.inputOld.bindings.utils.BindingType; +import speiger.src.coreengine.rendering.inputOld.bindings.utils.ModType; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.rendering.utils.Cursor; import speiger.src.coreengine.rendering.utils.GLStateTracker; import speiger.src.coreengine.utils.collections.CollectionUtils; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/GuiManager.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/GuiManager.java similarity index 84% rename from src/main/java/speiger/src/coreengine/rendering/gui/GuiManager.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/GuiManager.java index ed45fc2..11a0bac 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/GuiManager.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/GuiManager.java @@ -1,20 +1,20 @@ -package speiger.src.coreengine.rendering.gui; +package speiger.src.coreengine.rendering.guiOld; import org.lwjgl.opengl.GL11; import speiger.src.coreengine.assets.AssetLocation; import speiger.src.coreengine.math.vector.ints.Vec2i; -import speiger.src.coreengine.rendering.gui.base.DebugOverlay; -import speiger.src.coreengine.rendering.gui.renderer.FontRenderer; -import speiger.src.coreengine.rendering.gui.renderer.GuiShader; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; -import speiger.src.coreengine.rendering.gui.renderer.provider.FontManager; -import speiger.src.coreengine.rendering.input.events.KeyEvent.CharTypeEvent; -import speiger.src.coreengine.rendering.input.events.KeyEvent.KeyPressEvent; -import speiger.src.coreengine.rendering.input.events.MouseEvent; -import speiger.src.coreengine.rendering.input.window.IWindowListener; -import speiger.src.coreengine.rendering.input.window.ScaledResolution; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.guiOld.base.DebugOverlay; +import speiger.src.coreengine.rendering.guiOld.renderer.FontRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.GuiShader; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.provider.FontManager; +import speiger.src.coreengine.rendering.inputOld.events.MouseEvent; +import speiger.src.coreengine.rendering.inputOld.events.KeyEvent.CharTypeEvent; +import speiger.src.coreengine.rendering.inputOld.events.KeyEvent.KeyPressEvent; +import speiger.src.coreengine.rendering.inputOld.window.IWindowListener; +import speiger.src.coreengine.rendering.inputOld.window.ScaledResolution; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.rendering.models.buffers.UniformBuffer; import speiger.src.coreengine.rendering.shaderOld.ShaderTracker; import speiger.src.coreengine.rendering.utils.Cursor; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/Tooltips.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/Tooltips.java similarity index 95% rename from src/main/java/speiger/src/coreengine/rendering/gui/Tooltips.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/Tooltips.java index 8808a15..5dc3273 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/Tooltips.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/Tooltips.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui; +package speiger.src.coreengine.rendering.guiOld; import java.util.Map; import java.util.UUID; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/UITextures.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/UITextures.java similarity index 92% rename from src/main/java/speiger/src/coreengine/rendering/gui/UITextures.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/UITextures.java index 73406b2..67d0516 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/UITextures.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/UITextures.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui; +package speiger.src.coreengine.rendering.guiOld; import speiger.src.coreengine.assets.AssetLocation; import speiger.src.coreengine.rendering.texturesOld.base.ITexture; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/base/DebugOverlay.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/DebugOverlay.java similarity index 78% rename from src/main/java/speiger/src/coreengine/rendering/gui/base/DebugOverlay.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/base/DebugOverlay.java index 1a410c7..57f4274 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/base/DebugOverlay.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/DebugOverlay.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.base; +package speiger.src.coreengine.rendering.guiOld.base; -import speiger.src.coreengine.rendering.gui.GuiBase; +import speiger.src.coreengine.rendering.guiOld.GuiBase; public abstract class DebugOverlay extends GuiScreenBase { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/base/GuiScreenBase.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/GuiScreenBase.java similarity index 93% rename from src/main/java/speiger/src/coreengine/rendering/gui/base/GuiScreenBase.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/base/GuiScreenBase.java index f285e87..14e893e 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/base/GuiScreenBase.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/GuiScreenBase.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.base; +package speiger.src.coreengine.rendering.guiOld.base; import java.util.Comparator; import java.util.Iterator; @@ -23,11 +23,11 @@ import speiger.src.collections.objects.sets.ObjectOrderedSet; import speiger.src.collections.objects.utils.maps.Object2ObjectMaps; import speiger.src.coreengine.math.MathUtils; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiBase; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.components.TooltipPanel; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.GuiBase; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.components.TooltipPanel; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; import speiger.src.coreengine.utils.collections.iterators.IterableWrapper; public class GuiScreenBase extends GuiBase diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/base/IButtonComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/IButtonComponent.java similarity index 88% rename from src/main/java/speiger/src/coreengine/rendering/gui/base/IButtonComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/base/IButtonComponent.java index aae28f0..3a1b7a4 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/base/IButtonComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/IButtonComponent.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.base; +package speiger.src.coreengine.rendering.guiOld.base; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public interface IButtonComponent extends IInputComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/base/IInputComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/IInputComponent.java similarity index 65% rename from src/main/java/speiger/src/coreengine/rendering/gui/base/IInputComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/base/IInputComponent.java index d25081f..9e9081b 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/base/IInputComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/IInputComponent.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.base; +package speiger.src.coreengine.rendering.guiOld.base; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public interface IInputComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/base/IKeyComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/IKeyComponent.java similarity index 83% rename from src/main/java/speiger/src/coreengine/rendering/gui/base/IKeyComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/base/IKeyComponent.java index f8041ba..838e13e 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/base/IKeyComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/base/IKeyComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.base; +package speiger.src.coreengine.rendering.guiOld.base; public interface IKeyComponent extends IInputComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/ButtonComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ButtonComponent.java similarity index 81% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/ButtonComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/ButtonComponent.java index 4136d34..972387f 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/ButtonComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ButtonComponent.java @@ -1,8 +1,8 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; public class ButtonComponent extends GuiComponent implements IButtonComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/CheckBoxComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/CheckBoxComponent.java similarity index 84% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/CheckBoxComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/CheckBoxComponent.java index d405fe5..cffc3f7 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/CheckBoxComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/CheckBoxComponent.java @@ -1,10 +1,10 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.components.misc.ICheckBox; -import speiger.src.coreengine.rendering.gui.helper.UIShapes; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.misc.ICheckBox; +import speiger.src.coreengine.rendering.guiOld.helper.UIShapes; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; public class CheckBoxComponent extends GuiComponent implements IButtonComponent, ICheckBox { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/EmptyComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/EmptyComponent.java similarity index 72% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/EmptyComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/EmptyComponent.java index defc200..5005a08 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/EmptyComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/EmptyComponent.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public class EmptyComponent extends GuiComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/GradientSliderComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/GradientSliderComponent.java similarity index 97% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/GradientSliderComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/GradientSliderComponent.java index 6791b83..5f26195 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/GradientSliderComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/GradientSliderComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.function.IntFunction; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/IconButtonComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/IconButtonComponent.java similarity index 83% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/IconButtonComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/IconButtonComponent.java index 52d8338..7f205ab 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/IconButtonComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/IconButtonComponent.java @@ -1,9 +1,9 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.components.icon.IIcon; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.icon.IIcon; public class IconButtonComponent extends GuiComponent implements IButtonComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/IconComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/IconComponent.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/IconComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/IconComponent.java index f11e398..af8cb65 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/IconComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/IconComponent.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; import speiger.src.coreengine.rendering.texturesOld.base.ITexture; public class IconComponent extends GuiComponent diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/LabelComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/LabelComponent.java similarity index 81% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/LabelComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/LabelComponent.java index 14dbca7..7dc7098 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/LabelComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/LabelComponent.java @@ -1,7 +1,7 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; public class LabelComponent extends GuiComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/ListComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ListComponent.java similarity index 93% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/ListComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/ListComponent.java index 10c554a..44ef3a9 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/ListComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ListComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.Collection; import java.util.Iterator; @@ -18,13 +18,13 @@ import speiger.src.collections.objects.utils.ObjectIterators; import speiger.src.coreengine.math.MathUtils; import speiger.src.coreengine.math.misc.ColorUtils; import speiger.src.coreengine.math.vector.ints.Vec2i; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.components.list.IListEntry; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; -import speiger.src.coreengine.rendering.input.Keyboard; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.list.IListEntry; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; +import speiger.src.coreengine.rendering.inputOld.Keyboard; public class ListComponent extends GuiComponent implements Iterable, IButtonComponent diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/PanelComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/PanelComponent.java similarity index 83% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/PanelComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/PanelComponent.java index 548171b..2097dac 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/PanelComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/PanelComponent.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public class PanelComponent extends GuiComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/PieComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/PieComponent.java similarity index 92% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/PieComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/PieComponent.java index 9b5ff2c..577de0d 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/PieComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/PieComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.List; import java.util.function.Supplier; @@ -7,8 +7,8 @@ import org.lwjgl.opengl.GL11; import speiger.src.coreengine.math.MathUtils; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; import speiger.src.coreengine.rendering.tesselationOld.Tesselator; import speiger.src.coreengine.rendering.tesselationOld.VertexType; import speiger.src.coreengine.rendering.utils.GLStateTracker; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/ProgressBarComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ProgressBarComponent.java similarity index 86% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/ProgressBarComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/ProgressBarComponent.java index 95b375c..d058c8b 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/ProgressBarComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ProgressBarComponent.java @@ -1,13 +1,13 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.function.IntFunction; import java.util.function.IntSupplier; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.box.ParentBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.box.ParentBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; public class ProgressBarComponent extends GuiComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/ScrollBarComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ScrollBarComponent.java similarity index 91% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/ScrollBarComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/ScrollBarComponent.java index 5f29fdb..4b8ad49 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/ScrollBarComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ScrollBarComponent.java @@ -1,9 +1,9 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import speiger.src.coreengine.math.MathUtils; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; public class ScrollBarComponent extends GuiComponent implements IButtonComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/ScrollPanelComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ScrollPanelComponent.java similarity index 86% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/ScrollPanelComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/ScrollPanelComponent.java index 31bbd50..4bd018b 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/ScrollPanelComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ScrollPanelComponent.java @@ -1,10 +1,10 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.ConditionalConstraint; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ConditionalConstraint; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; public class ScrollPanelComponent extends GuiComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/ScrollWindowComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ScrollWindowComponent.java similarity index 88% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/ScrollWindowComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/ScrollWindowComponent.java index 3903495..ccffc63 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/ScrollWindowComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/ScrollWindowComponent.java @@ -1,10 +1,10 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.ConditionalConstraint; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ConditionalConstraint; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; public class ScrollWindowComponent extends WindowComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/SelectionComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/SelectionComponent.java similarity index 88% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/SelectionComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/SelectionComponent.java index 5fb7cbf..9c6d25c 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/SelectionComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/SelectionComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.Collection; import java.util.function.Consumer; @@ -8,15 +8,15 @@ import org.lwjgl.opengl.GL11; import speiger.src.collections.ints.collections.IntCollection; import speiger.src.coreengine.math.value.IValue; import speiger.src.coreengine.math.value.LiniarValue; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.components.list.SelectionEntry; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain.Target; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.list.SelectionEntry; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain.Target; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; import speiger.src.coreengine.rendering.tesselationOld.Tesselator; import speiger.src.coreengine.rendering.tesselationOld.VertexType; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/SingleTabPanelComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/SingleTabPanelComponent.java similarity index 94% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/SingleTabPanelComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/SingleTabPanelComponent.java index 21d4fdc..0631fcd 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/SingleTabPanelComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/SingleTabPanelComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import speiger.src.collections.floats.functions.FloatSupplier; import speiger.src.collections.objects.functions.function.ToFloatFunction; @@ -6,12 +6,12 @@ import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.lists.ObjectList; import speiger.src.coreengine.math.misc.ColorUtils; import speiger.src.coreengine.math.misc.Facing; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain.Target; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.DynamicConstrain; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.DynamicConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain.Target; public class SingleTabPanelComponent extends PanelComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/SliderComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/SliderComponent.java similarity index 89% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/SliderComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/SliderComponent.java index 04ea236..da61297 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/SliderComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/SliderComponent.java @@ -1,14 +1,14 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.function.IntFunction; import speiger.src.coreengine.math.MathUtils; import speiger.src.coreengine.math.misc.Facing; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.helper.UIShapes; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.helper.UIShapes; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; public class SliderComponent extends GuiComponent implements IButtonComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/TabbedPanelComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TabbedPanelComponent.java similarity index 94% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/TabbedPanelComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/TabbedPanelComponent.java index 9a5a1b0..127cf6a 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/TabbedPanelComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TabbedPanelComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import speiger.src.collections.floats.functions.FloatSupplier; import speiger.src.collections.objects.functions.function.ToFloatFunction; @@ -6,12 +6,12 @@ import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.lists.ObjectList; import speiger.src.coreengine.math.misc.ColorUtils; import speiger.src.coreengine.math.misc.Facing; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain.Target; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.DynamicConstrain; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.DynamicConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain.Target; public class TabbedPanelComponent extends PanelComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/TextCheckBoxComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextCheckBoxComponent.java similarity index 76% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/TextCheckBoxComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextCheckBoxComponent.java index 741886a..29353a5 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/TextCheckBoxComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextCheckBoxComponent.java @@ -1,9 +1,9 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.TextConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.TextConstrain; public class TextCheckBoxComponent extends CheckBoxComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/TextComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextComponent.java similarity index 89% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/TextComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextComponent.java index f7d8e72..e8b24d9 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/TextComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextComponent.java @@ -1,12 +1,12 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.renderer.FontRenderer; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; -import speiger.src.coreengine.rendering.gui.renderer.lexer.TextMetadata; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.renderer.FontRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.TextMetadata; public class TextComponent extends GuiComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/TextFieldComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextFieldComponent.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/TextFieldComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextFieldComponent.java index 67ba324..2c34c90 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/TextFieldComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextFieldComponent.java @@ -1,23 +1,23 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.function.Predicate; import org.lwjgl.glfw.GLFW; import speiger.src.coreengine.math.MathUtils; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.base.IKeyComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.box.ParentBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain.Target; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; -import speiger.src.coreengine.rendering.gui.renderer.lexer.TextMetadata; -import speiger.src.coreengine.rendering.gui.renderer.lexer.Word; -import speiger.src.coreengine.rendering.gui.renderer.lexer.WordType; -import speiger.src.coreengine.rendering.input.Keyboard; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.base.IKeyComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.box.ParentBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain.Target; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.TextMetadata; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.Word; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.WordType; +import speiger.src.coreengine.rendering.inputOld.Keyboard; import speiger.src.coreengine.rendering.utils.Cursor; import speiger.src.coreengine.utils.functions.Functions; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/TextPanelComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextPanelComponent.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/TextPanelComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextPanelComponent.java index ec83030..f51b3a9 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/TextPanelComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TextPanelComponent.java @@ -1,22 +1,22 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.function.Predicate; import org.lwjgl.glfw.GLFW; import speiger.src.coreengine.math.vector.ints.Vec2i; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.base.IKeyComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; -import speiger.src.coreengine.rendering.gui.renderer.lexer.Line; -import speiger.src.coreengine.rendering.gui.renderer.lexer.TextMetadata; -import speiger.src.coreengine.rendering.gui.renderer.lexer.Word; -import speiger.src.coreengine.rendering.gui.renderer.lexer.WordType; -import speiger.src.coreengine.rendering.input.Keyboard; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.base.IKeyComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.Line; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.TextMetadata; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.Word; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.WordType; +import speiger.src.coreengine.rendering.inputOld.Keyboard; import speiger.src.coreengine.rendering.utils.Cursor; import speiger.src.coreengine.utils.functions.Functions; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/TooltipPanel.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TooltipPanel.java similarity index 82% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/TooltipPanel.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/TooltipPanel.java index 629253c..e30c57c 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/TooltipPanel.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TooltipPanel.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.List; import java.util.UUID; @@ -9,12 +9,12 @@ import speiger.src.collections.objects.maps.impl.hash.Object2ObjectLinkedOpenHas import speiger.src.collections.objects.maps.interfaces.Object2ObjectMap; import speiger.src.collections.objects.utils.maps.Object2ObjectMaps; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.box.ParentBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.MenuConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.box.ParentBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.MenuConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; public class TooltipPanel extends PanelComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/TreeComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TreeComponent.java similarity index 93% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/TreeComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/TreeComponent.java index ea67a66..96017b2 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/TreeComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/TreeComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.Collection; import java.util.List; @@ -13,15 +13,15 @@ import speiger.src.coreengine.math.MathUtils; import speiger.src.coreengine.math.misc.ColorUtils; import speiger.src.coreengine.math.misc.Facing; import speiger.src.coreengine.math.vector.ints.Vec2i; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.components.tree.ITreeEntry; -import speiger.src.coreengine.rendering.gui.helper.UIShapes; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; -import speiger.src.coreengine.rendering.input.Keyboard; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.tree.ITreeEntry; +import speiger.src.coreengine.rendering.guiOld.helper.UIShapes; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.inputOld.Keyboard; public class TreeComponent extends GuiComponent implements IButtonComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/WindowComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/WindowComponent.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/WindowComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/WindowComponent.java index 5e1199e..fe45491 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/WindowComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/WindowComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components; +package speiger.src.coreengine.rendering.guiOld.components; import java.util.function.Consumer; import java.util.function.ObjIntConsumer; @@ -10,15 +10,15 @@ import speiger.src.coreengine.math.value.IValue; import speiger.src.coreengine.math.value.LiniarValue; import speiger.src.coreengine.math.vector.floats.Vec2f; import speiger.src.coreengine.math.vector.ints.Vec2i; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.components.icon.CrossIcon; -import speiger.src.coreengine.rendering.gui.components.icon.LineIcon; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.icon.CrossIcon; +import speiger.src.coreengine.rendering.guiOld.components.icon.LineIcon; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; import speiger.src.coreengine.rendering.utils.Cursor; import speiger.src.coreengine.utils.functions.ConsumerConverter; import speiger.src.coreengine.utils.helpers.InternalThreadPools; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/ArrowIcon.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/ArrowIcon.java similarity index 79% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/icon/ArrowIcon.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/ArrowIcon.java index 5c33332..7854fb0 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/ArrowIcon.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/ArrowIcon.java @@ -1,8 +1,8 @@ -package speiger.src.coreengine.rendering.gui.components.icon; +package speiger.src.coreengine.rendering.guiOld.components.icon; import speiger.src.coreengine.math.misc.Facing; -import speiger.src.coreengine.rendering.gui.helper.UIShapes; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.helper.UIShapes; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; public class ArrowIcon implements IIcon { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/CrossIcon.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/CrossIcon.java similarity index 74% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/icon/CrossIcon.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/CrossIcon.java index 77d21b8..fd8c4e1 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/CrossIcon.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/CrossIcon.java @@ -1,7 +1,7 @@ -package speiger.src.coreengine.rendering.gui.components.icon; +package speiger.src.coreengine.rendering.guiOld.components.icon; -import speiger.src.coreengine.rendering.gui.helper.UIShapes; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.helper.UIShapes; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; public class CrossIcon implements IIcon { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/IIcon.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/IIcon.java similarity index 58% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/icon/IIcon.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/IIcon.java index 8b8f577..1d32b0d 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/IIcon.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/IIcon.java @@ -1,7 +1,7 @@ -package speiger.src.coreengine.rendering.gui.components.icon; +package speiger.src.coreengine.rendering.guiOld.components.icon; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; public interface IIcon { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/LineIcon.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/LineIcon.java similarity index 79% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/icon/LineIcon.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/LineIcon.java index d27053d..01333a6 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/LineIcon.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/LineIcon.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.components.icon; +package speiger.src.coreengine.rendering.guiOld.components.icon; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; public class LineIcon implements IIcon { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/TexturedIcon.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/TexturedIcon.java similarity index 89% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/icon/TexturedIcon.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/TexturedIcon.java index 2c9154e..01f6e91 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/icon/TexturedIcon.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/icon/TexturedIcon.java @@ -1,7 +1,7 @@ -package speiger.src.coreengine.rendering.gui.components.icon; +package speiger.src.coreengine.rendering.guiOld.components.icon; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; import speiger.src.coreengine.rendering.texturesOld.base.ITexture; public class TexturedIcon implements IIcon diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/layouts/FlowLayout.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/layouts/FlowLayout.java similarity index 87% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/layouts/FlowLayout.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/layouts/FlowLayout.java index 56199ad..0f7443b 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/layouts/FlowLayout.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/layouts/FlowLayout.java @@ -1,11 +1,11 @@ -package speiger.src.coreengine.rendering.gui.components.layouts; +package speiger.src.coreengine.rendering.guiOld.components.layouts; import java.util.List; import java.util.function.Consumer; import speiger.src.coreengine.math.vector.floats.Vec2f; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; public class FlowLayout implements Consumer { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/layouts/VerticalLayout.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/layouts/VerticalLayout.java similarity index 86% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/layouts/VerticalLayout.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/layouts/VerticalLayout.java index 545e1e9..93d4da7 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/layouts/VerticalLayout.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/layouts/VerticalLayout.java @@ -1,11 +1,11 @@ -package speiger.src.coreengine.rendering.gui.components.layouts; +package speiger.src.coreengine.rendering.guiOld.components.layouts; import java.util.List; import java.util.function.Consumer; import speiger.src.collections.objects.lists.ObjectArrayList; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; public class VerticalLayout implements Consumer { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/BaseClickableListEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/BaseClickableListEntry.java similarity index 92% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/list/BaseClickableListEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/BaseClickableListEntry.java index fa438cf..08670e3 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/BaseClickableListEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/BaseClickableListEntry.java @@ -1,10 +1,10 @@ -package speiger.src.coreengine.rendering.gui.components.list; +package speiger.src.coreengine.rendering.guiOld.components.list; import java.util.Map; import java.util.UUID; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; public class BaseClickableListEntry extends BaseListEntry implements IButtonComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/BaseListEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/BaseListEntry.java similarity index 91% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/list/BaseListEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/BaseListEntry.java index 56312e4..3ce465e 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/BaseListEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/BaseListEntry.java @@ -1,12 +1,12 @@ -package speiger.src.coreengine.rendering.gui.components.list; +package speiger.src.coreengine.rendering.guiOld.components.list; import java.util.List; import java.util.Map; import java.util.UUID; import speiger.src.collections.objects.lists.ObjectArrayList; -import speiger.src.coreengine.rendering.gui.GuiBase; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiBase; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public abstract class BaseListEntry implements IListEntry { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/ExampleEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/ExampleEntry.java similarity index 80% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/list/ExampleEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/ExampleEntry.java index d2140a8..cd50576 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/ExampleEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/ExampleEntry.java @@ -1,15 +1,15 @@ -package speiger.src.coreengine.rendering.gui.components.list; +package speiger.src.coreengine.rendering.guiOld.components.list; import java.util.Map; import java.util.UUID; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiBase; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.components.CheckBoxComponent; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; +import speiger.src.coreengine.rendering.guiOld.GuiBase; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.CheckBoxComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; public class ExampleEntry implements IListEntry, IButtonComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/FileEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/FileEntry.java similarity index 76% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/list/FileEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/FileEntry.java index fc1b563..b6b9b02 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/FileEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/FileEntry.java @@ -1,5 +1,5 @@ -package speiger.src.coreengine.rendering.gui.components.list; +package speiger.src.coreengine.rendering.guiOld.components.list; import java.io.File; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/IListEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/IListEntry.java similarity index 76% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/list/IListEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/IListEntry.java index 49f452d..5f19642 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/IListEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/IListEntry.java @@ -1,10 +1,10 @@ -package speiger.src.coreengine.rendering.gui.components.list; +package speiger.src.coreengine.rendering.guiOld.components.list; import java.util.Map; import java.util.UUID; -import speiger.src.coreengine.rendering.gui.GuiBase; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiBase; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public interface IListEntry { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/SelectionEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/SelectionEntry.java similarity index 80% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/list/SelectionEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/SelectionEntry.java index 2c168e7..cf6395d 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/SelectionEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/SelectionEntry.java @@ -1,12 +1,12 @@ -package speiger.src.coreengine.rendering.gui.components.list; +package speiger.src.coreengine.rendering.guiOld.components.list; import java.util.Map; import java.util.UUID; -import speiger.src.coreengine.rendering.gui.GuiBase; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; +import speiger.src.coreengine.rendering.guiOld.GuiBase; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; public class SelectionEntry implements IListEntry { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/TextListEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/TextListEntry.java similarity index 67% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/list/TextListEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/TextListEntry.java index 28dd1ac..6eef725 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/list/TextListEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/list/TextListEntry.java @@ -1,7 +1,7 @@ -package speiger.src.coreengine.rendering.gui.components.list; +package speiger.src.coreengine.rendering.guiOld.components.list; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; public class TextListEntry extends BaseListEntry { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuBarComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuBarComponent.java similarity index 79% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuBarComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuBarComponent.java index 45702e3..f74282f 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuBarComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuBarComponent.java @@ -1,13 +1,13 @@ -package speiger.src.coreengine.rendering.gui.components.menu; +package speiger.src.coreengine.rendering.guiOld.components.menu; import java.util.List; import speiger.src.collections.objects.lists.ObjectArrayList; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.MenuConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.MenuConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; public class MenuBarComponent extends GuiComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuCheckBoxComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuCheckBoxComponent.java similarity index 83% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuCheckBoxComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuCheckBoxComponent.java index e52ac69..448fa75 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuCheckBoxComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuCheckBoxComponent.java @@ -1,13 +1,13 @@ -package speiger.src.coreengine.rendering.gui.components.menu; +package speiger.src.coreengine.rendering.guiOld.components.menu; -import speiger.src.coreengine.rendering.gui.components.misc.ICheckBox; -import speiger.src.coreengine.rendering.gui.helper.UIShapes; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.DynamicConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.guiOld.components.misc.ICheckBox; +import speiger.src.coreengine.rendering.guiOld.helper.UIShapes; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.DynamicConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; public class MenuCheckBoxComponent extends MenuItemComponent implements ICheckBox { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuComponent.java similarity index 89% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuComponent.java index bae1731..a6bfb94 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuComponent.java @@ -1,15 +1,15 @@ -package speiger.src.coreengine.rendering.gui.components.menu; +package speiger.src.coreengine.rendering.guiOld.components.menu; import java.util.List; import java.util.function.Consumer; import speiger.src.collections.objects.lists.ObjectArrayList; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.DynamicConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.MenuConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.DynamicConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.MenuConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; public class MenuComponent extends MenuItemComponent implements Consumer { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuItemComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuItemComponent.java similarity index 80% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuItemComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuItemComponent.java index 663cdd0..1789f03 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuItemComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuItemComponent.java @@ -1,13 +1,13 @@ -package speiger.src.coreengine.rendering.gui.components.menu; +package speiger.src.coreengine.rendering.guiOld.components.menu; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.TextConstrain; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.TextConstrain; public class MenuItemComponent extends GuiComponent implements IButtonComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuTextComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuTextComponent.java similarity index 93% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuTextComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuTextComponent.java index 7acdb07..4f0d1dd 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/menu/MenuTextComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/menu/MenuTextComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components.menu; +package speiger.src.coreengine.rendering.guiOld.components.menu; public class MenuTextComponent extends MenuItemComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/misc/CheckBoxGroup.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/misc/CheckBoxGroup.java similarity index 89% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/misc/CheckBoxGroup.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/misc/CheckBoxGroup.java index acc9668..88649ae 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/misc/CheckBoxGroup.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/misc/CheckBoxGroup.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components.misc; +package speiger.src.coreengine.rendering.guiOld.components.misc; import java.util.List; import java.util.function.Consumer; @@ -6,7 +6,7 @@ import java.util.function.Consumer; import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.lists.ObjectList; import speiger.src.collections.objects.utils.ObjectLists; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public class CheckBoxGroup> implements Consumer { diff --git a/src/main/java/speiger/src/coreengine/rendering/guiOld/components/misc/ICheckBox.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/misc/ICheckBox.java new file mode 100644 index 0000000..d16cce0 --- /dev/null +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/misc/ICheckBox.java @@ -0,0 +1,10 @@ +package speiger.src.coreengine.rendering.guiOld.components.misc; + +import speiger.src.coreengine.rendering.guiOld.GuiComponent; + +public interface ICheckBox +{ + public boolean isChecked(); + + public T setChecked(boolean value); +} diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/special/ConsoleComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/special/ConsoleComponent.java similarity index 80% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/special/ConsoleComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/special/ConsoleComponent.java index 0f80268..a786d7a 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/special/ConsoleComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/special/ConsoleComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components.special; +package speiger.src.coreengine.rendering.guiOld.components.special; import java.util.List; import java.util.function.Consumer; @@ -7,17 +7,17 @@ import org.lwjgl.glfw.GLFW; import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IKeyComponent; -import speiger.src.coreengine.rendering.gui.components.ListComponent; -import speiger.src.coreengine.rendering.gui.components.ScrollBarComponent; -import speiger.src.coreengine.rendering.gui.components.TextFieldComponent; -import speiger.src.coreengine.rendering.gui.components.list.TextListEntry; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.RelativeConstrain; -import speiger.src.coreengine.rendering.gui.renderer.IFontRenderer; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IKeyComponent; +import speiger.src.coreengine.rendering.guiOld.components.ListComponent; +import speiger.src.coreengine.rendering.guiOld.components.ScrollBarComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextFieldComponent; +import speiger.src.coreengine.rendering.guiOld.components.list.TextListEntry; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.RelativeConstrain; +import speiger.src.coreengine.rendering.guiOld.renderer.IFontRenderer; public class ConsoleComponent extends GuiComponent implements IKeyComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/BaseClickableTreeEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/BaseClickableTreeEntry.java similarity index 92% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/tree/BaseClickableTreeEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/BaseClickableTreeEntry.java index ffdc020..1a3ed11 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/BaseClickableTreeEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/BaseClickableTreeEntry.java @@ -1,10 +1,10 @@ -package speiger.src.coreengine.rendering.gui.components.tree; +package speiger.src.coreengine.rendering.guiOld.components.tree; import java.util.Map; import java.util.UUID; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.base.IButtonComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.base.IButtonComponent; public class BaseClickableTreeEntry extends BaseTreeEntry implements IButtonComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/BaseTreeEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/BaseTreeEntry.java similarity index 89% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/tree/BaseTreeEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/BaseTreeEntry.java index df155f7..9576f9f 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/BaseTreeEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/BaseTreeEntry.java @@ -1,13 +1,13 @@ -package speiger.src.coreengine.rendering.gui.components.tree; +package speiger.src.coreengine.rendering.guiOld.components.tree; import java.util.Collections; import java.util.Iterator; import java.util.List; import speiger.src.collections.objects.lists.ObjectArrayList; -import speiger.src.coreengine.rendering.gui.GuiBase; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.components.list.BaseListEntry; +import speiger.src.coreengine.rendering.guiOld.GuiBase; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.components.list.BaseListEntry; public abstract class BaseTreeEntry extends BaseListEntry implements ITreeEntry { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/ITreeEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/ITreeEntry.java similarity index 77% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/tree/ITreeEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/ITreeEntry.java index d2cc79f..975e169 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/ITreeEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/ITreeEntry.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.components.tree; +package speiger.src.coreengine.rendering.guiOld.components.tree; -import speiger.src.coreengine.rendering.gui.components.list.IListEntry; +import speiger.src.coreengine.rendering.guiOld.components.list.IListEntry; public interface ITreeEntry extends IListEntry, Iterable { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/ProfilerTreeEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/ProfilerTreeEntry.java similarity index 82% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/tree/ProfilerTreeEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/ProfilerTreeEntry.java index 480cfa8..f231ad0 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/ProfilerTreeEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/ProfilerTreeEntry.java @@ -1,15 +1,15 @@ -package speiger.src.coreengine.rendering.gui.components.tree; +package speiger.src.coreengine.rendering.guiOld.components.tree; import java.util.Map; import java.util.UUID; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.GuiBase; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.components.window.debug.PieProfilerWindow; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.input.Keyboard; +import speiger.src.coreengine.rendering.guiOld.GuiBase; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.components.window.debug.PieProfilerWindow; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.inputOld.Keyboard; import speiger.src.coreengine.utils.profiler.IProfiler.IProfilerEntry; public class ProfilerTreeEntry extends BaseTreeEntry diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/TextTreeEntry.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/TextTreeEntry.java similarity index 67% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/tree/TextTreeEntry.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/TextTreeEntry.java index d8c8f15..7e7cc6a 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/tree/TextTreeEntry.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/tree/TextTreeEntry.java @@ -1,8 +1,8 @@ -package speiger.src.coreengine.rendering.gui.components.tree; +package speiger.src.coreengine.rendering.guiOld.components.tree; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; public class TextTreeEntry extends BaseTreeEntry { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/color/ColorPickerWindowComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/color/ColorPickerWindowComponent.java similarity index 82% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/window/color/ColorPickerWindowComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/color/ColorPickerWindowComponent.java index 3281da5..5011d38 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/color/ColorPickerWindowComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/color/ColorPickerWindowComponent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components.window.color; +package speiger.src.coreengine.rendering.guiOld.components.window.color; import java.awt.Color; import java.util.function.IntConsumer; @@ -7,19 +7,19 @@ import speiger.src.coreengine.math.MathUtils; import speiger.src.coreengine.math.misc.ColorUtils; import speiger.src.coreengine.math.misc.Facing; import speiger.src.coreengine.math.vector.floats.Vec2f; -import speiger.src.coreengine.rendering.gui.UITextures; -import speiger.src.coreengine.rendering.gui.components.ButtonComponent; -import speiger.src.coreengine.rendering.gui.components.GradientSliderComponent; -import speiger.src.coreengine.rendering.gui.components.SliderComponent; -import speiger.src.coreengine.rendering.gui.components.TextFieldComponent; -import speiger.src.coreengine.rendering.gui.components.WindowComponent; -import speiger.src.coreengine.rendering.gui.components.icon.IIcon; -import speiger.src.coreengine.rendering.gui.components.icon.TexturedIcon; -import speiger.src.coreengine.rendering.gui.helper.box.GuiBox; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.RelativeConstrain; +import speiger.src.coreengine.rendering.guiOld.UITextures; +import speiger.src.coreengine.rendering.guiOld.components.ButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.GradientSliderComponent; +import speiger.src.coreengine.rendering.guiOld.components.SliderComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextFieldComponent; +import speiger.src.coreengine.rendering.guiOld.components.WindowComponent; +import speiger.src.coreengine.rendering.guiOld.components.icon.IIcon; +import speiger.src.coreengine.rendering.guiOld.components.icon.TexturedIcon; +import speiger.src.coreengine.rendering.guiOld.helper.box.GuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.RelativeConstrain; import speiger.src.coreengine.utils.functions.Functions; import speiger.src.coreengine.utils.helpers.InternalThreadPools; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/color/ColorPool.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/color/ColorPool.java similarity index 95% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/window/color/ColorPool.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/color/ColorPool.java index 44f4b0d..8333c44 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/color/ColorPool.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/color/ColorPool.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components.window.color; +package speiger.src.coreengine.rendering.guiOld.components.window.color; import java.util.BitSet; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/debug/PieProfilerWindow.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/debug/PieProfilerWindow.java similarity index 86% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/window/debug/PieProfilerWindow.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/debug/PieProfilerWindow.java index d0a7cee..e9f9630 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/debug/PieProfilerWindow.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/debug/PieProfilerWindow.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components.window.debug; +package speiger.src.coreengine.rendering.guiOld.components.window.debug; import java.text.DecimalFormat; import java.util.List; @@ -13,20 +13,20 @@ import speiger.src.coreengine.math.MathUtils; import speiger.src.coreengine.math.misc.ColorUtils; import speiger.src.coreengine.math.misc.Facing; import speiger.src.coreengine.math.vector.floats.Vec2f; -import speiger.src.coreengine.rendering.gui.base.IKeyComponent; -import speiger.src.coreengine.rendering.gui.components.PieComponent; -import speiger.src.coreengine.rendering.gui.components.PieComponent.IPieIndex; -import speiger.src.coreengine.rendering.gui.components.PieComponent.PieIndex; -import speiger.src.coreengine.rendering.gui.components.SingleTabPanelComponent; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.components.WindowComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain.Target; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.DynamicConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; -import speiger.src.coreengine.rendering.input.Keyboard; +import speiger.src.coreengine.rendering.guiOld.base.IKeyComponent; +import speiger.src.coreengine.rendering.guiOld.components.PieComponent; +import speiger.src.coreengine.rendering.guiOld.components.SingleTabPanelComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.components.WindowComponent; +import speiger.src.coreengine.rendering.guiOld.components.PieComponent.IPieIndex; +import speiger.src.coreengine.rendering.guiOld.components.PieComponent.PieIndex; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.DynamicConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain.Target; +import speiger.src.coreengine.rendering.inputOld.Keyboard; import speiger.src.coreengine.utils.profiler.IProfiler; import speiger.src.coreengine.utils.profiler.IProfiler.IProfilerEntry; import speiger.src.coreengine.utils.profiler.IProfiler.ProfilerData; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/debug/TreeProfilerWindow.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/debug/TreeProfilerWindow.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/window/debug/TreeProfilerWindow.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/debug/TreeProfilerWindow.java index dd6068c..951da14 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/debug/TreeProfilerWindow.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/debug/TreeProfilerWindow.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.components.window.debug; +package speiger.src.coreengine.rendering.guiOld.components.window.debug; import java.util.List; import java.util.function.Consumer; @@ -10,12 +10,12 @@ import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.coreengine.math.misc.ColorUtils; import speiger.src.coreengine.math.misc.Facing; import speiger.src.coreengine.math.vector.floats.Vec2f; -import speiger.src.coreengine.rendering.gui.components.SingleTabPanelComponent; -import speiger.src.coreengine.rendering.gui.components.TreeComponent; -import speiger.src.coreengine.rendering.gui.components.WindowComponent; -import speiger.src.coreengine.rendering.gui.components.tree.ProfilerTreeEntry; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain.Target; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.components.SingleTabPanelComponent; +import speiger.src.coreengine.rendering.guiOld.components.TreeComponent; +import speiger.src.coreengine.rendering.guiOld.components.WindowComponent; +import speiger.src.coreengine.rendering.guiOld.components.tree.ProfilerTreeEntry; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain.Target; import speiger.src.coreengine.utils.profiler.IProfiler; import speiger.src.coreengine.utils.profiler.IProfiler.IProfilerEntry; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/misc/ChoiceComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/misc/ChoiceComponent.java similarity index 73% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/window/misc/ChoiceComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/misc/ChoiceComponent.java index 014cefd..fe12539 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/misc/ChoiceComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/misc/ChoiceComponent.java @@ -1,15 +1,15 @@ -package speiger.src.coreengine.rendering.gui.components.window.misc; +package speiger.src.coreengine.rendering.guiOld.components.window.misc; import speiger.src.collections.booleans.functions.BooleanConsumer; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.components.ButtonComponent; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.components.WindowComponent; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.RelativeConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.TextConstrain; +import speiger.src.coreengine.rendering.guiOld.components.ButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.components.WindowComponent; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.RelativeConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.TextConstrain; public class ChoiceComponent extends WindowComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/misc/MessageComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/misc/MessageComponent.java similarity index 75% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/window/misc/MessageComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/misc/MessageComponent.java index b8f2c7c..e174de4 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/misc/MessageComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/misc/MessageComponent.java @@ -1,13 +1,13 @@ -package speiger.src.coreengine.rendering.gui.components.window.misc; +package speiger.src.coreengine.rendering.guiOld.components.window.misc; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.components.ButtonComponent; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.components.WindowComponent; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrains; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.TextConstrain; +import speiger.src.coreengine.rendering.guiOld.components.ButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.components.WindowComponent; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrains; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.TextConstrain; public class MessageComponent extends WindowComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/misc/TextInputComponent.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/misc/TextInputComponent.java similarity index 73% rename from src/main/java/speiger/src/coreengine/rendering/gui/components/window/misc/TextInputComponent.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/misc/TextInputComponent.java index 1ce8254..04fa523 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/components/window/misc/TextInputComponent.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/components/window/misc/TextInputComponent.java @@ -1,14 +1,14 @@ -package speiger.src.coreengine.rendering.gui.components.window.misc; +package speiger.src.coreengine.rendering.guiOld.components.window.misc; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.components.ButtonComponent; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.components.TextFieldComponent; -import speiger.src.coreengine.rendering.gui.components.WindowComponent; -import speiger.src.coreengine.rendering.gui.helper.constrains.ParentConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.PixelConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.RelativeConstrain; -import speiger.src.coreengine.rendering.gui.helper.constrains.TextConstrain; +import speiger.src.coreengine.rendering.guiOld.components.ButtonComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextFieldComponent; +import speiger.src.coreengine.rendering.guiOld.components.WindowComponent; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.ParentConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.PixelConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.RelativeConstrain; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.TextConstrain; public class TextInputComponent extends WindowComponent { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/Align.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/Align.java similarity index 84% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/Align.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/Align.java index aa6865b..f537797 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/Align.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/Align.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper; +package speiger.src.coreengine.rendering.guiOld.helper; public enum Align { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/FontBuilder.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/FontBuilder.java similarity index 98% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/FontBuilder.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/FontBuilder.java index fc463e8..0081e07 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/FontBuilder.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/FontBuilder.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper; +package speiger.src.coreengine.rendering.guiOld.helper; import java.awt.Color; import java.awt.Font; @@ -35,7 +35,7 @@ import speiger.src.collections.objects.maps.impl.hash.Object2ObjectLinkedOpenHas import speiger.src.collections.objects.misc.pairs.ObjectObjectPair; import speiger.src.coreengine.assets.AssetLocation; import speiger.src.coreengine.math.vector.ints.Vec2i; -import speiger.src.coreengine.rendering.gui.renderer.IFontRenderer.CharInstance; +import speiger.src.coreengine.rendering.guiOld.renderer.IFontRenderer.CharInstance; import speiger.src.coreengine.rendering.textures.custom.AtlasStitcher; import speiger.src.coreengine.rendering.textures.custom.AtlasStitcher.Entry; import speiger.src.coreengine.rendering.texturesOld.custom.TextureAtlas; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/TextFilter.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/TextFilter.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/TextFilter.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/TextFilter.java index 7f3eceb..c07ee45 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/TextFilter.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/TextFilter.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper; +package speiger.src.coreengine.rendering.guiOld.helper; import java.util.function.Predicate; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/UIShapes.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/UIShapes.java similarity index 97% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/UIShapes.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/UIShapes.java index bc47593..d51d949 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/UIShapes.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/UIShapes.java @@ -1,10 +1,10 @@ -package speiger.src.coreengine.rendering.gui.helper; +package speiger.src.coreengine.rendering.guiOld.helper; import org.lwjgl.opengl.GL11; import speiger.src.coreengine.math.misc.Facing; -import speiger.src.coreengine.rendering.gui.renderer.UIRenderer; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.guiOld.renderer.UIRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; import speiger.src.coreengine.rendering.tesselationOld.Tesselator; import speiger.src.coreengine.rendering.tesselationOld.VertexType; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/Animation.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/Animation.java similarity index 87% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/Animation.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/Animation.java index ad0d2e5..0037506 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/Animation.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/Animation.java @@ -1,11 +1,11 @@ -package speiger.src.coreengine.rendering.gui.helper.animations; +package speiger.src.coreengine.rendering.guiOld.helper.animations; import speiger.src.collections.objects.maps.impl.hash.Object2ObjectLinkedOpenHashMap; import speiger.src.collections.objects.maps.interfaces.Object2ObjectMap; import speiger.src.collections.objects.utils.maps.Object2ObjectMaps; import speiger.src.coreengine.math.value.IValue; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.animations.transitions.ITransition; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.animations.transitions.ITransition; public class Animation { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/AnimationInstance.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/AnimationInstance.java similarity index 85% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/AnimationInstance.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/AnimationInstance.java index e0ff1c9..c658510 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/AnimationInstance.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/AnimationInstance.java @@ -1,10 +1,10 @@ -package speiger.src.coreengine.rendering.gui.helper.animations; +package speiger.src.coreengine.rendering.guiOld.helper.animations; import speiger.src.collections.objects.maps.interfaces.Object2ObjectMap; import speiger.src.collections.objects.utils.maps.Object2ObjectMaps; import speiger.src.coreengine.math.value.ConstantValue; import speiger.src.coreengine.math.value.IValue; -import speiger.src.coreengine.rendering.gui.helper.animations.Animation.AnimationListener; +import speiger.src.coreengine.rendering.guiOld.helper.animations.Animation.AnimationListener; public class AnimationInstance { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/AnimationTarget.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/AnimationTarget.java similarity index 85% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/AnimationTarget.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/AnimationTarget.java index 554d627..3311491 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/AnimationTarget.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/AnimationTarget.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.helper.animations; +package speiger.src.coreengine.rendering.guiOld.helper.animations; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public enum AnimationTarget { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/Animator.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/Animator.java similarity index 94% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/Animator.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/Animator.java index a2b3808..b9ebc4e 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/Animator.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/Animator.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.animations; +package speiger.src.coreengine.rendering.guiOld.helper.animations; import java.util.Iterator; import java.util.List; @@ -8,8 +8,8 @@ import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.maps.impl.hash.Object2ObjectLinkedOpenHashMap; import speiger.src.collections.objects.maps.interfaces.Object2ObjectMap; import speiger.src.collections.objects.utils.maps.Object2ObjectMaps; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.animations.Animation.AnimationListener; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.animations.Animation.AnimationListener; public class Animator { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/transitions/ITransition.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/transitions/ITransition.java similarity index 76% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/transitions/ITransition.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/transitions/ITransition.java index e8edc48..d2d0f3a 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/transitions/ITransition.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/transitions/ITransition.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.animations.transitions; +package speiger.src.coreengine.rendering.guiOld.helper.animations.transitions; import speiger.src.coreengine.math.value.IValue; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/transitions/LiniarTransition.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/transitions/LiniarTransition.java similarity index 92% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/transitions/LiniarTransition.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/transitions/LiniarTransition.java index 214bab6..e816836 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/animations/transitions/LiniarTransition.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/animations/transitions/LiniarTransition.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.animations.transitions; +package speiger.src.coreengine.rendering.guiOld.helper.animations.transitions; import speiger.src.coreengine.math.value.IValue; import speiger.src.coreengine.math.value.LiniarValue; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/box/GuiBox.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/GuiBox.java similarity index 98% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/box/GuiBox.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/GuiBox.java index ad3c50b..69101ae 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/box/GuiBox.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/GuiBox.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.box; +package speiger.src.coreengine.rendering.guiOld.helper.box; import java.util.List; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/box/IGuiBox.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/IGuiBox.java similarity index 98% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/box/IGuiBox.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/IGuiBox.java index 92a0a69..34fe86a 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/box/IGuiBox.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/IGuiBox.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.box; +package speiger.src.coreengine.rendering.guiOld.helper.box; import speiger.src.coreengine.math.misc.Facing; import speiger.src.coreengine.math.misc.FacingList; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/box/IScreenBox.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/IScreenBox.java similarity index 84% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/box/IScreenBox.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/IScreenBox.java index 143c460..a760070 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/box/IScreenBox.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/IScreenBox.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.box; +package speiger.src.coreengine.rendering.guiOld.helper.box; public interface IScreenBox { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/box/ParentBox.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/ParentBox.java similarity index 98% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/box/ParentBox.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/ParentBox.java index c6eca7d..461664b 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/box/ParentBox.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/box/ParentBox.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.box; +package speiger.src.coreengine.rendering.guiOld.helper.box; import java.util.List; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/CenterConstrain.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/CenterConstrain.java similarity index 86% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/CenterConstrain.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/CenterConstrain.java index 980b03a..5606b00 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/CenterConstrain.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/CenterConstrain.java @@ -1,7 +1,7 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; import speiger.src.collections.floats.functions.FloatSupplier; -import speiger.src.coreengine.rendering.gui.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.Align; public class CenterConstrain extends Constrain { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/ConditionalConstraint.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/ConditionalConstraint.java similarity index 87% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/ConditionalConstraint.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/ConditionalConstraint.java index 28f240e..b4f65ed 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/ConditionalConstraint.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/ConditionalConstraint.java @@ -1,8 +1,8 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; import java.util.function.BooleanSupplier; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public class ConditionalConstraint extends Constrain { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/Constrain.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/Constrain.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/Constrain.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/Constrain.java index 0b7b439..b0de154 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/Constrain.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/Constrain.java @@ -1,11 +1,11 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; import java.util.Comparator; import speiger.src.collections.objects.utils.ObjectArrays; -import speiger.src.coreengine.rendering.gui.GuiBase; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.GuiBase; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; public abstract class Constrain { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/Constrains.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/Constrains.java similarity index 95% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/Constrains.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/Constrains.java index a216955..e9b18eb 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/Constrains.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/Constrains.java @@ -1,11 +1,11 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; import java.util.function.BooleanSupplier; import speiger.src.collections.floats.functions.FloatSupplier; import speiger.src.coreengine.math.misc.Facing; -import speiger.src.coreengine.rendering.gui.GuiComponent; -import speiger.src.coreengine.rendering.gui.helper.constrains.Constrain.Target; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.helper.constrains.Constrain.Target; public class Constrains { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/DynamicConstrain.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/DynamicConstrain.java similarity index 87% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/DynamicConstrain.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/DynamicConstrain.java index 2be9ffa..fed3926 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/DynamicConstrain.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/DynamicConstrain.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; import speiger.src.collections.floats.functions.FloatSupplier; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/MenuConstrain.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/MenuConstrain.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/MenuConstrain.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/MenuConstrain.java index 3934209..d0b1b9e 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/MenuConstrain.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/MenuConstrain.java @@ -1,9 +1,9 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; import java.util.List; import speiger.src.collections.floats.functions.FloatSupplier; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public class MenuConstrain extends Constrain { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/ParentConstrain.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/ParentConstrain.java similarity index 88% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/ParentConstrain.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/ParentConstrain.java index 30a48b9..7925c7c 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/ParentConstrain.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/ParentConstrain.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; public class ParentConstrain extends Constrain { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/PixelConstrain.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/PixelConstrain.java similarity index 85% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/PixelConstrain.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/PixelConstrain.java index 28d9b8b..dc8ef60 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/PixelConstrain.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/PixelConstrain.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; public class PixelConstrain extends Constrain { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/RelativeConstrain.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/RelativeConstrain.java similarity index 83% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/RelativeConstrain.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/RelativeConstrain.java index abe5dc7..becdbe5 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/RelativeConstrain.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/RelativeConstrain.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; public class RelativeConstrain extends Constrain { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/TextConstrain.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/TextConstrain.java similarity index 86% rename from src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/TextConstrain.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/TextConstrain.java index 3c63a3b..307ee89 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/helper/constrains/TextConstrain.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/helper/constrains/TextConstrain.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.helper.constrains; +package speiger.src.coreengine.rendering.guiOld.helper.constrains; -import speiger.src.coreengine.rendering.gui.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; public class TextConstrain extends Constrain { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/FontRenderer.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/FontRenderer.java similarity index 94% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/FontRenderer.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/FontRenderer.java index 19f8454..fa0d574 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/FontRenderer.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/FontRenderer.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.renderer; +package speiger.src.coreengine.rendering.guiOld.renderer; import java.util.List; import java.util.Locale; @@ -9,16 +9,16 @@ import speiger.src.collections.floats.lists.FloatArrayList; import speiger.src.collections.floats.lists.FloatList; import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.utils.ObjectLists; -import speiger.src.coreengine.rendering.gui.components.TextComponent; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.renderer.buffer.DelayedRenderBuffer; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; -import speiger.src.coreengine.rendering.gui.renderer.buffer.TranslatedVertexBuilder; -import speiger.src.coreengine.rendering.gui.renderer.lexer.Line; -import speiger.src.coreengine.rendering.gui.renderer.lexer.TextContext; -import speiger.src.coreengine.rendering.gui.renderer.lexer.TextContext.WordContext; -import speiger.src.coreengine.rendering.gui.renderer.lexer.TextLexer; -import speiger.src.coreengine.rendering.gui.renderer.provider.IFontProvider; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.DelayedRenderBuffer; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.TranslatedVertexBuilder; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.Line; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.TextContext; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.TextLexer; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.TextContext.WordContext; +import speiger.src.coreengine.rendering.guiOld.renderer.provider.IFontProvider; import speiger.src.coreengine.rendering.models.DrawCall; import speiger.src.coreengine.rendering.tesselationOld.IVertexBuilder; import speiger.src.coreengine.rendering.tesselationOld.Tesselator; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/GuiModel.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/GuiModel.java similarity index 95% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/GuiModel.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/GuiModel.java index 7388545..e3bd0ca 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/GuiModel.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/GuiModel.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.renderer; +package speiger.src.coreengine.rendering.guiOld.renderer; import java.nio.FloatBuffer; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/GuiShader.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/GuiShader.java similarity index 96% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/GuiShader.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/GuiShader.java index d929b13..80a576d 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/GuiShader.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/GuiShader.java @@ -1,5 +1,5 @@ -package speiger.src.coreengine.rendering.gui.renderer; +package speiger.src.coreengine.rendering.guiOld.renderer; import speiger.src.coreengine.assets.AssetLocation; import speiger.src.coreengine.math.vector.matrix.Matrix4f; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/IComponentRenderer.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/IComponentRenderer.java similarity index 60% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/IComponentRenderer.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/IComponentRenderer.java index 3b7cdf4..17f9140 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/IComponentRenderer.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/IComponentRenderer.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.renderer; +package speiger.src.coreengine.rendering.guiOld.renderer; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; public interface IComponentRenderer { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/IFontRenderer.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/IFontRenderer.java similarity index 95% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/IFontRenderer.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/IFontRenderer.java index a1b5bbb..6216be6 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/IFontRenderer.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/IFontRenderer.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.gui.renderer; +package speiger.src.coreengine.rendering.guiOld.renderer; -import speiger.src.coreengine.rendering.gui.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; import speiger.src.coreengine.rendering.texturesOld.base.ITexture; public interface IFontRenderer diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/UIRenderer.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/UIRenderer.java similarity index 95% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/UIRenderer.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/UIRenderer.java index 475d2c5..95adf12 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/UIRenderer.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/UIRenderer.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.renderer; +package speiger.src.coreengine.rendering.guiOld.renderer; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -18,10 +18,10 @@ import speiger.src.coreengine.math.vector.floats.Vec3f; import speiger.src.coreengine.math.vector.floats.Vec4f; import speiger.src.coreengine.math.vector.matrix.Matrix4f; import speiger.src.coreengine.math.vector.quaternion.Quaternion; -import speiger.src.coreengine.rendering.gui.GuiManager; -import speiger.src.coreengine.rendering.gui.helper.Align; -import speiger.src.coreengine.rendering.gui.helper.box.IGuiBox; -import speiger.src.coreengine.rendering.gui.renderer.buffer.RenderBuffer; +import speiger.src.coreengine.rendering.guiOld.GuiManager; +import speiger.src.coreengine.rendering.guiOld.helper.Align; +import speiger.src.coreengine.rendering.guiOld.helper.box.IGuiBox; +import speiger.src.coreengine.rendering.guiOld.renderer.buffer.RenderBuffer; import speiger.src.coreengine.rendering.models.DrawCall; import speiger.src.coreengine.rendering.shaderOld.uniforms.UniformVec2f; import speiger.src.coreengine.rendering.tesselation.GLCall; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/buffer/DelayedRenderBuffer.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/buffer/DelayedRenderBuffer.java similarity index 97% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/buffer/DelayedRenderBuffer.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/buffer/DelayedRenderBuffer.java index 75f221b..dac8ef0 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/buffer/DelayedRenderBuffer.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/buffer/DelayedRenderBuffer.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.renderer.buffer; +package speiger.src.coreengine.rendering.guiOld.renderer.buffer; import java.util.function.BiConsumer; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/buffer/RenderBuffer.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/buffer/RenderBuffer.java similarity index 89% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/buffer/RenderBuffer.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/buffer/RenderBuffer.java index b16cd0d..98c7c66 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/buffer/RenderBuffer.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/buffer/RenderBuffer.java @@ -1,11 +1,11 @@ -package speiger.src.coreengine.rendering.gui.renderer.buffer; +package speiger.src.coreengine.rendering.guiOld.renderer.buffer; import java.util.Iterator; import java.util.List; import java.util.function.Consumer; import speiger.src.collections.objects.lists.ObjectArrayList; -import speiger.src.coreengine.rendering.gui.GuiComponent; +import speiger.src.coreengine.rendering.guiOld.GuiComponent; import speiger.src.coreengine.rendering.models.DrawCall; import speiger.src.coreengine.rendering.tesselation.format.VertexFormat; import speiger.src.coreengine.rendering.tesselationOld.Tesselator; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/buffer/TranslatedVertexBuilder.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/buffer/TranslatedVertexBuilder.java similarity index 96% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/buffer/TranslatedVertexBuilder.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/buffer/TranslatedVertexBuilder.java index c3fa9d6..d19f616 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/buffer/TranslatedVertexBuilder.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/buffer/TranslatedVertexBuilder.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.renderer.buffer; +package speiger.src.coreengine.rendering.guiOld.renderer.buffer; import speiger.src.coreengine.rendering.tesselationOld.IVertexBuilder; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/Line.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/Line.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/Line.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/Line.java index adc95e4..81deb55 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/Line.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/Line.java @@ -1,11 +1,11 @@ -package speiger.src.coreengine.rendering.gui.renderer.lexer; +package speiger.src.coreengine.rendering.guiOld.renderer.lexer; import java.util.List; import speiger.src.collections.objects.collections.ObjectIterator; import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.utils.ObjectIterators; -import speiger.src.coreengine.rendering.gui.renderer.IFontRenderer.CharInstance; +import speiger.src.coreengine.rendering.guiOld.renderer.IFontRenderer.CharInstance; import speiger.src.coreengine.utils.collections.iterators.IterableWrapper; public class Line diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/TextContext.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/TextContext.java similarity index 97% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/TextContext.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/TextContext.java index b50b0db..fc56ac7 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/TextContext.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/TextContext.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.renderer.lexer; +package speiger.src.coreengine.rendering.guiOld.renderer.lexer; import java.text.DecimalFormat; import java.util.StringJoiner; @@ -6,7 +6,7 @@ import java.util.StringJoiner; import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.lists.ObjectList; import speiger.src.coreengine.math.misc.ColorUtils; -import speiger.src.coreengine.rendering.gui.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; import speiger.src.coreengine.utils.helpers.TextUtil; public class TextContext diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/TextLexer.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/TextLexer.java similarity index 93% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/TextLexer.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/TextLexer.java index 116bd1b..32c8b5d 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/TextLexer.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/TextLexer.java @@ -1,12 +1,12 @@ -package speiger.src.coreengine.rendering.gui.renderer.lexer; +package speiger.src.coreengine.rendering.guiOld.renderer.lexer; import java.util.List; import java.util.Locale; import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.utils.ObjectLists; -import speiger.src.coreengine.rendering.gui.renderer.FontRenderer; -import speiger.src.coreengine.rendering.gui.renderer.IFontRenderer.CharInstance; +import speiger.src.coreengine.rendering.guiOld.renderer.FontRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.IFontRenderer.CharInstance; import speiger.src.coreengine.utils.helpers.TextUtil; public class TextLexer diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/TextMetadata.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/TextMetadata.java similarity index 91% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/TextMetadata.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/TextMetadata.java index 25773f8..eed20e1 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/TextMetadata.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/TextMetadata.java @@ -1,11 +1,11 @@ -package speiger.src.coreengine.rendering.gui.renderer.lexer; +package speiger.src.coreengine.rendering.guiOld.renderer.lexer; import java.util.List; import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.coreengine.math.MathUtils; import speiger.src.coreengine.math.vector.ints.Vec2i; -import speiger.src.coreengine.rendering.gui.components.TextComponent; +import speiger.src.coreengine.rendering.guiOld.components.TextComponent; public class TextMetadata { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/Word.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/Word.java similarity index 93% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/Word.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/Word.java index 7e5ffb6..f33a0b0 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/Word.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/Word.java @@ -1,12 +1,12 @@ -package speiger.src.coreengine.rendering.gui.renderer.lexer; +package speiger.src.coreengine.rendering.guiOld.renderer.lexer; import speiger.src.collections.ints.collections.IntIterable; import speiger.src.collections.ints.collections.IntIterator; import speiger.src.collections.objects.collections.ObjectIterator; import speiger.src.collections.objects.lists.ObjectArrayList; import speiger.src.collections.objects.lists.ObjectList; -import speiger.src.coreengine.rendering.gui.renderer.IFontRenderer.CharInstance; -import speiger.src.coreengine.rendering.gui.renderer.lexer.TextContext.WordContext; +import speiger.src.coreengine.rendering.guiOld.renderer.IFontRenderer.CharInstance; +import speiger.src.coreengine.rendering.guiOld.renderer.lexer.TextContext.WordContext; import speiger.src.coreengine.utils.collections.iterators.IterableWrapper; public class Word implements IntIterable diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/WordType.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/WordType.java similarity index 97% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/WordType.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/WordType.java index 9b29c0d..2683ddc 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/lexer/WordType.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/lexer/WordType.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.renderer.lexer; +package speiger.src.coreengine.rendering.guiOld.renderer.lexer; import speiger.src.collections.chars.maps.impl.hash.Char2ObjectOpenHashMap; import speiger.src.collections.chars.maps.interfaces.Char2ObjectMap; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/provider/BitmapFontProvider.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/provider/BitmapFontProvider.java similarity index 94% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/provider/BitmapFontProvider.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/provider/BitmapFontProvider.java index 157601c..51d9c0b 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/provider/BitmapFontProvider.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/provider/BitmapFontProvider.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.renderer.provider; +package speiger.src.coreengine.rendering.guiOld.renderer.provider; import java.awt.image.BufferedImage; import java.util.List; @@ -13,9 +13,9 @@ import speiger.src.coreengine.assets.AssetLocation; import speiger.src.coreengine.assets.AssetManager; import speiger.src.coreengine.assets.base.IAsset; import speiger.src.coreengine.math.vector.ints.Vec2i; -import speiger.src.coreengine.rendering.gui.helper.FontBuilder; -import speiger.src.coreengine.rendering.gui.helper.FontBuilder.WrittenChar; -import speiger.src.coreengine.rendering.gui.renderer.IFontRenderer.CharInstance; +import speiger.src.coreengine.rendering.guiOld.helper.FontBuilder; +import speiger.src.coreengine.rendering.guiOld.helper.FontBuilder.WrittenChar; +import speiger.src.coreengine.rendering.guiOld.renderer.IFontRenderer.CharInstance; import speiger.src.coreengine.rendering.texturesOld.base.ITexture; import speiger.src.coreengine.rendering.texturesOld.base.TextureManager; import speiger.src.coreengine.utils.helpers.JsonUtil; diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/provider/FontManager.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/provider/FontManager.java similarity index 95% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/provider/FontManager.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/provider/FontManager.java index e79f042..26e1e67 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/provider/FontManager.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/provider/FontManager.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.gui.renderer.provider; +package speiger.src.coreengine.rendering.guiOld.renderer.provider; import java.util.List; import java.util.Map; @@ -16,7 +16,7 @@ import speiger.src.coreengine.assets.AssetLocation; import speiger.src.coreengine.assets.AssetManager; import speiger.src.coreengine.assets.base.IAsset; import speiger.src.coreengine.assets.reloader.IReloadableResource; -import speiger.src.coreengine.rendering.gui.renderer.FontRenderer; +import speiger.src.coreengine.rendering.guiOld.renderer.FontRenderer; public class FontManager implements IReloadableResource { diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/provider/IFontProvider.java b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/provider/IFontProvider.java similarity index 92% rename from src/main/java/speiger/src/coreengine/rendering/gui/renderer/provider/IFontProvider.java rename to src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/provider/IFontProvider.java index 2e523eb..7d7d2ce 100644 --- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/provider/IFontProvider.java +++ b/src/main/java/speiger/src/coreengine/rendering/guiOld/renderer/provider/IFontProvider.java @@ -1,8 +1,8 @@ -package speiger.src.coreengine.rendering.gui.renderer.provider; +package speiger.src.coreengine.rendering.guiOld.renderer.provider; import com.google.gson.JsonObject; -import speiger.src.coreengine.rendering.gui.renderer.IFontRenderer.CharInstance; +import speiger.src.coreengine.rendering.guiOld.renderer.IFontRenderer.CharInstance; import speiger.src.coreengine.rendering.texturesOld.base.ITexture; import speiger.src.coreengine.utils.helpers.JsonUtil; diff --git a/src/main/java/speiger/src/coreengine/rendering/input/window/Monitor.java b/src/main/java/speiger/src/coreengine/rendering/input/window/Monitor.java index 60fcfbf..af31706 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/window/Monitor.java +++ b/src/main/java/speiger/src/coreengine/rendering/input/window/Monitor.java @@ -70,16 +70,6 @@ public class Monitor return yOffset; } - public long getInBounds(Window window) { - if(xOffset <= window.getXPos() + window.getActualWidth() && xOffset + defaultMode.width() >= window.getXPos() && yOffset <= window.getYPos() + window.getActualHeight() && yOffset + defaultMode.height() >= window.getYPos()) { - int xArea = Math.abs(window.getActualWidth() * defaultMode.width()); - int yArea = Math.abs(window.getActualHeight() * defaultMode.height()); - int areaI = (Math.min(window.getXPos() + window.getActualWidth(), xOffset + defaultMode.width()) - Math.max(window.getXPos(), xOffset)) * (Math.min(window.getYPos() + window.getActualHeight(), yOffset + defaultMode.height()) - Math.max(window.getYPos(), yOffset)); - return (xArea + yArea) - areaI; - } - return 0L; - } - public static Long2ObjectMap createMonitors() { Long2ObjectMap monitors = new Long2ObjectLinkedOpenHashMap<>(); PointerBuffer buffer = GLFW.glfwGetMonitors(); diff --git a/src/main/java/speiger/src/coreengine/rendering/input/DropListener.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/DropListener.java similarity index 75% rename from src/main/java/speiger/src/coreengine/rendering/input/DropListener.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/DropListener.java index dd83738..20618bd 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/DropListener.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/DropListener.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input; +package speiger.src.coreengine.rendering.inputOld; import java.nio.file.Files; import java.nio.file.Path; @@ -7,9 +7,9 @@ import java.nio.file.Paths; import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFWDropCallback; -import speiger.src.coreengine.rendering.input.events.FileDropEvent; -import speiger.src.coreengine.rendering.input.window.ScaledResolution; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.inputOld.events.FileDropEvent; +import speiger.src.coreengine.rendering.inputOld.window.ScaledResolution; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.utils.eventbus.EventBus; public class DropListener diff --git a/src/main/java/speiger/src/coreengine/rendering/input/Keyboard.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/Keyboard.java similarity index 84% rename from src/main/java/speiger/src/coreengine/rendering/input/Keyboard.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/Keyboard.java index 4e1ebda..bdf52f8 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/Keyboard.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/Keyboard.java @@ -1,14 +1,14 @@ -package speiger.src.coreengine.rendering.input; +package speiger.src.coreengine.rendering.inputOld; import java.util.function.BiPredicate; import org.lwjgl.glfw.GLFW; -import speiger.src.coreengine.rendering.input.bindings.InputBinding; -import speiger.src.coreengine.rendering.input.bindings.utils.BindingType; -import speiger.src.coreengine.rendering.input.events.KeyEvent.CharTypeEvent; -import speiger.src.coreengine.rendering.input.events.KeyEvent.KeyPressEvent; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.inputOld.bindings.InputBinding; +import speiger.src.coreengine.rendering.inputOld.bindings.utils.BindingType; +import speiger.src.coreengine.rendering.inputOld.events.KeyEvent.CharTypeEvent; +import speiger.src.coreengine.rendering.inputOld.events.KeyEvent.KeyPressEvent; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.utils.eventbus.EventBus; public class Keyboard diff --git a/src/main/java/speiger/src/coreengine/rendering/input/Mouse.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/Mouse.java similarity index 82% rename from src/main/java/speiger/src/coreengine/rendering/input/Mouse.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/Mouse.java index d8e5c79..2ae2ca0 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/Mouse.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/Mouse.java @@ -1,18 +1,18 @@ -package speiger.src.coreengine.rendering.input; +package speiger.src.coreengine.rendering.inputOld; import org.lwjgl.glfw.GLFW; import speiger.src.collections.ints.sets.IntLinkedOpenHashSet; import speiger.src.collections.ints.sets.IntSet; import speiger.src.coreengine.math.vector.ints.Vec2i; -import speiger.src.coreengine.rendering.input.bindings.InputBinding; -import speiger.src.coreengine.rendering.input.bindings.utils.BindingType; -import speiger.src.coreengine.rendering.input.camera.Camera; -import speiger.src.coreengine.rendering.input.events.MouseEvent; -import speiger.src.coreengine.rendering.input.events.MouseEvent.MouseClickEvent; -import speiger.src.coreengine.rendering.input.events.MouseEvent.MouseMoveEvent; -import speiger.src.coreengine.rendering.input.events.MouseEvent.MouseScrollEvent; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.inputOld.bindings.InputBinding; +import speiger.src.coreengine.rendering.inputOld.bindings.utils.BindingType; +import speiger.src.coreengine.rendering.inputOld.camera.Camera; +import speiger.src.coreengine.rendering.inputOld.events.MouseEvent; +import speiger.src.coreengine.rendering.inputOld.events.MouseEvent.MouseClickEvent; +import speiger.src.coreengine.rendering.inputOld.events.MouseEvent.MouseMoveEvent; +import speiger.src.coreengine.rendering.inputOld.events.MouseEvent.MouseScrollEvent; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.utils.eventbus.EventBus; public class Mouse diff --git a/src/main/java/speiger/src/coreengine/rendering/input/MouseRay.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/MouseRay.java similarity index 86% rename from src/main/java/speiger/src/coreengine/rendering/input/MouseRay.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/MouseRay.java index 3606092..ebce911 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/MouseRay.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/MouseRay.java @@ -1,13 +1,13 @@ -package speiger.src.coreengine.rendering.input; +package speiger.src.coreengine.rendering.inputOld; import speiger.src.coreengine.math.vector.floats.Vec3f; import speiger.src.coreengine.math.vector.floats.Vec4f; import speiger.src.coreengine.math.vector.ints.Vec2i; import speiger.src.coreengine.math.vector.matrix.Matrix4f; -import speiger.src.coreengine.rendering.input.camera.Camera; -import speiger.src.coreengine.rendering.input.raycast.Ray; -import speiger.src.coreengine.rendering.input.window.IWindowListener; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.inputOld.camera.Camera; +import speiger.src.coreengine.rendering.inputOld.raycast.Ray; +import speiger.src.coreengine.rendering.inputOld.window.IWindowListener; +import speiger.src.coreengine.rendering.inputOld.window.Window; public class MouseRay implements IWindowListener { diff --git a/src/main/java/speiger/src/coreengine/rendering/input/bindings/Axis.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/Axis.java similarity index 94% rename from src/main/java/speiger/src/coreengine/rendering/input/bindings/Axis.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/Axis.java index 6905b2f..9c18d2a 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/bindings/Axis.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/Axis.java @@ -1,12 +1,12 @@ -package speiger.src.coreengine.rendering.input.bindings; +package speiger.src.coreengine.rendering.inputOld.bindings; import java.util.Map; import org.lwjgl.glfw.GLFW; import speiger.src.collections.objects.maps.interfaces.Object2ObjectMap; -import speiger.src.coreengine.rendering.input.Mouse; -import speiger.src.coreengine.rendering.input.bindings.utils.BindingType; +import speiger.src.coreengine.rendering.inputOld.Mouse; +import speiger.src.coreengine.rendering.inputOld.bindings.utils.BindingType; public class Axis { diff --git a/src/main/java/speiger/src/coreengine/rendering/input/bindings/InputBinding.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/InputBinding.java similarity index 93% rename from src/main/java/speiger/src/coreengine/rendering/input/bindings/InputBinding.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/InputBinding.java index c7860da..7d61acf 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/bindings/InputBinding.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/InputBinding.java @@ -1,13 +1,13 @@ -package speiger.src.coreengine.rendering.input.bindings; +package speiger.src.coreengine.rendering.inputOld.bindings; import java.util.List; import java.util.Objects; import java.util.function.Consumer; import speiger.src.collections.objects.lists.ObjectArrayList; -import speiger.src.coreengine.rendering.input.bindings.utils.BindingRegistry; -import speiger.src.coreengine.rendering.input.bindings.utils.BindingType; -import speiger.src.coreengine.rendering.input.bindings.utils.ModType; +import speiger.src.coreengine.rendering.inputOld.bindings.utils.BindingRegistry; +import speiger.src.coreengine.rendering.inputOld.bindings.utils.BindingType; +import speiger.src.coreengine.rendering.inputOld.bindings.utils.ModType; public class InputBinding { diff --git a/src/main/java/speiger/src/coreengine/rendering/input/bindings/utils/BindingRegistry.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/utils/BindingRegistry.java similarity index 91% rename from src/main/java/speiger/src/coreengine/rendering/input/bindings/utils/BindingRegistry.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/utils/BindingRegistry.java index 815c00a..a0cca5f 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/bindings/utils/BindingRegistry.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/utils/BindingRegistry.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input.bindings.utils; +package speiger.src.coreengine.rendering.inputOld.bindings.utils; import java.util.Collections; import java.util.Set; @@ -8,7 +8,7 @@ import speiger.src.collections.ints.maps.interfaces.Int2ObjectMap; import speiger.src.collections.objects.maps.impl.misc.Enum2ObjectMap; import speiger.src.collections.objects.maps.interfaces.Object2ObjectMap; import speiger.src.collections.objects.sets.ObjectLinkedOpenHashSet; -import speiger.src.coreengine.rendering.input.bindings.InputBinding; +import speiger.src.coreengine.rendering.inputOld.bindings.InputBinding; public class BindingRegistry { diff --git a/src/main/java/speiger/src/coreengine/rendering/input/bindings/utils/BindingType.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/utils/BindingType.java similarity index 83% rename from src/main/java/speiger/src/coreengine/rendering/input/bindings/utils/BindingType.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/utils/BindingType.java index 5141a68..cc7e095 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/bindings/utils/BindingType.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/utils/BindingType.java @@ -1,9 +1,9 @@ -package speiger.src.coreengine.rendering.input.bindings.utils; +package speiger.src.coreengine.rendering.inputOld.bindings.utils; import org.lwjgl.glfw.GLFW; -import speiger.src.coreengine.rendering.input.Keyboard; -import speiger.src.coreengine.rendering.input.Mouse; +import speiger.src.coreengine.rendering.inputOld.Keyboard; +import speiger.src.coreengine.rendering.inputOld.Mouse; public enum BindingType { diff --git a/src/main/java/speiger/src/coreengine/rendering/input/bindings/utils/ModType.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/utils/ModType.java similarity index 88% rename from src/main/java/speiger/src/coreengine/rendering/input/bindings/utils/ModType.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/utils/ModType.java index 68ce642..78ec349 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/bindings/utils/ModType.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/bindings/utils/ModType.java @@ -1,8 +1,8 @@ -package speiger.src.coreengine.rendering.input.bindings.utils; +package speiger.src.coreengine.rendering.inputOld.bindings.utils; import java.util.StringJoiner; -import speiger.src.coreengine.rendering.input.Keyboard; +import speiger.src.coreengine.rendering.inputOld.Keyboard; public final class ModType { diff --git a/src/main/java/speiger/src/coreengine/rendering/input/camera/Camera.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/camera/Camera.java similarity index 97% rename from src/main/java/speiger/src/coreengine/rendering/input/camera/Camera.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/camera/Camera.java index 83a6cf0..82f56cd 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/camera/Camera.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/camera/Camera.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input.camera; +package speiger.src.coreengine.rendering.inputOld.camera; import java.text.DecimalFormat; import java.util.List; @@ -11,7 +11,7 @@ import speiger.src.coreengine.math.vector.floats.Vec3f; import speiger.src.coreengine.math.vector.ints.Vec2i; import speiger.src.coreengine.math.vector.ints.Vec3i; import speiger.src.coreengine.math.vector.matrix.Matrix4f; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.inputOld.window.Window; public class Camera { diff --git a/src/main/java/speiger/src/coreengine/rendering/input/camera/DefaultCameraController.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/camera/DefaultCameraController.java similarity index 87% rename from src/main/java/speiger/src/coreengine/rendering/input/camera/DefaultCameraController.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/camera/DefaultCameraController.java index 8f8049c..1630850 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/camera/DefaultCameraController.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/camera/DefaultCameraController.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input.camera; +package speiger.src.coreengine.rendering.inputOld.camera; import speiger.src.coreengine.math.vector.ints.Vec2i; diff --git a/src/main/java/speiger/src/coreengine/rendering/input/camera/Frustrum.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/camera/Frustrum.java similarity index 94% rename from src/main/java/speiger/src/coreengine/rendering/input/camera/Frustrum.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/camera/Frustrum.java index 70a41e4..26ad82d 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/camera/Frustrum.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/camera/Frustrum.java @@ -1,11 +1,11 @@ -package speiger.src.coreengine.rendering.input.camera; +package speiger.src.coreengine.rendering.inputOld.camera; import speiger.src.coreengine.math.vector.floats.Vec2f; import speiger.src.coreengine.math.vector.floats.Vec3f; import speiger.src.coreengine.math.vector.floats.Vec4f; import speiger.src.coreengine.math.vector.matrix.Matrix4f; -import speiger.src.coreengine.rendering.input.window.IWindowListener; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.inputOld.window.IWindowListener; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.utils.helpers.InternalThreadPools; public class Frustrum implements IWindowListener diff --git a/src/main/java/speiger/src/coreengine/rendering/input/camera/ICameraController.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/camera/ICameraController.java similarity index 87% rename from src/main/java/speiger/src/coreengine/rendering/input/camera/ICameraController.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/camera/ICameraController.java index d17d7df..f2cc6c6 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/camera/ICameraController.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/camera/ICameraController.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input.camera; +package speiger.src.coreengine.rendering.inputOld.camera; import speiger.src.coreengine.math.vector.ints.Vec2i; diff --git a/src/main/java/speiger/src/coreengine/rendering/input/events/FileDropEvent.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/events/FileDropEvent.java similarity index 83% rename from src/main/java/speiger/src/coreengine/rendering/input/events/FileDropEvent.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/events/FileDropEvent.java index 607e460..b174fc6 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/events/FileDropEvent.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/events/FileDropEvent.java @@ -1,8 +1,8 @@ -package speiger.src.coreengine.rendering.input.events; +package speiger.src.coreengine.rendering.inputOld.events; import java.nio.file.Path; -import speiger.src.coreengine.rendering.input.window.ScaledResolution; +import speiger.src.coreengine.rendering.inputOld.window.ScaledResolution; public class FileDropEvent extends MouseEvent { diff --git a/src/main/java/speiger/src/coreengine/rendering/input/events/KeyEvent.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/events/KeyEvent.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/input/events/KeyEvent.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/events/KeyEvent.java index 8748153..fa5e11c 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/events/KeyEvent.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/events/KeyEvent.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input.events; +package speiger.src.coreengine.rendering.inputOld.events; import speiger.src.coreengine.utils.eventbus.Event; diff --git a/src/main/java/speiger/src/coreengine/rendering/input/events/MouseEvent.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/events/MouseEvent.java similarity index 94% rename from src/main/java/speiger/src/coreengine/rendering/input/events/MouseEvent.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/events/MouseEvent.java index da508a3..f4aa0b4 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/events/MouseEvent.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/events/MouseEvent.java @@ -1,6 +1,6 @@ -package speiger.src.coreengine.rendering.input.events; +package speiger.src.coreengine.rendering.inputOld.events; -import speiger.src.coreengine.rendering.input.window.ScaledResolution; +import speiger.src.coreengine.rendering.inputOld.window.ScaledResolution; import speiger.src.coreengine.utils.eventbus.Event; public abstract class MouseEvent extends Event diff --git a/src/main/java/speiger/src/coreengine/rendering/input/raycast/Ray.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/raycast/Ray.java similarity index 82% rename from src/main/java/speiger/src/coreengine/rendering/input/raycast/Ray.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/raycast/Ray.java index 72e14c9..c4cc809 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/raycast/Ray.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/raycast/Ray.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input.raycast; +package speiger.src.coreengine.rendering.inputOld.raycast; import speiger.src.coreengine.math.vector.floats.Vec3f; diff --git a/src/main/java/speiger/src/coreengine/rendering/input/raycast/RayCollisions.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/raycast/RayCollisions.java similarity index 96% rename from src/main/java/speiger/src/coreengine/rendering/input/raycast/RayCollisions.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/raycast/RayCollisions.java index f0b7867..27a5447 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/raycast/RayCollisions.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/raycast/RayCollisions.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input.raycast; +package speiger.src.coreengine.rendering.inputOld.raycast; import speiger.src.coreengine.math.vector.floats.Vec3f; diff --git a/src/main/java/speiger/src/coreengine/rendering/input/raycast/RayResult.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/raycast/RayResult.java similarity index 90% rename from src/main/java/speiger/src/coreengine/rendering/input/raycast/RayResult.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/raycast/RayResult.java index fad7d23..be55c4a 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/raycast/RayResult.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/raycast/RayResult.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input.raycast; +package speiger.src.coreengine.rendering.inputOld.raycast; import speiger.src.coreengine.math.vector.floats.Vec3f; diff --git a/src/main/java/speiger/src/coreengine/rendering/input/window/IWindowListener.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/window/IWindowListener.java similarity index 58% rename from src/main/java/speiger/src/coreengine/rendering/input/window/IWindowListener.java rename to src/main/java/speiger/src/coreengine/rendering/inputOld/window/IWindowListener.java index ea39202..8b4c60c 100644 --- a/src/main/java/speiger/src/coreengine/rendering/input/window/IWindowListener.java +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/window/IWindowListener.java @@ -1,4 +1,4 @@ -package speiger.src.coreengine.rendering.input.window; +package speiger.src.coreengine.rendering.inputOld.window; public interface IWindowListener { public void onWindowChanged(Window window); diff --git a/src/main/java/speiger/src/coreengine/rendering/inputOld/window/Monitor.java b/src/main/java/speiger/src/coreengine/rendering/inputOld/window/Monitor.java new file mode 100644 index 0000000..016287e --- /dev/null +++ b/src/main/java/speiger/src/coreengine/rendering/inputOld/window/Monitor.java @@ -0,0 +1,92 @@ +package speiger.src.coreengine.rendering.inputOld.window; + +import java.util.List; + +import org.lwjgl.PointerBuffer; +import org.lwjgl.glfw.GLFW; +import org.lwjgl.glfw.GLFWVidMode; + +import speiger.src.collections.longs.maps.impl.hash.Long2ObjectLinkedOpenHashMap; +import speiger.src.collections.longs.maps.interfaces.Long2ObjectMap; +import speiger.src.collections.objects.lists.ObjectArrayList; + +public class Monitor +{ + final long monitor; + List modes = new ObjectArrayList<>(); + VideoMode defaultMode; + int xOffset; + int yOffset; + + public Monitor(long monitor) { + this.monitor = monitor; + GLFWVidMode.Buffer buffer = GLFW.glfwGetVideoModes(monitor); + for(int i = buffer.limit() - 1;i >= 0;--i) { + VideoMode videomode = new VideoMode(this, buffer.position(i)); + if(videomode.redBits() >= 8 && videomode.greenBits() >= 8 && videomode.blueBits() >= 8) + modes.add(videomode); + } + defaultMode = new VideoMode(this, GLFW.glfwGetVideoMode(monitor)); + int[] xPos = new int[1]; + int[] yPos = new int[1]; + GLFW.glfwGetMonitorPos(monitor, xPos, yPos); + xOffset = xPos[0]; + yOffset = yPos[0]; + } + + public String getMonitorName() { + return GLFW.glfwGetMonitorName(monitor); + } + + public long getMonitorId() { + return monitor; + } + + public int size() { + return modes.size(); + } + + public VideoMode getMode(int index) { + return modes.get(index); + } + + public boolean contains(VideoMode mode) { + return modes.indexOf(mode) != -1; + } + + public List getVideoMods() { + return new ObjectArrayList<>(modes); + } + + public VideoMode getDefaultMode() { + return defaultMode; + } + + public int getXOffset() { + return xOffset; + } + + public int getYOffset() { + return yOffset; + } + + public long getInBounds(Window window) { + if(xOffset <= window.getXPos() + window.getActualWidth() && xOffset + defaultMode.width() >= window.getXPos() && yOffset <= window.getYPos() + window.getActualHeight() && yOffset + defaultMode.height() >= window.getYPos()) { + int xArea = Math.abs(window.getActualWidth() * defaultMode.width()); + int yArea = Math.abs(window.getActualHeight() * defaultMode.height()); + int areaI = (Math.min(window.getXPos() + window.getActualWidth(), xOffset + defaultMode.width()) - Math.max(window.getXPos(), xOffset)) * (Math.min(window.getYPos() + window.getActualHeight(), yOffset + defaultMode.height()) - Math.max(window.getYPos(), yOffset)); + return (xArea + yArea) - areaI; + } + return 0L; + } + + public static Long2ObjectMap createMonitors() { + Long2ObjectMap monitors = new Long2ObjectLinkedOpenHashMap<>(); + PointerBuffer buffer = GLFW.glfwGetMonitors(); + for(int i = 0,m=buffer.limit();i diff --git a/src/main/java/speiger/src/coreengine/rendering/utils/Cursor.java b/src/main/java/speiger/src/coreengine/rendering/utils/Cursor.java index d40f1d9..15b50fa 100644 --- a/src/main/java/speiger/src/coreengine/rendering/utils/Cursor.java +++ b/src/main/java/speiger/src/coreengine/rendering/utils/Cursor.java @@ -12,7 +12,7 @@ import speiger.src.collections.objects.maps.interfaces.Object2ObjectMap.Entry; import speiger.src.collections.objects.utils.maps.Object2ObjectMaps; import speiger.src.coreengine.assets.AssetLocation; import speiger.src.coreengine.assets.reloader.IReloadableResource; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.rendering.texturesOld.base.TextureManager; public final class Cursor implements IReloadableResource { diff --git a/src/main/java/speiger/src/coreengine/rendering/utils/ScreenshotHandler.java b/src/main/java/speiger/src/coreengine/rendering/utils/ScreenshotHandler.java index ee9577e..840cd74 100644 --- a/src/main/java/speiger/src/coreengine/rendering/utils/ScreenshotHandler.java +++ b/src/main/java/speiger/src/coreengine/rendering/utils/ScreenshotHandler.java @@ -16,8 +16,8 @@ import javax.imageio.ImageIO; import org.lwjgl.opengl.GL11; import org.lwjgl.system.MemoryUtil; -import speiger.src.coreengine.rendering.input.window.IWindowListener; -import speiger.src.coreengine.rendering.input.window.Window; +import speiger.src.coreengine.rendering.inputOld.window.IWindowListener; +import speiger.src.coreengine.rendering.inputOld.window.Window; import speiger.src.coreengine.utils.helpers.IOUtils; import speiger.src.coreengine.utils.io.GifWriter;