From dfb139b85b8812281b69e248151dbb558790ca51 Mon Sep 17 00:00:00 2001 From: extio-de Date: Sat, 20 Dec 2025 17:34:26 +0100 Subject: [PATCH] Refactor RendererData and related classes to separate UI and Video options into distinct classes --- .../game_engine/renderer/RendererData.java | 146 +----------------- .../renderer/container/ScrollBar.java | 2 +- .../renderer/container/Window.java | 2 +- .../game_engine/renderer/g2d/G2DRenderer.java | 2 +- .../renderer/g2d/G2DRendererControl.java | 2 +- .../g2d/bo/rendering/G2DDrawBackground.java | 4 +- .../g2d/bo/rendering/G2DDrawEffect.java | 2 +- .../g2d/bo/rendering/G2DDrawFont.java | 2 +- .../g2d/bo/rendering/G2DDrawWindow.java | 4 +- .../g2d/bo/rendering/G2DDrawWindow2.java | 4 +- .../renderer/g2d/control/G2DDrawControl.java | 4 +- .../g2d/control/G2DDrawControlTooltip.java | 2 +- .../control/components/CustomJTextField.java | 4 +- .../g2d/control/components/CustomLabel.java | 2 +- .../components/CustomWindowCloseButton.java | 2 +- .../control/impl/G2DButtonControlImpl.java | 2 +- .../g2d/control/impl/G2DLabelControlImpl.java | 4 +- .../control/impl/G2DSliderControlImpl.java | 2 +- .../g2d/control/impl/G2DTableControlImpl.java | 2 +- .../control/impl/G2DTextfieldControlImpl.java | 2 +- .../impl/G2DTextfieldControlImpl2.java | 2 +- .../renderer/model/AbstractRenderingBo.java | 1 + .../renderer/model/RenderingBo.java | 1 + .../renderer/model/bo/ControlRenderingBo.java | 3 +- .../model/bo/DrawEffectRenderingBo.java | 1 - .../DrawEffectRenderingBoEffects.java | 2 +- .../model/bo/DrawFontRenderingBo.java | 1 - .../DrawFontRenderingBoTextAlignment.java | 2 +- .../model/{ => color}/ImmutableRgbaColor.java | 2 +- .../model/{ => color}/MutableRgbaColor.java | 2 +- .../renderer/model/{ => color}/RgbaColor.java | 2 +- .../renderer/{ => options}/UiOptions.java | 17 +- .../renderer/options/VideoOptions.java | 53 +++++++ 33 files changed, 91 insertions(+), 194 deletions(-) rename src/main/java/de/extio/game_engine/renderer/model/{ => bo}/DrawEffectRenderingBoEffects.java (81%) rename src/main/java/de/extio/game_engine/renderer/model/{ => bo}/DrawFontRenderingBoTextAlignment.java (61%) rename src/main/java/de/extio/game_engine/renderer/model/{ => color}/ImmutableRgbaColor.java (97%) rename src/main/java/de/extio/game_engine/renderer/model/{ => color}/MutableRgbaColor.java (98%) rename src/main/java/de/extio/game_engine/renderer/model/{ => color}/RgbaColor.java (97%) rename src/main/java/de/extio/game_engine/renderer/{ => options}/UiOptions.java (85%) create mode 100644 src/main/java/de/extio/game_engine/renderer/options/VideoOptions.java diff --git a/src/main/java/de/extio/game_engine/renderer/RendererData.java b/src/main/java/de/extio/game_engine/renderer/RendererData.java index 178e8a1..9b0f238 100644 --- a/src/main/java/de/extio/game_engine/renderer/RendererData.java +++ b/src/main/java/de/extio/game_engine/renderer/RendererData.java @@ -2,8 +2,8 @@ package de.extio.game_engine.renderer; import java.util.function.Consumer; -import de.extio.game_engine.spatial2.model.CoordI2; -import de.extio.game_engine.spatial2.model.MutableCoordI2; +import de.extio.game_engine.renderer.options.UiOptions; +import de.extio.game_engine.renderer.options.VideoOptions; public class RendererData { @@ -21,148 +21,6 @@ public class RendererData { private Consumer eventConsumer; - public final class UiOptions { - - private String backgroundResourceName0 = null; - - private boolean backgroundScrolling0; - - private boolean backgroundScrollingReverse0; - - private boolean backgroundScrolling1; - - private boolean backgroundScrollingReverse1; - - private boolean drawFps; - - private CoordI2 backgroundOffset0 = MutableCoordI2.create(); - - private CoordI2 backgroundOffset1 = MutableCoordI2.create(); - - public UiOptions() { - if ("true".equals(System.getProperty("debug"))) { - this.drawFps = true; - } - } - - public boolean isDrawFps() { - return this.drawFps; - } - - public void setDrawFps(final boolean drawFps) { - this.drawFps = drawFps; - } - - public String getBackgroundResourceName0() { - return this.backgroundResourceName0; - } - - public void setBackgroundResourceName0(final String background0) { - this.backgroundResourceName0 = background0; - } - - public boolean isBackgroundScrolling0() { - return this.backgroundScrolling0; - } - - public void setBackgroundScrolling0(final boolean backgroundScrolling0) { - this.backgroundScrolling0 = backgroundScrolling0; - } - - public boolean isBackgroundScrollingReverse0() { - return this.backgroundScrollingReverse0; - } - - public void setBackgroundScrollingReverse0(final boolean backgroundScrollingReverse0) { - this.backgroundScrollingReverse0 = backgroundScrollingReverse0; - } - - public boolean isBackgroundScrolling1() { - return this.backgroundScrolling1; - } - - public void setBackgroundScrolling1(final boolean backgroundScrolling1) { - this.backgroundScrolling1 = backgroundScrolling1; - } - - public boolean isBackgroundScrollingReverse1() { - return this.backgroundScrollingReverse1; - } - - public void setBackgroundScrollingReverse1(final boolean backgroundScrollingReverse1) { - this.backgroundScrollingReverse1 = backgroundScrollingReverse1; - } - - public CoordI2 getBackgroundOffset0() { - return this.backgroundOffset0; - } - - public void setBackgroundOffset0(final CoordI2 backgroundOffset0) { - this.backgroundOffset0 = backgroundOffset0; - } - - public CoordI2 getBackgroundOffset1() { - return this.backgroundOffset1; - } - - public void setBackgroundOffset1(final CoordI2 backgroundOffset1) { - this.backgroundOffset1 = backgroundOffset1; - } - - } - - public final class VideoOptions { - - private VideoOptionsVideoMode videoMode = VideoOptionsVideoMode.BORDERLESS; - - private int fullScreenNumber = -1; - - private double scaleFactorModifier = 1.0; - - private int frameRateTarget = 60; - - public double getScaleFactorModifier() { - return this.scaleFactorModifier; - } - - public void setScaleFactorModifier(final double scaleFactorModifier) { - this.scaleFactorModifier = scaleFactorModifier; - } - - public VideoOptionsVideoMode getVideoMode() { - return this.videoMode; - } - - public void setVideoMode(final VideoOptionsVideoMode videoMode) { - this.videoMode = videoMode; - } - - public int getFullScreenNumber() { - return this.fullScreenNumber; - } - - public void setFullScreenNumber(final int fullScreenNumber) { - this.fullScreenNumber = fullScreenNumber; - } - - public int getFrameRateTarget() { - return this.frameRateTarget; - } - - public void setFrameRateTarget(final int frameRateTarget) { - this.frameRateTarget = frameRateTarget; - } - - public static enum VideoOptionsVideoMode { - - WINDOW, - BORDERLESS, - FULLSCREEN - - } - - } - public RendererControl getRendererControl() { return this.rendererControl; } diff --git a/src/main/java/de/extio/game_engine/renderer/container/ScrollBar.java b/src/main/java/de/extio/game_engine/renderer/container/ScrollBar.java index 5443b49..86d09c0 100644 --- a/src/main/java/de/extio/game_engine/renderer/container/ScrollBar.java +++ b/src/main/java/de/extio/game_engine/renderer/container/ScrollBar.java @@ -9,9 +9,9 @@ import org.slf4j.LoggerFactory; import de.extio.game_engine.renderer.RenderingBoPool; import de.extio.game_engine.renderer.model.RenderingBo; import de.extio.game_engine.renderer.model.RenderingBoLayer; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.SliderControl; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.renderer.model.event.UiControlEvent; import de.extio.game_engine.spatial2.model.Area2; import de.extio.game_engine.spatial2.model.CoordI2; diff --git a/src/main/java/de/extio/game_engine/renderer/container/Window.java b/src/main/java/de/extio/game_engine/renderer/container/Window.java index 6ddc67d..02f9ddb 100644 --- a/src/main/java/de/extio/game_engine/renderer/container/Window.java +++ b/src/main/java/de/extio/game_engine/renderer/container/Window.java @@ -12,9 +12,9 @@ import de.extio.game_engine.renderer.RendererControl; import de.extio.game_engine.renderer.RenderingBoPool; import de.extio.game_engine.renderer.model.RenderingBo; import de.extio.game_engine.renderer.model.RenderingBoLayer; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.WindowCloseButtonControl; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.renderer.model.bo.DrawWindowRenderingBo; import de.extio.game_engine.spatial2.WorldUtils2; import de.extio.game_engine.spatial2.model.Area2; diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/G2DRenderer.java b/src/main/java/de/extio/game_engine/renderer/g2d/G2DRenderer.java index aad0450..fe28335 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/G2DRenderer.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/G2DRenderer.java @@ -32,13 +32,13 @@ import de.extio.game_engine.renderer.g2d.control.G2DDrawControl; import de.extio.game_engine.renderer.g2d.control.G2DDrawControlTooltip; import de.extio.game_engine.renderer.model.RenderingBo; import de.extio.game_engine.renderer.model.RenderingBoLayer; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo; import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBo; import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBo; import de.extio.game_engine.renderer.model.bo.DrawImageRenderingBo; import de.extio.game_engine.renderer.model.bo.DrawTestRenderingBo; import de.extio.game_engine.renderer.model.bo.DrawWindowRenderingBo; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.renderer.model.event.TakeScreenshotEvent; import de.extio.game_engine.util.RingBuffer; diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/G2DRendererControl.java b/src/main/java/de/extio/game_engine/renderer/g2d/G2DRendererControl.java index 678fccc..864e90f 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/G2DRendererControl.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/G2DRendererControl.java @@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory; import de.extio.game_engine.renderer.RendererControl; import de.extio.game_engine.renderer.RendererData; -import de.extio.game_engine.renderer.RendererData.VideoOptions.VideoOptionsVideoMode; +import de.extio.game_engine.renderer.options.VideoOptions.VideoOptionsVideoMode; import de.extio.game_engine.spatial2.model.CoordI2; import de.extio.game_engine.spatial2.model.ImmutableCoordI2; diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawBackground.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawBackground.java index eff770a..ecfaf32 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawBackground.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawBackground.java @@ -15,9 +15,9 @@ import java.util.Objects; import javax.imageio.ImageIO; import de.extio.game_engine.renderer.g2d.G2DRendererControl; -import de.extio.game_engine.renderer.model.ImmutableRgbaColor; import de.extio.game_engine.renderer.model.RenderingBoLayer; -import de.extio.game_engine.renderer.model.RgbaColor; +import de.extio.game_engine.renderer.model.color.ImmutableRgbaColor; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.spatial2.model.CoordI2; import de.extio.game_engine.spatial2.model.ImmutableCoordI2; import de.extio.game_engine.spatial2.model.MutableCoordI2; diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawEffect.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawEffect.java index d5e301b..5137fae 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawEffect.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawEffect.java @@ -8,9 +8,9 @@ import java.util.List; import de.extio.game_engine.renderer.g2d.G2DRenderer; import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport; -import de.extio.game_engine.renderer.model.DrawEffectRenderingBoEffects; import de.extio.game_engine.renderer.model.RenderingBoLayer; import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBo; +import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBoEffects; import de.extio.game_engine.spatial2.WorldUtils2; import de.extio.game_engine.spatial2.model.Area2; import de.extio.game_engine.spatial2.model.CoordI2; diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawFont.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawFont.java index 90d3872..1c196e1 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawFont.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawFont.java @@ -8,9 +8,9 @@ import java.awt.font.TextAttribute; import java.util.HashMap; import java.util.Map; -import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment; import de.extio.game_engine.renderer.model.RenderingBoLayer; import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBo; +import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBoTextAlignment; import de.extio.game_engine.spatial2.model.CoordI2; import de.extio.game_engine.spatial2.model.ImmutableCoordI2; import de.extio.game_engine.spatial2.model.MutableCoordI2; diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow.java index f4cf951..2aa8815 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow.java @@ -3,10 +3,10 @@ package de.extio.game_engine.renderer.g2d.bo.rendering; import java.awt.Graphics2D; import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport; -import de.extio.game_engine.renderer.model.ImmutableRgbaColor; import de.extio.game_engine.renderer.model.RenderingBoLayer; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.DrawWindowRenderingBo; +import de.extio.game_engine.renderer.model.color.ImmutableRgbaColor; +import de.extio.game_engine.renderer.model.color.RgbaColor; public class G2DDrawWindow extends G2DAbstractRenderingBo implements DrawWindowRenderingBo { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow2.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow2.java index 9ed95db..70f8b8d 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow2.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow2.java @@ -9,10 +9,10 @@ import java.util.HashMap; import java.util.Map; import de.extio.game_engine.renderer.g2d.G2DRenderer; -import de.extio.game_engine.renderer.model.ImmutableRgbaColor; import de.extio.game_engine.renderer.model.RenderingBoLayer; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.DrawWindowRenderingBo; +import de.extio.game_engine.renderer.model.color.ImmutableRgbaColor; +import de.extio.game_engine.renderer.model.color.RgbaColor; public class G2DDrawWindow2 extends G2DAbstractRenderingBo implements DrawWindowRenderingBo { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java index 12ba010..ddf2453 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java @@ -21,10 +21,10 @@ import de.extio.game_engine.renderer.g2d.control.impl.G2DTextfieldControlImpl2; import de.extio.game_engine.renderer.g2d.control.impl.G2DToggleButtonControlImpl; import de.extio.game_engine.renderer.g2d.control.impl.G2DTooltipControl; import de.extio.game_engine.renderer.g2d.control.impl.G2DWindowCloseButtonControlImpl; -import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment; import de.extio.game_engine.renderer.model.RenderingBoLayer; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo; +import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBoTextAlignment; +import de.extio.game_engine.renderer.model.color.RgbaColor; public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRenderingBo { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControlTooltip.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControlTooltip.java index b04b412..2169625 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControlTooltip.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControlTooltip.java @@ -5,8 +5,8 @@ import java.awt.Graphics2D; import de.extio.game_engine.renderer.g2d.bo.rendering.G2DAbstractRenderingBo; import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont; -import de.extio.game_engine.renderer.model.MutableRgbaColor; import de.extio.game_engine.renderer.model.RenderingBoLayer; +import de.extio.game_engine.renderer.model.color.MutableRgbaColor; import de.extio.game_engine.spatial2.model.CoordI2; public class G2DDrawControlTooltip extends G2DAbstractRenderingBo { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomJTextField.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomJTextField.java index 501218d..7ba2e7a 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomJTextField.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomJTextField.java @@ -9,8 +9,8 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Position.Bias; import de.extio.game_engine.renderer.g2d.control.G2DControlHasExclusiveKeyEvent; -import de.extio.game_engine.renderer.model.ImmutableRgbaColor; -import de.extio.game_engine.renderer.model.RgbaColor; +import de.extio.game_engine.renderer.model.color.ImmutableRgbaColor; +import de.extio.game_engine.renderer.model.color.RgbaColor; @SuppressWarnings("serial") public class CustomJTextField extends JTextField implements G2DControlHasExclusiveKeyEvent { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomLabel.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomLabel.java index 2aed90c..d1425af 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomLabel.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomLabel.java @@ -11,7 +11,7 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont; -import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment; +import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBoTextAlignment; import de.extio.game_engine.spatial2.model.CoordI2; import de.extio.game_engine.spatial2.model.ImmutableCoordI2; diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomWindowCloseButton.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomWindowCloseButton.java index 914ee45..12e1e3a 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomWindowCloseButton.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomWindowCloseButton.java @@ -6,7 +6,7 @@ import java.awt.Graphics2D; import java.awt.event.ActionListener; import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont; -import de.extio.game_engine.renderer.model.RgbaColor; +import de.extio.game_engine.renderer.model.color.RgbaColor; @SuppressWarnings("serial") public class CustomWindowCloseButton extends CustomAbstractButton { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DButtonControlImpl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DButtonControlImpl.java index 42b2c4e..4c07fe9 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DButtonControlImpl.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DButtonControlImpl.java @@ -5,9 +5,9 @@ import java.util.Objects; import de.extio.game_engine.renderer.g2d.G2DRenderer; import de.extio.game_engine.renderer.g2d.control.components.CustomAbstractButton; import de.extio.game_engine.renderer.g2d.control.components.CustomButton; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.ButtonControl; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.renderer.model.event.UiControlEvent; public class G2DButtonControlImpl extends G2DBaseControlImpl implements ButtonControl { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DLabelControlImpl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DLabelControlImpl.java index c8654b9..93e4c3c 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DLabelControlImpl.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DLabelControlImpl.java @@ -2,9 +2,9 @@ package de.extio.game_engine.renderer.g2d.control.impl; import de.extio.game_engine.renderer.g2d.G2DRenderer; import de.extio.game_engine.renderer.g2d.control.components.CustomLabel; -import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment; -import de.extio.game_engine.renderer.model.RgbaColor; +import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBoTextAlignment; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.LabelControl; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.renderer.model.event.UiControlEvent; public class G2DLabelControlImpl extends G2DBaseControlImpl implements LabelControl { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DSliderControlImpl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DSliderControlImpl.java index f78c449..e4ccf55 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DSliderControlImpl.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DSliderControlImpl.java @@ -4,8 +4,8 @@ import java.util.function.Consumer; import de.extio.game_engine.renderer.g2d.G2DRenderer; import de.extio.game_engine.renderer.g2d.control.components.CustomSlider; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.SliderControl; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.renderer.model.event.UiControlEvent; public class G2DSliderControlImpl extends G2DBaseControlImpl implements SliderControl { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTableControlImpl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTableControlImpl.java index f7fcf95..74702b7 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTableControlImpl.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTableControlImpl.java @@ -20,9 +20,9 @@ import de.extio.game_engine.renderer.g2d.G2DRenderer; import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont; import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport; import de.extio.game_engine.renderer.g2d.control.components.CustomTable; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.TableControl; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.renderer.model.event.UiControlEvent; import de.extio.game_engine.spatial2.model.ImmutableCoordI2; diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl.java index 42f1745..4e61f43 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl.java @@ -11,9 +11,9 @@ import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont; import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport; import de.extio.game_engine.renderer.g2d.control.components.CustomTextArea; import de.extio.game_engine.renderer.g2d.control.components.CustomTextField; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.TextfieldControl; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.renderer.model.event.UiControlEvent; public class G2DTextfieldControlImpl extends G2DBaseControlImpl implements TextfieldControl { diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java index b41b5a2..ef31988 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java @@ -14,9 +14,9 @@ import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont; import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport; import de.extio.game_engine.renderer.g2d.control.components.CustomJTextArea; import de.extio.game_engine.renderer.g2d.control.components.CustomJTextField; -import de.extio.game_engine.renderer.model.RgbaColor; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.TextfieldControl; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.renderer.model.event.UiControlEvent; public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements TextfieldControl { diff --git a/src/main/java/de/extio/game_engine/renderer/model/AbstractRenderingBo.java b/src/main/java/de/extio/game_engine/renderer/model/AbstractRenderingBo.java index 354b510..b091543 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/AbstractRenderingBo.java +++ b/src/main/java/de/extio/game_engine/renderer/model/AbstractRenderingBo.java @@ -4,6 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import de.extio.game_engine.renderer.RendererData; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.spatial2.model.HasPosition2; public abstract class AbstractRenderingBo implements RenderingBo { diff --git a/src/main/java/de/extio/game_engine/renderer/model/RenderingBo.java b/src/main/java/de/extio/game_engine/renderer/model/RenderingBo.java index 2eb7428..e572c02 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/RenderingBo.java +++ b/src/main/java/de/extio/game_engine/renderer/model/RenderingBo.java @@ -1,6 +1,7 @@ package de.extio.game_engine.renderer.model; import de.extio.game_engine.renderer.RendererData; +import de.extio.game_engine.renderer.model.color.RgbaColor; import de.extio.game_engine.spatial2.model.HasPosition2; /** diff --git a/src/main/java/de/extio/game_engine/renderer/model/bo/ControlRenderingBo.java b/src/main/java/de/extio/game_engine/renderer/model/bo/ControlRenderingBo.java index 4bd9f0b..beee3fd 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/bo/ControlRenderingBo.java +++ b/src/main/java/de/extio/game_engine/renderer/model/bo/ControlRenderingBo.java @@ -3,9 +3,8 @@ package de.extio.game_engine.renderer.model.bo; import java.util.List; import de.extio.game_engine.renderer.RendererData; -import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment; import de.extio.game_engine.renderer.model.RenderingBoHasDimension; -import de.extio.game_engine.renderer.model.RgbaColor; +import de.extio.game_engine.renderer.model.color.RgbaColor; /** * This bo renders ui controls (buttons, ...) diff --git a/src/main/java/de/extio/game_engine/renderer/model/bo/DrawEffectRenderingBo.java b/src/main/java/de/extio/game_engine/renderer/model/bo/DrawEffectRenderingBo.java index e56e3e9..4afcacc 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/bo/DrawEffectRenderingBo.java +++ b/src/main/java/de/extio/game_engine/renderer/model/bo/DrawEffectRenderingBo.java @@ -2,7 +2,6 @@ package de.extio.game_engine.renderer.model.bo; import java.util.List; -import de.extio.game_engine.renderer.model.DrawEffectRenderingBoEffects; import de.extio.game_engine.renderer.model.RenderingBo; import de.extio.game_engine.spatial2.model.CoordI2; diff --git a/src/main/java/de/extio/game_engine/renderer/model/DrawEffectRenderingBoEffects.java b/src/main/java/de/extio/game_engine/renderer/model/bo/DrawEffectRenderingBoEffects.java similarity index 81% rename from src/main/java/de/extio/game_engine/renderer/model/DrawEffectRenderingBoEffects.java rename to src/main/java/de/extio/game_engine/renderer/model/bo/DrawEffectRenderingBoEffects.java index f2a0735..55a1343 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/DrawEffectRenderingBoEffects.java +++ b/src/main/java/de/extio/game_engine/renderer/model/bo/DrawEffectRenderingBoEffects.java @@ -1,4 +1,4 @@ -package de.extio.game_engine.renderer.model; +package de.extio.game_engine.renderer.model.bo; public enum DrawEffectRenderingBoEffects { diff --git a/src/main/java/de/extio/game_engine/renderer/model/bo/DrawFontRenderingBo.java b/src/main/java/de/extio/game_engine/renderer/model/bo/DrawFontRenderingBo.java index ca8306e..66c3977 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/bo/DrawFontRenderingBo.java +++ b/src/main/java/de/extio/game_engine/renderer/model/bo/DrawFontRenderingBo.java @@ -1,6 +1,5 @@ package de.extio.game_engine.renderer.model.bo; -import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment; import de.extio.game_engine.renderer.model.RenderingBoHasDimension; /** diff --git a/src/main/java/de/extio/game_engine/renderer/model/DrawFontRenderingBoTextAlignment.java b/src/main/java/de/extio/game_engine/renderer/model/bo/DrawFontRenderingBoTextAlignment.java similarity index 61% rename from src/main/java/de/extio/game_engine/renderer/model/DrawFontRenderingBoTextAlignment.java rename to src/main/java/de/extio/game_engine/renderer/model/bo/DrawFontRenderingBoTextAlignment.java index 602dca0..773e168 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/DrawFontRenderingBoTextAlignment.java +++ b/src/main/java/de/extio/game_engine/renderer/model/bo/DrawFontRenderingBoTextAlignment.java @@ -1,4 +1,4 @@ -package de.extio.game_engine.renderer.model; +package de.extio.game_engine.renderer.model.bo; public enum DrawFontRenderingBoTextAlignment { diff --git a/src/main/java/de/extio/game_engine/renderer/model/ImmutableRgbaColor.java b/src/main/java/de/extio/game_engine/renderer/model/color/ImmutableRgbaColor.java similarity index 97% rename from src/main/java/de/extio/game_engine/renderer/model/ImmutableRgbaColor.java rename to src/main/java/de/extio/game_engine/renderer/model/color/ImmutableRgbaColor.java index 876b900..031f61b 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/ImmutableRgbaColor.java +++ b/src/main/java/de/extio/game_engine/renderer/model/color/ImmutableRgbaColor.java @@ -1,4 +1,4 @@ -package de.extio.game_engine.renderer.model; +package de.extio.game_engine.renderer.model.color; import java.awt.Color; import java.util.Objects; diff --git a/src/main/java/de/extio/game_engine/renderer/model/MutableRgbaColor.java b/src/main/java/de/extio/game_engine/renderer/model/color/MutableRgbaColor.java similarity index 98% rename from src/main/java/de/extio/game_engine/renderer/model/MutableRgbaColor.java rename to src/main/java/de/extio/game_engine/renderer/model/color/MutableRgbaColor.java index 091d4f8..e3caa44 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/MutableRgbaColor.java +++ b/src/main/java/de/extio/game_engine/renderer/model/color/MutableRgbaColor.java @@ -1,4 +1,4 @@ -package de.extio.game_engine.renderer.model; +package de.extio.game_engine.renderer.model.color; import java.awt.Color; import java.util.Objects; diff --git a/src/main/java/de/extio/game_engine/renderer/model/RgbaColor.java b/src/main/java/de/extio/game_engine/renderer/model/color/RgbaColor.java similarity index 97% rename from src/main/java/de/extio/game_engine/renderer/model/RgbaColor.java rename to src/main/java/de/extio/game_engine/renderer/model/color/RgbaColor.java index 83fcdc5..3c70255 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/RgbaColor.java +++ b/src/main/java/de/extio/game_engine/renderer/model/color/RgbaColor.java @@ -1,4 +1,4 @@ -package de.extio.game_engine.renderer.model; +package de.extio.game_engine.renderer.model.color; import java.awt.Color; diff --git a/src/main/java/de/extio/game_engine/renderer/UiOptions.java b/src/main/java/de/extio/game_engine/renderer/options/UiOptions.java similarity index 85% rename from src/main/java/de/extio/game_engine/renderer/UiOptions.java rename to src/main/java/de/extio/game_engine/renderer/options/UiOptions.java index 21b0c19..d444425 100644 --- a/src/main/java/de/extio/game_engine/renderer/UiOptions.java +++ b/src/main/java/de/extio/game_engine/renderer/options/UiOptions.java @@ -1,15 +1,10 @@ -package de.extio.game_engine.renderer; +package de.extio.game_engine.renderer.options; import de.extio.game_engine.spatial2.model.CoordI2; import de.extio.game_engine.spatial2.model.MutableCoordI2; -/** - * General options for the client UI - */ public final class UiOptions { - - private String backgroundResourceModName0 = null; - + private String backgroundResourceName0 = null; private boolean backgroundScrolling0; @@ -96,12 +91,4 @@ public final class UiOptions { this.backgroundOffset1 = backgroundOffset1; } - public String getBackgroundResourceModName0() { - return this.backgroundResourceModName0; - } - - public void setBackgroundResourceModName0(final String backgroundResourceModName0) { - this.backgroundResourceModName0 = backgroundResourceModName0; - } - } diff --git a/src/main/java/de/extio/game_engine/renderer/options/VideoOptions.java b/src/main/java/de/extio/game_engine/renderer/options/VideoOptions.java new file mode 100644 index 0000000..ab03c65 --- /dev/null +++ b/src/main/java/de/extio/game_engine/renderer/options/VideoOptions.java @@ -0,0 +1,53 @@ +package de.extio.game_engine.renderer.options; + +public final class VideoOptions { + + private VideoOptionsVideoMode videoMode = VideoOptionsVideoMode.BORDERLESS; + + private int fullScreenNumber = -1; + + private double scaleFactorModifier = 1.0; + + private int frameRateTarget = 60; + + public double getScaleFactorModifier() { + return this.scaleFactorModifier; + } + + public void setScaleFactorModifier(final double scaleFactorModifier) { + this.scaleFactorModifier = scaleFactorModifier; + } + + public VideoOptionsVideoMode getVideoMode() { + return this.videoMode; + } + + public void setVideoMode(final VideoOptionsVideoMode videoMode) { + this.videoMode = videoMode; + } + + public int getFullScreenNumber() { + return this.fullScreenNumber; + } + + public void setFullScreenNumber(final int fullScreenNumber) { + this.fullScreenNumber = fullScreenNumber; + } + + public int getFrameRateTarget() { + return this.frameRateTarget; + } + + public void setFrameRateTarget(final int frameRateTarget) { + this.frameRateTarget = frameRateTarget; + } + + public static enum VideoOptionsVideoMode { + + WINDOW, + BORDERLESS, + FULLSCREEN + + } + +}