diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/BoardAppState.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/BoardAppState.java index e85bedb..2196dda 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/BoardAppState.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/BoardAppState.java @@ -72,7 +72,7 @@ public class BoardAppState extends MonopolyAppState { */ private PopUpManager popUpManager;; - private Vector3f currentTarget = new Vector3f(0f,0,0f); + private Vector3f currentTarget = new Vector3f(-10f,0,-10f); /** * Initializes the state by setting up the sky, lights, and other visual components. @@ -86,6 +86,10 @@ public class BoardAppState extends MonopolyAppState { super.initialize(stateManager, application); popUpManager = new PopUpManager(getApp()); viewNode.attachChild(sceneNode); + + //TODO remove this only for camera testing + adjustCamera(); + setupLights(); setupSky(); } @@ -129,7 +133,7 @@ public class BoardAppState extends MonopolyAppState { final float x = mx - cos; final float y = my - sin; final Camera camera = getApp().getCamera(); - camera.setLocation(new Vector3f(30,20,0)); + camera.setLocation(new Vector3f(0,10,0)); camera.lookAt(new Vector3f(getCurrentTarget()), Vector3f.UNIT_Y); camera.update(); @@ -160,7 +164,7 @@ public class BoardAppState extends MonopolyAppState { super.update(tpf); //TODO remove this only for camera testing cameraAngle += TWO_PI * 0.05f * tpf; - adjustCamera(); + // adjustCamera(); } /** diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java index 8425a0c..d4a085e 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java @@ -173,9 +173,13 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga final AppSettings settings = new AppSettings(true); settings.setTitle(lookup("monopoly.name")); try { - settings.setIcons(new Image[]{ImageIO.read(new File("src/main/resources/icons/Uniman.png"))}); - } - catch (IOException e) { + // Prüfen, ob das Betriebssystem ein Mac-System ist + if (!System.getProperty("os.name").toLowerCase().contains("mac")) { + settings.setIcons(new Image[]{ImageIO.read(new File("src/main/resources/icons/Uniman.png"))}); + } else { + LOGGER.log(Level.INFO, "Icon setting skipped on macOS due to system restrictions."); + } + } catch (IOException e) { LOGGER.log(Level.ERROR, e.getMessage()); } settings.setResolution(config.getResolutionWidth(), config.getResolutionHeight()); @@ -288,7 +292,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga final StatsAppState stats = new StatsAppState(guiNode, normalFont); stateManager.attach(stats); } - flyCam.setEnabled(false); + flyCam.setEnabled(true); stateManager.detach(stateManager.getState(StatsAppState.class)); stateManager.detach(stateManager.getState(DebugKeysAppState.class)); diff --git a/Projekte/monopoly/client/src/main/resources/models/Spielfiguren/Jagermeister/Jagermeister.j3o b/Projekte/monopoly/client/src/main/resources/models/Spielfiguren/Jagermeister/Jagermeister.j3o new file mode 100644 index 0000000..f49b30b Binary files /dev/null and b/Projekte/monopoly/client/src/main/resources/models/Spielfiguren/Jagermeister/Jagermeister.j3o differ diff --git a/Projekte/monopoly/client/src/main/resources/models/Spielfiguren/Jagermeister/Jagermeister_texture.png b/Projekte/monopoly/client/src/main/resources/models/Spielfiguren/Jagermeister/Jagermeister_texture.png new file mode 100644 index 0000000..478edb9 Binary files /dev/null and b/Projekte/monopoly/client/src/main/resources/models/Spielfiguren/Jagermeister/Jagermeister_texture.png differ