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

merge after refactoring #16

Merged
j23f0712 merged 21 commits from development into dev/test 2024-11-25 16:52:36 +01:00
Conversation 4 Commits 21 Files Changed 210 +3 -8
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 96489f2454 - Show all commits

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

@@ -17,7 +17,7 @@ public class MdgaApp extends SimpleApplication {
MdgaView view = null;
private MdgaState state = MdgaState.MAIN;
private static float resolutionFactor = 1f;
private static float resolutionFactor = 1.8f;
public static void main(String[] args) {
AppSettings settings = new AppSettings(true);

5
Projekte/mdga/client/src/main/java/pp/mdga/client/board/CameraHandler.java
View File

@@ -33,11 +33,6 @@ public CameraHandler(MdgaApp app, FilterPostProcessor fpp){
}
public void init() {
//app.getFlyByCamera().setEnabled(true);
//int zoom = 20;
//app.getCamera().setLocation(new Vector3f(-zoom, 0, zoom));
//app.getCamera().lookAt(new Vector3f(0, 0, 0), new Vector3f(0, 0, 1));
app.getRootNode().addLight(sun);
app.getRootNode().addLight(ambient);
}

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

@@ -26,7 +26,7 @@ public HostDialog(MdgaApp app, Node node, Runnable backAction) {
Panel imagePanel = new Panel();
imagePanel.setBackground(b);
container.addChild(imagePanel).setPreferredSize(new Vector3f(texture.getImage().getWidth() / 4, texture.getImage().getHeight() / 4, 0));
container.addChild(imagePanel).setPreferredSize(new Vector3f(texture.getImage().getWidth() / 4 * app.getResolutionFactor(), texture.getImage().getHeight() / 4 * app.getResolutionFactor(), 0));
//abstandshalter
container.addChild(new Panel(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));

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

@@ -29,7 +29,7 @@ public JoinDialog(MdgaApp app, Node node, Runnable backAction) {
Panel imagePanel = new Panel();
imagePanel.setBackground(b);
container.addChild(imagePanel).setPreferredSize(new Vector3f(texture.getImage().getWidth() / 4, texture.getImage().getHeight() / 4, 0));
container.addChild(imagePanel).setPreferredSize(new Vector3f(texture.getImage().getWidth() / 4 * app.getResolutionFactor(), texture.getImage().getHeight() / 4 * app.getResolutionFactor(), 0));
//abstandshalter
container.addChild(new Panel(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));