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

Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2

Browse Source
This commit is contained in:
Fleischer Hanno
2024-12-08 20:46:58 +01:00
parent e27d325faa bd98f301c8
commit a1d85177c6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,16 +305,18 @@ private float getRotationMove(Vector3f prev, Vector3f next) {
private void movePieceRek(UUID uuid, int curIndex, int moveIndex){ private void movePieceRek(UUID uuid, int curIndex, int moveIndex){
if (curIndex == moveIndex) return; if (curIndex == moveIndex) return;
curIndex = (curIndex + 1) % infield.size(); int nextIndex = (curIndex + 1) % infield.size();
PieceControl pieceControl = pieces.get(uuid); 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, V> K getKeyByValue(Map<K, V> map, V value) {
* @param moveIndex the target index to animate the piece to * @param moveIndex the target index to animate the piece to
*/ */
public void movePieceAnim(UUID uuid, int curIndex, int moveIndex){ public void movePieceAnim(UUID uuid, int curIndex, int moveIndex){
pieces.get(uuid).getSpatial().addControl(new MoveControl( pieces.get(uuid).getSpatial().addControl(new MoveControl(
infield.get(curIndex).getLocation(), infield.get(curIndex).getLocation(),
infield.get(moveIndex).getLocation(), infield.get(moveIndex).getLocation(),