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

Development #34

Merged
j23f0779 merged 19 commits from development into dev/model 2024-12-05 17:58:51 +01:00
Conversation 4 Commits 19 Files Changed 34 +177 -45
13 changed files with 177 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9199fbffd8 - Show all commits

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

@@ -115,7 +115,7 @@ public void simpleInitApp() {
gameView = new GameView(this); gameView = new GameView(this);
ceremonyView = new CeremonyView(this); ceremonyView = new CeremonyView(this);
enter(MdgaState.GAME); enter(MdgaState.MAIN);
} }
/** /**

7
Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java
View File

@@ -86,7 +86,7 @@ public void render(RenderManager rm) {
public void update(float tpf) { public void update(float tpf) {
if (init && !cardBuffer.isEmpty()) { if (init && !cardBuffer.isEmpty()) {
for (Spatial spatial : cardBuffer) { for (Spatial spatial : cardBuffer) {
// root.attachChild(spatial); root.attachChild(spatial);
} }
cardBuffer.clear(); cardBuffer.clear();
} }
@@ -94,9 +94,8 @@ public void update(float tpf) {
} }
public void addSpatial(Spatial card) { public void addSpatial(Spatial card) {
// cardBuffer.add(card); if(root == null) cardBuffer.add(card);
root.attachChild(card); else root.attachChild(card);
root = root;
} }
public void deleteSpatial(Spatial spatial) { public void deleteSpatial(Spatial spatial) {

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

@@ -56,7 +56,7 @@ public GameView(MdgaApp app) {
@Override @Override
public void onEnter() { public void onEnter() {
setOwnColor(Color.AIRFORCE); // setOwnColor(Color.AIRFORCE);
camera.init(ownColor); camera.init(ownColor);
boardHandler.init(); boardHandler.init();
guiHandler.init(ownColor); guiHandler.init(ownColor);
@@ -65,10 +65,10 @@ public void onEnter() {
app.getAcousticHandler().playSound(MdgaSound.START); app.getAcousticHandler().playSound(MdgaSound.START);
guiHandler.addPlayer(Color.AIRFORCE, "Cedric"); // guiHandler.addPlayer(Color.AIRFORCE, "Cedric");
guiHandler.addPlayer(Color.ARMY, "Ben"); // guiHandler.addPlayer(Color.ARMY, "Ben");
guiHandler.addPlayer(Color.CYBER, "Felix"); // guiHandler.addPlayer(Color.CYBER, "Felix");
guiHandler.addPlayer(Color.NAVY, "Daniel"); // guiHandler.addPlayer(Color.NAVY, "Daniel");