Compare commits

..

No commits in common. "315739646cdfe34ba162c9ab1fa2b6eca5a95df3" and "b4c664927b8dc2de0192b2c752eb97baf9a0d1ef" have entirely different histories.

4 changed files with 7 additions and 15 deletions

View File

@ -72,7 +72,7 @@ public class BoardAppState extends MonopolyAppState {
*/ */
private PopUpManager popUpManager;; private PopUpManager popUpManager;;
private Vector3f currentTarget = new Vector3f(-10f,0,-10f); private Vector3f currentTarget = new Vector3f(0f,0,0f);
/** /**
* Initializes the state by setting up the sky, lights, and other visual components. * Initializes the state by setting up the sky, lights, and other visual components.
@ -86,10 +86,6 @@ public class BoardAppState extends MonopolyAppState {
super.initialize(stateManager, application); super.initialize(stateManager, application);
popUpManager = new PopUpManager(getApp()); popUpManager = new PopUpManager(getApp());
viewNode.attachChild(sceneNode); viewNode.attachChild(sceneNode);
//TODO remove this only for camera testing
adjustCamera();
setupLights(); setupLights();
setupSky(); setupSky();
} }
@ -133,7 +129,7 @@ public class BoardAppState extends MonopolyAppState {
final float x = mx - cos; final float x = mx - cos;
final float y = my - sin; final float y = my - sin;
final Camera camera = getApp().getCamera(); final Camera camera = getApp().getCamera();
camera.setLocation(new Vector3f(0,10,0)); camera.setLocation(new Vector3f(30,20,0));
camera.lookAt(new Vector3f(getCurrentTarget()), camera.lookAt(new Vector3f(getCurrentTarget()),
Vector3f.UNIT_Y); Vector3f.UNIT_Y);
camera.update(); camera.update();
@ -164,7 +160,7 @@ public class BoardAppState extends MonopolyAppState {
super.update(tpf); super.update(tpf);
//TODO remove this only for camera testing //TODO remove this only for camera testing
cameraAngle += TWO_PI * 0.05f * tpf; cameraAngle += TWO_PI * 0.05f * tpf;
// adjustCamera(); adjustCamera();
} }
/** /**

View File

@ -173,13 +173,9 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
final AppSettings settings = new AppSettings(true); final AppSettings settings = new AppSettings(true);
settings.setTitle(lookup("monopoly.name")); settings.setTitle(lookup("monopoly.name"));
try { try {
// 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"))}); 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) { catch (IOException e) {
LOGGER.log(Level.ERROR, e.getMessage()); LOGGER.log(Level.ERROR, e.getMessage());
} }
settings.setResolution(config.getResolutionWidth(), config.getResolutionHeight()); settings.setResolution(config.getResolutionWidth(), config.getResolutionHeight());
@ -292,7 +288,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
final StatsAppState stats = new StatsAppState(guiNode, normalFont); final StatsAppState stats = new StatsAppState(guiNode, normalFont);
stateManager.attach(stats); stateManager.attach(stats);
} }
flyCam.setEnabled(true); flyCam.setEnabled(false);
stateManager.detach(stateManager.getState(StatsAppState.class)); stateManager.detach(stateManager.getState(StatsAppState.class));
stateManager.detach(stateManager.getState(DebugKeysAppState.class)); stateManager.detach(stateManager.getState(DebugKeysAppState.class));