peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge dev into test #28

Merged
j23f0712 merged 29 commits from development into dev/test 2024-12-01 23:11:24 +01:00
Conversation 2 Commits 29 Files Changed 106 +15 -14
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5b007accd - Show all commits

1
Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
View File

@@ -68,7 +68,6 @@ public void init() {
public void shutdown(){ public void shutdown(){
clearSelectable(); clearSelectable();
isInitialised = false; isInitialised = false;
initMap();
rootNode.detachChild(rootNodeBoard); rootNode.detachChild(rootNodeBoard);
} }

12
Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java
View File

@@ -54,7 +54,7 @@ public void select(Spatial model, ColorRGBA color, int width) {
} }
private void hideOutlineFilterEffect(Spatial model) { private void hideOutlineFilterEffect(Spatial model) {
app.enqueue(() -> { // app.enqueue(() -> {
outlineFilter.setEnabled(false); outlineFilter.setEnabled(false);
outlineFilter.getOutlinePreFilter().setEnabled(false); outlineFilter.getOutlinePreFilter().setEnabled(false);
fpp.removeFilter(outlineFilter); fpp.removeFilter(outlineFilter);
@@ -62,12 +62,12 @@ private void hideOutlineFilterEffect(Spatial model) {
outlineViewport.clearProcessors(); outlineViewport.clearProcessors();
renderManager.removePreView(outlineViewport); renderManager.removePreView(outlineViewport);
outlineViewport = null; outlineViewport = null;
return null; // return null;
}); // });
} }
private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color) { private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color) {
app.enqueue(() -> { // app.enqueue(() -> {
outlineViewport = renderManager.createPreView("outlineViewport", cam); outlineViewport = renderManager.createPreView("outlineViewport", cam);
FilterPostProcessor outlineFpp = new FilterPostProcessor(assetManager); FilterPostProcessor outlineFpp = new FilterPostProcessor(assetManager);
@@ -82,7 +82,7 @@ private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color)
outlineFilter.setOutlineWidth(width); outlineFilter.setOutlineWidth(width);
fpp.addFilter(outlineFilter); fpp.addFilter(outlineFilter);
return null; // return null;
}); // });
} }
} }

9
Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
View File

@@ -90,11 +90,11 @@ public void onEnter() {
app.getNotificationSynchronizer().addTestNotification(new PlayerInGameNotification(Color.NAVY, uuid2, "Test")); app.getNotificationSynchronizer().addTestNotification(new PlayerInGameNotification(Color.NAVY, uuid2, "Test"));
app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1, 0, true)); app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1, 0, true));
app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1_2, 30, true)); app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1_2, 30, true));
app.getNotificationSynchronizer().addTestNotification(new SelectableMoveNotification(List.of(p1), List.of(4), List.of(false))); // app.getNotificationSynchronizer().addTestNotification(new SelectableMoveNotification(List.of(p1), List.of(4), List.of(false)));
app.getNotificationSynchronizer().addTestNotification(new AcquireCardNotification(BonusCard.SHIELD)); app.getNotificationSynchronizer().addTestNotification(new AcquireCardNotification(BonusCard.SHIELD));
app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD))); app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD)));
app.getNotificationSynchronizer().addTestNotification(new ShieldActiveNotification(p1)); // app.getNotificationSynchronizer().addTestNotification(new ShieldActiveNotification(p1));
app.getNotificationSynchronizer().addTestNotification(new ActivePlayerNotification(Color.NAVY)); // app.getNotificationSynchronizer().addTestNotification(new ActivePlayerNotification(Color.NAVY));
// app.getNotificationSynchronizer().addTestNotification(new DiceNowNotification()); // app.getNotificationSynchronizer().addTestNotification(new DiceNowNotification());
// app.getNotificationSynchronizer().addTestNotification(new RollDiceNotification(Color.AIRFORCE, 5, true, 2)); // app.getNotificationSynchronizer().addTestNotification(new RollDiceNotification(Color.AIRFORCE, 5, true, 2));
@@ -107,9 +107,10 @@ public void onEnter() {
@Override @Override
public void onLeave() { public void onLeave() {
camera.shutdown();
boardHandler.shutdown(); boardHandler.shutdown();
guiHandler.shutdown(); guiHandler.shutdown();
camera.shutdown();
confirmButton.hide(); confirmButton.hide();

7
Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java
View File

@@ -51,8 +51,8 @@ public void enter() {
} }
public void leave() { public void leave() {
app.getRootNode().detachChild(rootNode); onLeave();
app.getGuiNode().detachChild(guiNode);
settingsButton.hide(); settingsButton.hide();
@@ -60,7 +60,8 @@ public void leave() {
pressEscape(); pressEscape();
} }
onLeave(); app.getRootNode().detachChild(rootNode);
app.getGuiNode().detachChild(guiNode);
} }
public void enterOverlay(Overlay overlay) { public void enterOverlay(Overlay overlay) {