peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-04-17 12:40:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: peet:c758ba97350c9c60e919b8661c6648efd5b125ba
Branches Tags
peet:main
peet:gui
peet:demo
peet:reworkedGui
peet:Testhandbuch
peet:logic
peet:connect
peet:client_logic
peet:b_szepielewicz_filip
peet:b_puderbach_luca
peet:b_wilkening_simon
peet:b_schmidt_yvonne
peet:b_schmelz_johannes
peet:revert-f248a77c
peet:b_Mueller_Tamino
peet:b_malkmus_dennis
peet:revert-71a4ac8d
peet:b_Schmelz_Johannes
..
compare: peet:6b110c81c84ebb36807c4fb7c1300be49cf1ba57
Branches Tags
peet:main
peet:gui
peet:demo
peet:reworkedGui
peet:Testhandbuch
peet:logic
peet:connect
peet:client_logic
peet:b_szepielewicz_filip
peet:b_puderbach_luca
peet:b_wilkening_simon
peet:b_schmidt_yvonne
peet:b_schmelz_johannes
peet:revert-f248a77c
peet:b_Mueller_Tamino
peet:b_malkmus_dennis
peet:revert-71a4ac8d
peet:b_Schmelz_Johannes

No commits in common. "c758ba97350c9c60e919b8661c6648efd5b125ba" and "6b110c81c84ebb36807c4fb7c1300be49cf1ba57" have entirely different histories.
c758ba9735 ... 6b110c81c8

2 changed files with 21 additions and 21 deletions
Show Stats Expand all files Collapse all files

2
Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
View File

@ -87,7 +87,7 @@ selector("label-Bold", "pp") {
selector("label-toolbar", "pp") { selector("label-toolbar", "pp") {
insets = new Insets3f(2, 2, 2, 2) insets = new Insets3f(2, 2, 2, 2)
font = font("Interface/Fonts/Metropolis/Metropolis-Bold-32.fnt") font = font("Interface/Fonts/Metropolis/Metropolis-Bold-32.fnt")
fontSize = 25 fontSize = 30
color = new ColorRGBA(ColorRGBA.White) color = new ColorRGBA(ColorRGBA.White)
textHAlignment = HAlignment.Center textHAlignment = HAlignment.Center
textVAlignment = VAlignment.Center textVAlignment = VAlignment.Center

24
Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java
View File

@ -156,28 +156,30 @@ public class Toolbar extends Dialog implements GameEventListener {
// Oberer Balken mit der Spielerfarbe // Oberer Balken mit der Spielerfarbe
Container playerColorBar = new Container(); Container playerColorBar = new Container();
playerColorBar.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 5, 0)); // Höhe des oberen Balkens playerColorBar.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 5, 0)); // Höhe des oberen Balkens
playerColorBar.setBackground(new QuadBackgroundComponent(currentPlayerColor.getColor())); // Use player color playerColorBar.setBackground(new QuadBackgroundComponent(ColorRGBA.DarkGray));
playerColorBar.setLocalTranslation(0, 205, 3); // Position über der Toolbar playerColorBar.setLocalTranslation(0, 205, 3); // Position über der Toolbar
app.getGuiNode().attachChild(playerColorBar); app.getGuiNode().attachChild(playerColorBar);
// Unterer Balken mit der Spielerfarbe
// unterer Balken
Container playerColorBarbot = new Container(); Container playerColorBarbot = new Container();
playerColorBarbot.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 10, 0)); // Höhe des unteren Balkens playerColorBarbot.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 10, 0)); // Höhe des oberen Balkens
playerColorBarbot.setBackground(new QuadBackgroundComponent(currentPlayerColor.getColor())); // Use player color playerColorBarbot.setBackground(new QuadBackgroundComponent(ColorRGBA.DarkGray));
playerColorBarbot.setLocalTranslation(0, 5, 3); // Position über der Toolbar playerColorBarbot.setLocalTranslation(0, 5, 3); // Position über der Toolbar
app.getGuiNode().attachChild(playerColorBarbot); app.getGuiNode().attachChild(playerColorBarbot);
// Linker Balken mit der Spielerfarbe
// Linker Balken
Container leftBar = new Container(); Container leftBar = new Container();
leftBar.setPreferredSize(new Vector3f(5, 210, 0)); // Breite 5, Höhe 210 leftBar.setPreferredSize(new Vector3f(5, 210, 0)); // Breite 10, Höhe 210
leftBar.setBackground(new QuadBackgroundComponent(currentPlayerColor.getColor())); // Use player color leftBar.setBackground(new QuadBackgroundComponent(ColorRGBA.DarkGray));
leftBar.setLocalTranslation(0, 200, 3); // Position am linken Rand leftBar.setLocalTranslation(0, 200, 3); // Position am linken Rand
app.getGuiNode().attachChild(leftBar); app.getGuiNode().attachChild(leftBar);
// Rechter Balken mit der Spielerfarbe // Rechter Balken
Container rightBar = new Container(); Container rightBar = new Container();
rightBar.setPreferredSize(new Vector3f(5, 210, 0)); // Breite 5, Höhe 210 rightBar.setPreferredSize(new Vector3f(5, 210, 0)); // Breite 10, Höhe 210
rightBar.setBackground(new QuadBackgroundComponent(currentPlayerColor.getColor())); // Use player color rightBar.setBackground(new QuadBackgroundComponent(ColorRGBA.DarkGray));
rightBar.setLocalTranslation(app.getCamera().getWidth() - 5, 200, 2); // Position am rechten Rand rightBar.setLocalTranslation(app.getCamera().getWidth() - 5, 200, 2); // Position am rechten Rand
app.getGuiNode().attachChild(rightBar); app.getGuiNode().attachChild(rightBar);
@ -511,8 +513,6 @@ public class Toolbar extends Dialog implements GameEventListener {
// Farbe setzen // Farbe setzen
playerLabel.setColor(playerColor); playerLabel.setColor(playerColor);
playerLabel.setFontSize(20);
// Label zum Container hinzufügen // Label zum Container hinzufügen
overviewContainer.addChild(playerLabel); overviewContainer.addChild(playerLabel);
} }