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

feat(renderer): improve container dragging logic and add z-index management

Browse Source
This commit is contained in:
extio-de
2025-12-28 14:08:13 +01:00
parent c98075c5b1
commit 6c8db742c1
1 changed files with 50 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ import de.extio.game_engine.renderer.model.RenderingBo;
import de.extio.game_engine.renderer.model.bo.HorizontalAlignment; import de.extio.game_engine.renderer.model.bo.HorizontalAlignment;
import de.extio.game_engine.renderer.model.bo.VerticalAlignment; import de.extio.game_engine.renderer.model.bo.VerticalAlignment;
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.MouseMoveEvent;
import de.extio.game_engine.renderer.model.event.ViewportResizeEvent; import de.extio.game_engine.renderer.model.event.ViewportResizeEvent;
import de.extio.game_engine.renderer.work.RendererWorkingSet; import de.extio.game_engine.renderer.work.RendererWorkingSet;
@@ -162,26 +163,12 @@ public class Container extends AbstractClientModule implements InitializingBean
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; final Container containerUnderCursor = getContainerUnderCursor(event);
synchronized (DISPLAYED_CONTAINERS) { if (containerUnderCursor == this) {
short zIndexHighest = -1;
for (final var container : DISPLAYED_CONTAINERS) {
if (container.dragging) {
foregroundContainer = container;
break;
}
if (SpatialUtils2.intersects(container.area.getPosition(), container.area.getDimension(), event.getScaledCoord(), ImmutableCoordI2.one())) {
if (container.zIndex > zIndexHighest) {
zIndexHighest = container.zIndex;
foregroundContainer = container;
}
}
}
}
if (foregroundContainer == this) {
if (!this.dragging) { if (!this.dragging) {
this.dragging = true; this.dragging = true;
this.dragPrevPosition = null; this.dragPrevPosition = null;
this.zIndexToTop();
this.LOGGER.debug("Started dragging container {}", this.id); this.LOGGER.debug("Started dragging container {}", this.id);
} }
if (this.dragPrevPosition != null) { if (this.dragPrevPosition != null) {
@@ -196,6 +183,13 @@ public class Container extends AbstractClientModule implements InitializingBean
} }
protected void onMouseClickEvent(final MouseClickEvent event) { protected void onMouseClickEvent(final MouseClickEvent event) {
final Container containerUnderCursor = this.getContainerUnderCursor(event);
if (containerUnderCursor == this) {
if (event.isPressed() && !this.dragging) {
this.zIndexToTop();
}
}
if (!event.isPressed() && this.dragging) { if (!event.isPressed() && this.dragging) {
this.dragging = false; this.dragging = false;
this.dragPrevPosition = null; this.dragPrevPosition = null;
@@ -213,11 +207,11 @@ public class Container extends AbstractClientModule implements InitializingBean
final var uncommitted = this.rendererWorkingSet.getUncommittedWork(this.id); final var uncommitted = this.rendererWorkingSet.getUncommittedWork(this.id);
for (final RenderingBo bo : uncommitted.values()) { for (final RenderingBo bo : uncommitted.values()) {
bo bo
.setZIndex(this.zIndex) .setZIndex(this.zIndex)
.withPositionAbsoluteAnchorTopLeft(this.area.getPosition() .withPositionAbsoluteAnchorTopLeft(this.area.getPosition()
.toMutableCoordD2() .toMutableCoordD2()
.add(bo.getLocalX(), bo.getLocalY()) .add(bo.getLocalX(), bo.getLocalY())
.toImmutableCoordI2()); .toImmutableCoordI2());
this.rendererWorkingSet.put(this.id, bo); this.rendererWorkingSet.put(this.id, bo);
} }
@@ -264,8 +258,28 @@ public class Container extends AbstractClientModule implements InitializingBean
this.draw(); this.draw();
} }
private Container getContainerUnderCursor(final MouseEvent event) {
Container containerUnderCursor = null;
synchronized (DISPLAYED_CONTAINERS) {
short zIndexHighest = -1;
for (final var container : DISPLAYED_CONTAINERS) {
if (container.dragging) {
containerUnderCursor = container;
break;
}
if (SpatialUtils2.intersects(container.area.getPosition(), container.area.getDimension(), event.getScaledCoord(), ImmutableCoordI2.one())) {
if (container.zIndex > zIndexHighest) {
zIndexHighest = container.zIndex;
containerUnderCursor = container;
}
}
}
}
return containerUnderCursor;
}
private void zIndexToTop() { private void zIndexToTop() {
if (! this.draggable) { if (!this.draggable) {
return; return;
} }
@@ -275,10 +289,18 @@ public class Container extends AbstractClientModule implements InitializingBean
continue; continue;
} }
if (container.getzIndex() > this.getzIndex()) { if (container.getzIndex() > this.getzIndex()) {
container.setzIndex((short) (container.getzIndex() - 1)); final var newZIndex = (short) (container.getzIndex() - 1);
if (container.getzIndex() != newZIndex) {
container.setzIndex(newZIndex);
container.draw();
}
} }
} }
this.setzIndex((short) (DISPLAYED_CONTAINERS.size() - 1)); final var newZIndex = (short) (DISPLAYED_CONTAINERS.size() - 1);
if (this.getzIndex() != newZIndex) {
this.setzIndex(newZIndex);
this.draw();
}
} }
} }