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

merge development into test #26

Merged
j23f0712 merged 95 commits from development into dev/test 2024-12-01 21:02:48 +01:00
Conversation 2 Commits 95 Files Changed 270 +8 -3
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eec68188ee - Show all commits

6
Projekte/mdga/client/src/main/java/pp/mdga/client/button/ClickButton.java
View File

@@ -27,12 +27,12 @@ public abstract class ClickButton extends AbstractButton {
instance = new Button(label); instance = new Button(label);
instance.addClickCommands((_) -> action.run()); instance.addClickCommands((button) -> action.run());
instance.setTextHAlignment(HAlignment.Center); instance.setTextHAlignment(HAlignment.Center);
instance.setTextVAlignment(VAlignment.Center); instance.setTextVAlignment(VAlignment.Center);
instance.addCommands(Button.ButtonAction.HighlightOn, (_) -> click()); instance.addCommands(Button.ButtonAction.HighlightOn, (button) -> click());
instance.addCommands(Button.ButtonAction.HighlightOff, (_) -> release()); instance.addCommands(Button.ButtonAction.HighlightOff, (button) -> release());
instance.setFont(font); instance.setFont(font);

5
Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java
View File

@@ -52,6 +52,11 @@ public LobbyView(MdgaApp app) {
@Override @Override
public void onEnter() { public void onEnter() {
app.getCamera().setParallelProjection(true);
float aspect = (float) app.getCamera().getWidth() / app.getCamera().getHeight();
float size = 1.65f;
app.getCamera().setFrustum(-1000, 1000, -aspect * size, aspect * size, size, -size);
settingsButton.show(); settingsButton.show();
leaveButton.show(); leaveButton.show();