exo/game-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(renderer): clean up imports and improve code formatting in ScrollArea

Browse Source
This commit is contained in:
extio-de
2025-12-29 19:47:57 +01:00
parent 8d3788b930
commit b0256f9cb1
1 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/de/extio/game_engine/renderer/container/ScrollArea.java
View File

@@ -10,20 +10,13 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import de.extio.game_engine.event.EventService; import de.extio.game_engine.event.EventService;
import de.extio.game_engine.module.ModuleService;
import de.extio.game_engine.renderer.RendererControl;
import de.extio.game_engine.renderer.g2d.control.G2DDrawControl;
import de.extio.game_engine.renderer.model.RenderingBo; import de.extio.game_engine.renderer.model.RenderingBo;
import de.extio.game_engine.renderer.model.RenderingBoHasDimension; import de.extio.game_engine.renderer.model.RenderingBoHasDimension;
import de.extio.game_engine.renderer.model.RenderingBoLayer; import de.extio.game_engine.renderer.model.RenderingBoLayer;
import de.extio.game_engine.renderer.model.bo.ControlRenderingBo; 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.bo.ControlRenderingBo.SliderControl;
import de.extio.game_engine.renderer.model.color.RgbaColor;
import de.extio.game_engine.renderer.model.event.MouseClickEvent; import de.extio.game_engine.renderer.model.event.MouseClickEvent;
import de.extio.game_engine.renderer.model.event.MouseEvent;
import de.extio.game_engine.renderer.model.event.MouseMoveEvent;
import de.extio.game_engine.renderer.model.event.UiControlEvent; import de.extio.game_engine.renderer.model.event.UiControlEvent;
import de.extio.game_engine.renderer.work.RendererWorkingSet;
import de.extio.game_engine.renderer.work.RenderingBoPool; import de.extio.game_engine.renderer.work.RenderingBoPool;
import de.extio.game_engine.spatial2.SpatialUtils2; import de.extio.game_engine.spatial2.SpatialUtils2;
import de.extio.game_engine.spatial2.model.Area2; import de.extio.game_engine.spatial2.model.Area2;
@@ -63,7 +56,6 @@ public class ScrollArea implements WindowComponent {
protected double scrollPositionHorizontal = 0.0; protected double scrollPositionHorizontal = 0.0;
public ScrollArea(final RenderingBoPool renderingBoPool, final EventService eventService) { public ScrollArea(final RenderingBoPool renderingBoPool, final EventService eventService) {
this.renderingBoPool = renderingBoPool; this.renderingBoPool = renderingBoPool;
this.eventService = eventService; this.eventService = eventService;
@@ -100,8 +92,7 @@ public class ScrollArea implements WindowComponent {
this.relativeArea.getPosition().add(this.parent.getAbsolutePosition()), this.relativeArea.getPosition().add(this.parent.getAbsolutePosition()),
this.relativeArea.getDimension(), this.relativeArea.getDimension(),
event.getScaledCoord(), event.getScaledCoord(),
ImmutableCoordI2.one() ImmutableCoordI2.one())) {
)) {
return; return;
} }
@@ -128,13 +119,13 @@ public class ScrollArea implements WindowComponent {
if (needsHorizontalScrollbar || needsVerticalScrollbar) { if (needsHorizontalScrollbar || needsVerticalScrollbar) {
for (final var bo : renderingBos) { for (final var bo : renderingBos) {
if (bo instanceof final RenderingBoHasDimension boWithDim && this.renderingBoIds.contains(bo.getId())) { if (this.renderingBoIds.contains(bo.getId())) {
boWithDim.withVisibleArea( bo.withVisibleArea(
this.parent.getAbsolutePosition().getX() + this.relativeArea.getPosition().getX(), this.parent.getAbsolutePosition().getX() + this.relativeArea.getPosition().getX(),
this.parent.getAbsolutePosition().getY() + this.relativeArea.getPosition().getY(), this.parent.getAbsolutePosition().getY() + this.relativeArea.getPosition().getY(),
this.relativeArea.getDimension().getX() - (needsVerticalScrollbar ? SCROLLBAR_WIDTH_WITH_MARGIN : 0), this.relativeArea.getDimension().getX() - (needsVerticalScrollbar ? SCROLLBAR_WIDTH_WITH_MARGIN : 0),
this.relativeArea.getDimension().getY() - (needsHorizontalScrollbar ? SCROLLBAR_WIDTH_WITH_MARGIN : 0)); this.relativeArea.getDimension().getY() - (needsHorizontalScrollbar ? SCROLLBAR_WIDTH_WITH_MARGIN : 0));
this.parent.putRenderingBo(boWithDim); this.parent.putRenderingBo(bo);
} }
} }
@@ -175,9 +166,9 @@ public class ScrollArea implements WindowComponent {
} }
@Override @Override
public CoordI2 getRenderingBoExtraOffset(RenderingBo renderingBo) { public CoordI2 getRenderingBoExtraOffset(final RenderingBo renderingBo) {
int startX = (int) (this.scrollPositionHorizontal * (this.contentDimension.getX() - this.relativeArea.getDimension().getX() + SCROLLBAR_WIDTH_WITH_MARGIN)); final int startX = (int) (this.scrollPositionHorizontal * (this.contentDimension.getX() - this.relativeArea.getDimension().getX() + SCROLLBAR_WIDTH_WITH_MARGIN));
int startY = (int) ((1.0 - this.scrollPositionVertical) * (this.contentDimension.getY() - this.relativeArea.getDimension().getY() + SCROLLBAR_WIDTH_WITH_MARGIN)); final int startY = (int) ((1.0 - this.scrollPositionVertical) * (this.contentDimension.getY() - this.relativeArea.getDimension().getY() + SCROLLBAR_WIDTH_WITH_MARGIN));
return ImmutableCoordI2.create(-startX, -startY); return ImmutableCoordI2.create(-startX, -startY);
} }
@@ -214,15 +205,15 @@ public class ScrollArea implements WindowComponent {
return this.relativeArea.getPosition(); return this.relativeArea.getPosition();
} }
public void setRelativePosition(CoordI2 relativePosition) { public void setRelativePosition(final CoordI2 relativePosition) {
this.relativeArea.setPosition(relativePosition.toImmutableCoordI2()); this.relativeArea.setPosition(relativePosition.toImmutableCoordI2());
} }
public void setDimension(CoordI2 dimension) { public void setDimension(final CoordI2 dimension) {
this.relativeArea.setDimension(dimension.toImmutableCoordI2()); this.relativeArea.setDimension(dimension.toImmutableCoordI2());
} }
public void setRelativeArea(Area2 relativeArea) { public void setRelativeArea(final Area2 relativeArea) {
this.relativeArea.setPosition(relativeArea.getPosition().toImmutableCoordI2()); this.relativeArea.setPosition(relativeArea.getPosition().toImmutableCoordI2());
this.relativeArea.setDimension(relativeArea.getDimension().toImmutableCoordI2()); this.relativeArea.setDimension(relativeArea.getDimension().toImmutableCoordI2());
} }
@@ -233,7 +224,7 @@ public class ScrollArea implements WindowComponent {
} }
@Override @Override
public void setParent(Window window) { public void setParent(final Window window) {
this.parent = window; this.parent = window;
} }