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

added new card order in CardLayerHandler

Browse Source
This commit is contained in:
Cedric Beck
2024-12-09 17:03:35 +01:00
parent e47fcd1643
commit a21794ddc1
4 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
View File

@@ -66,7 +66,7 @@ public class MdgaApp extends SimpleApplication {
private ServerConnection networkConnection; private ServerConnection networkConnection;
public static final int DEBUG_MULTIPLIER = 1; public static final int DEBUG_MULTIPLIER = 0;
public MdgaApp() { public MdgaApp() {
networkConnection = new NetworkSupport(this); networkConnection = new NetworkSupport(this);

35
Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java
View File

@@ -29,6 +29,7 @@ public class CardLayerHandler {
private DiceControl diceControl; private DiceControl diceControl;
private final Map<BonusCard, CardControl> bonusCardControlMap = new HashMap<>(); private final Map<BonusCard, CardControl> bonusCardControlMap = new HashMap<>();
private final List<BonusCard> cardOrder = new ArrayList<>();
private final Map<BonusCard, Integer> bonusCardIntegerMap = new HashMap<>(); private final Map<BonusCard, Integer> bonusCardIntegerMap = new HashMap<>();
private final Set<CardControl> selectableCards = new HashSet<>(); private final Set<CardControl> selectableCards = new HashSet<>();
@@ -80,14 +81,13 @@ public void addCard(BonusCard card) {
if (card == BonusCard.HIDDEN) throw new RuntimeException("Can't add hidden card to GUI"); if (card == BonusCard.HIDDEN) throw new RuntimeException("Can't add hidden card to GUI");
if (!bonusCardControlMap.containsKey(card)) { if (!bonusCardControlMap.containsKey(card)) {
CardControl control = createCard(bonusToAsset(card), nextPos()); cardOrder.add(card);
bonusCardControlMap.put(card, control);
cardLayer.addSpatial(control.getRoot());
} }
int newNum = bonusCardIntegerMap.getOrDefault(card, 0) + 1; int newNum = bonusCardIntegerMap.getOrDefault(card, 0) + 1;
bonusCardIntegerMap.put(card, newNum); bonusCardIntegerMap.put(card, newNum);
bonusCardControlMap.get(card).setNumCard(newNum);
updateCard();
} }
public void removeCard(BonusCard card){ public void removeCard(BonusCard card){
@@ -95,12 +95,11 @@ public void removeCard(BonusCard card){
bonusCardIntegerMap.put(card, bonusCardIntegerMap.get(card) - 1); bonusCardIntegerMap.put(card, bonusCardIntegerMap.get(card) - 1);
if(bonusCardIntegerMap.get(card) <= 0){ if(bonusCardIntegerMap.get(card) <= 0){
cardLayer.deleteSpatial(bonusCardControlMap.get(card).getRoot());
bonusCardIntegerMap.remove(card); bonusCardIntegerMap.remove(card);
bonusCardControlMap.remove(card); cardOrder.remove(card);
}
} }
updateCard();
} else throw new RuntimeException("card is not in bonusCardControlMap");
} }
public void clearSelectableCards() { public void clearSelectableCards() {
@@ -114,6 +113,22 @@ public void clearSelectableCards() {
cardSelect = null; cardSelect = null;
} }
private void updateCard(){
for(BonusCard card : bonusCardControlMap.keySet()){
CardControl control = bonusCardControlMap.get(card);
cardLayer.deleteSpatial(control.getRoot());
}
bonusCardControlMap.clear();
for(int i = 0; i < cardOrder.size(); i++){
BonusCard card = cardOrder.get(i);
CardControl control = createCard(bonusToAsset(card), nextPos(i));
control.setNumCard(bonusCardIntegerMap.get(card));
cardLayer.addSpatial(control.getRoot());
bonusCardControlMap.put(card, control);
}
}
public void setSelectableCards(List<BonusCard> select) { public void setSelectableCards(List<BonusCard> select) {
for (BonusCard card : select) { for (BonusCard card : select) {
selectableCards.add(bonusCardControlMap.get(card)); selectableCards.add(bonusCardControlMap.get(card));
@@ -171,8 +186,8 @@ private Asset bonusToAsset(BonusCard card) {
}; };
} }
private Vector3f nextPos() { private Vector3f nextPos(int i) {
return START.add(MARGIN.mult(bonusCardControlMap.size())); return START.add(MARGIN.mult(i));
} }
private Camera createOverlayCam() { private Camera createOverlayCam() {

2
Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java
View File

@@ -21,7 +21,7 @@
public class DiceControl extends AbstractControl { public class DiceControl extends AbstractControl {
private Quaternion targetRotation; private Quaternion targetRotation;
private final Vector3f angularVelocity = new Vector3f(); private final Vector3f angularVelocity = new Vector3f();
private float deceleration = 1.7f; private float deceleration = 1f;
private float timeElapsed = 0.0f; private float timeElapsed = 0.0f;
private float rollDuration = 1f; private float rollDuration = 1f;
private static final int ANGULAR_MIN = 5; private static final int ANGULAR_MIN = 5;

6
Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
View File

@@ -87,16 +87,16 @@ public Game() {
gameStatistics = new Statistic(); gameStatistics = new Statistic();
initializeDrawPile(); initializeDrawPile();
board = new Board(); board = new Board();
die = new Die(2,1,6,2,1,3); die = new Die(2,4,5,5,1,3);
} }
/** /**
* This method initializes the draw pile with the predefined number of bonus cards. * This method initializes the draw pile with the predefined number of bonus cards.
*/ */
private void initializeDrawPile() { private void initializeDrawPile() {
// this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS);
// this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS);
this.addBonusCards(new ShieldCard(), AMOUNT_OF_SHIELD_CARDS); this.addBonusCards(new ShieldCard(), AMOUNT_OF_SHIELD_CARDS);
this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS);
this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS);
Collections.shuffle(this.drawPile); Collections.shuffle(this.drawPile);
} }