From a7850f7d43a716ac974a038c2765ea3226ecc2ce Mon Sep 17 00:00:00 2001 From: Cedric Beck Date: Sun, 8 Dec 2024 20:42:57 +0100 Subject: [PATCH] fixed rotation --- .../java/pp/mdga/client/board/BoardHandler.java | 13 ++++++++----- .../mdga/model/src/main/java/pp/mdga/game/Game.java | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java index c6013c3a..b60d2b81 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java @@ -305,16 +305,18 @@ private float getRotationMove(Vector3f prev, Vector3f next) { private void movePieceRek(UUID uuid, int curIndex, int moveIndex){ if (curIndex == moveIndex) return; - curIndex = (curIndex + 1) % infield.size(); + int nextIndex = (curIndex + 1) % infield.size(); PieceControl pieceControl = pieces.get(uuid); - NodeControl nodeControl = infield.get(curIndex); + NodeControl nodeCur = infield.get(curIndex); + NodeControl nodeMove = infield.get(nextIndex); - pieceControl.setRotation(getRotationMove(pieceControl.getLocation(),nodeControl.getLocation())); + pieceControl.setRotation(getRotationMove(nodeCur.getLocation(),nodeMove.getLocation())); - movePieceToNode(pieceControl, nodeControl); + movePieceToNode(pieceControl, nodeMove); - movePieceRek(uuid, curIndex, moveIndex); + + movePieceRek(uuid, nextIndex, moveIndex); } /** @@ -760,6 +762,7 @@ private K getKeyByValue(Map map, V value) { * @param moveIndex the target index to animate the piece to */ public void movePieceAnim(UUID uuid, int curIndex, int moveIndex){ + pieces.get(uuid).getSpatial().addControl(new MoveControl( infield.get(curIndex).getLocation(), infield.get(moveIndex).getLocation(), diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java index eaa43c13..c72d7e14 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java @@ -85,7 +85,7 @@ public Game() { gameStatistics = new Statistic(); initializeDrawPile(); board = new Board(); - die = new Die(2,1,6,2,1,3); + die = new Die(2,1,2,2,1,3); } /**