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

refactor(container): Simplify position adjustment by removing normalization calculations

Browse Source
This commit is contained in:
extio-de
2025-12-26 18:18:15 +01:00
parent dbcb6609d5
commit 87287ad5f7
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/de/extio/game_engine/renderer/container/Container.java
View File

@@ -137,9 +137,7 @@ public class Container extends AbstractClientModule implements InitializingBean
adjustedY = viewportDimension.getY() - dimension.getY(); adjustedY = viewportDimension.getY() - dimension.getY();
} }
final var normalizedX = this.calculateNormalizedX(adjustedX); this.normalizedArea.getPosition().setXY(adjustedX, adjustedY);
final var normalizedY = this.calculateNormalizedY(adjustedY);
this.normalizedArea.getPosition().setXY(normalizedX, normalizedY);
this.area.getPosition().setXY(adjustedX, adjustedY); this.area.getPosition().setXY(adjustedX, adjustedY);
this.LOGGER.debug("Adjusted container {} position to {},{} to remain visible in viewport", this.id, adjustedX, adjustedY); this.LOGGER.debug("Adjusted container {} position to {},{} to remain visible in viewport", this.id, adjustedX, adjustedY);
@@ -158,22 +156,6 @@ public class Container extends AbstractClientModule implements InitializingBean
return width * height; return width * height;
} }
protected int calculateNormalizedX(final int actualX) {
return switch (this.horizontalAlignment) {
case LEFT -> actualX;
case CENTER -> actualX - (this.rendererControl.getEffectiveViewportDimension().getX() - RendererControl.REFERENCE_RESOLUTION.getX()) / 2;
case RIGHT -> actualX - (this.rendererControl.getEffectiveViewportDimension().getX() - RendererControl.REFERENCE_RESOLUTION.getX());
};
}
protected int calculateNormalizedY(final int actualY) {
return switch (this.verticalAlignment) {
case TOP -> actualY;
case CENTER -> actualY - (this.rendererControl.getEffectiveViewportDimension().getY() - RendererControl.REFERENCE_RESOLUTION.getY()) / 2;
case BOTTOM -> actualY - (this.rendererControl.getEffectiveViewportDimension().getY() - RendererControl.REFERENCE_RESOLUTION.getY());
};
}
protected void onMouseMoveEvent(final MouseMoveEvent event) { protected void onMouseMoveEvent(final MouseMoveEvent event) {
if (this.draggable && event.isDrag()) { if (this.draggable && event.isDrag()) {
Container foregroundContainer = null; Container foregroundContainer = null;