Refac

armin-reichert · armin-reichert · commit 56b5de3acb59 · 2025-08-09T15:50:18.000+02:00
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_UIConfig.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_UIConfig.java
@@ -276,7 +276,7 @@ public GameScene selectGameScene(GameContext gameContext) {
                 int cutSceneNumber = gameContext.theGame().<Integer>getProperty("intermissionTestNumber");
                 yield SCENE_ID_CUT_SCENE_N_2D.formatted(cutSceneNumber);
             }
-            default -> GameUI.property3DEnabled.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
+            default -> GameUI.PROPERTY_3D_ENABLED.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
         };
         return scenesByID.get(sceneID);
     }
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_UIConfig.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_UIConfig.java
@@ -264,7 +264,7 @@ public GameScene selectGameScene(GameContext gameContext) {
                 int cutSceneNumber = gameContext.theGame().<Integer>getProperty("intermissionTestNumber");
                 yield SCENE_ID_CUT_SCENE_N_2D.formatted(cutSceneNumber);
             }
-            default -> GameUI.property3DEnabled.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
+            default -> GameUI.PROPERTY_3D_ENABLED.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
         };
         return scenesByID.get(sceneID);
     }
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadeCommon_PlayScene2D.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadeCommon_PlayScene2D.java
@@ -119,7 +119,7 @@ public List<MenuItem> supplyContextMenuItems(ContextMenuEvent contextMenuEvent,
         miImmunity.selectedProperty().bindBidirectional(gameContext().theGameController().propertyImmunity());
 
         var miMuted = new CheckMenuItem(ui.theAssets().text("muted"));
-        miMuted.selectedProperty().bindBidirectional(GameUI.propertyMuted);
+        miMuted.selectedProperty().bindBidirectional(GameUI.PROPERTY_MUTED);
 
         var miQuit = new MenuItem(ui.theAssets().text("quit"));
         miQuit.setOnAction(e -> ACTION_QUIT_GAME_SCENE.executeIfEnabled(ui));
diff --git a/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_StartPageMenu.java b/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_StartPageMenu.java
@@ -196,7 +196,7 @@ public String selectedValueText() {
         @Override
         protected void onValueChanged(int index) {
             state.play3D = selectedValue();
-            GameUI.property3DEnabled.set(state.play3D);
+            GameUI.PROPERTY_3D_ENABLED.set(state.play3D);
             logState();
         }
 
@@ -293,7 +293,7 @@ public void syncMenuState() {
         mapSelector.loadAllMaps();
         final boolean customMapsExist = !mapSelector.customMaps().isEmpty();
 
-        state.play3D = GameUI.property3DEnabled.get();
+        state.play3D = GameUI.PROPERTY_3D_ENABLED.get();
         state.cutScenesEnabled = game.areCutScenesEnabled();
         state.mapOrder = mapSelector.mapSelectionMode();
         logState();
diff --git a/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_MsPacMan_UIConfig.java b/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_MsPacMan_UIConfig.java
@@ -276,7 +276,7 @@ public GameScene selectGameScene(GameContext gameContext) {
                 int cutSceneNumber = gameContext.theGame().<Integer>getProperty("intermissionTestNumber");
                 yield SCENE_ID_CUT_SCENE_N_2D.formatted(cutSceneNumber);
             }
-            default -> GameUI.property3DEnabled.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
+            default -> GameUI.PROPERTY_3D_ENABLED.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
         };
         return scenesByID.get(sceneID);
     }
diff --git a/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_UIConfig.java b/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_UIConfig.java
@@ -258,7 +258,7 @@ public GameScene selectGameScene(GameContext gameContext) {
                 int cutSceneNumber = gameContext.theGame().<Integer>getProperty("intermissionTestNumber");
                 yield SCENE_ID_CUT_SCENE_N_2D.formatted(cutSceneNumber);
             }
-            default -> GameUI.property3DEnabled.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
+            default -> GameUI.PROPERTY_3D_ENABLED.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
         };
         return scenesByID.get(sceneID);
     }
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/TengenMsPacMan_UIConfig.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/TengenMsPacMan_UIConfig.java
@@ -305,7 +305,7 @@ public TengenMsPacMan_SpriteSheet spriteSheet() {
     @Override
     public TengenMsPacMan_GameRenderer createGameRenderer(Canvas canvas) {
         var renderer = new TengenMsPacMan_GameRenderer(ui.theAssets(), spriteSheet(), mapRepository, canvas);
-        renderer.backgroundColorProperty().bind(GameUI.propertyCanvasBackgroundColor);
+        renderer.backgroundColorProperty().bind(GameUI.PROPERTY_CANVAS_BACKGROUND_COLOR);
         return renderer;
     }
 
@@ -426,7 +426,7 @@ public GameScene selectGameScene(GameContext gameContext) {
                 int cutSceneNumber = gameContext.theGame().<Integer>getProperty("intermissionTestNumber");
                 yield SCENE_ID_CUT_SCENE_N_2D.formatted(cutSceneNumber);
             }
-            default -> GameUI.property3DEnabled.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
+            default -> GameUI.PROPERTY_3D_ENABLED.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;
         };
         return scenesByID.get(sceneID);
     }
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_GameLevel3D.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_GameLevel3D.java
@@ -33,7 +33,7 @@ private void addGameInfoView() {
         int scaling = 5; // for better snapshot resolution
 
         var canvas = new Canvas(scaling * width, scaling * height);
-        fillCanvas(canvas, GameUI.property3DFloorColor.get());
+        fillCanvas(canvas, GameUI.PROPERTY_3D_FLOOR_COLOR.get());
 
         var renderer = (TengenMsPacMan_GameRenderer) ui.theConfiguration().createGameRenderer(canvas);
         renderer.ctx().setImageSmoothing(false); // important for sharp image!
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_PlayScene2D.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_PlayScene2D.java
@@ -212,7 +212,7 @@ public List<MenuItem> supplyContextMenuItems(ContextMenuEvent menuEvent, Context
         miImmunity.selectedProperty().bindBidirectional(theGameContext().theGameController().propertyImmunity());
 
         var miMuted = new CheckMenuItem(ui.theAssets().text("muted"));
-        miMuted.selectedProperty().bindBidirectional(GameUI.propertyMuted);
+        miMuted.selectedProperty().bindBidirectional(GameUI.PROPERTY_MUTED);
 
         var miQuit = new MenuItem(ui.theAssets().text("quit"));
         miQuit.setOnAction(e -> ACTION_QUIT_GAME_SCENE.executeIfEnabled(ui));
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/GameUI.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/GameUI.java
@@ -37,26 +37,26 @@ public interface GameUI {
 
     static GameUI theUI() { return PacManGames_UI_Impl.THE_ONE; }
 
-    ObjectProperty<Color> propertyCanvasBackgroundColor  = new SimpleObjectProperty<>(Color.BLACK);
-    BooleanProperty propertyCanvasFontSmoothing          = new SimpleBooleanProperty(false);
-    ObjectProperty<GameScene> propertyCurrentGameScene   = new SimpleObjectProperty<>();
-    ObjectProperty<PacManGames_View> propertyCurrentView = new SimpleObjectProperty<>();
-    BooleanProperty propertyCanvasImageSmoothing         = new SimpleBooleanProperty(false);
-    BooleanProperty propertyDebugInfoVisible             = new SimpleBooleanProperty(false);
-    IntegerProperty propertyMiniViewHeight               = new SimpleIntegerProperty(400);
-    BooleanProperty propertyMiniViewOn                   = new SimpleBooleanProperty(false);
-    IntegerProperty propertyMiniViewOpacityPercent       = new SimpleIntegerProperty(69);
-    BooleanProperty propertyMuted                        = new SimpleBooleanProperty(false);
-    IntegerProperty propertySimulationSteps              = new SimpleIntegerProperty(1);
-    BooleanProperty property3DAxesVisible                = new SimpleBooleanProperty(false);
-    ObjectProperty<DrawMode> property3DDrawMode          = new SimpleObjectProperty<>(DrawMode.FILL);
-    BooleanProperty property3DEnabled                    = new SimpleBooleanProperty(false);
-    BooleanProperty property3DEnergizerExplodes          = new SimpleBooleanProperty(true);
-    ObjectProperty<Color> property3DFloorColor           = new SimpleObjectProperty<>(Color.rgb(20,20,20));
-    ObjectProperty<Color> property3DLightColor           = new SimpleObjectProperty<>(Color.WHITE);
-    ObjectProperty<PerspectiveID> property3DPerspective  = new SimpleObjectProperty<>(PerspectiveID.TRACK_PLAYER);
-    DoubleProperty property3DWallHeight                  = new SimpleDoubleProperty();
-    DoubleProperty property3DWallOpacity                 = new SimpleDoubleProperty(1.0);
+    ObjectProperty<Color> PROPERTY_CANVAS_BACKGROUND_COLOR = new SimpleObjectProperty<>(Color.BLACK);
+    BooleanProperty PROPERTY_CANVAS_FONT_SMOOTHING = new SimpleBooleanProperty(false);
+    ObjectProperty<GameScene> PROPERTY_CURRENT_GAME_SCENE = new SimpleObjectProperty<>();
+    ObjectProperty<PacManGames_View> PROPERTY_CURRENT_VIEW = new SimpleObjectProperty<>();
+    BooleanProperty PROPERTY_CANVAS_IMAGE_SMOOTHING = new SimpleBooleanProperty(false);
+    BooleanProperty PROPERTY_DEBUG_INFO_VISIBLE = new SimpleBooleanProperty(false);
+    IntegerProperty PROPERTY_MINI_VIEW_HEIGHT = new SimpleIntegerProperty(400);
+    BooleanProperty PROPERTY_MINI_VIEW_ON = new SimpleBooleanProperty(false);
+    IntegerProperty PROPERTY_MINI_VIEW_OPACITY_PERCENT = new SimpleIntegerProperty(69);
+    BooleanProperty PROPERTY_MUTED = new SimpleBooleanProperty(false);
+    IntegerProperty PROPERTY_SIMULATION_STEPS = new SimpleIntegerProperty(1);
+    BooleanProperty PROPERTY_3D_AXES_VISIBLE = new SimpleBooleanProperty(false);
+    ObjectProperty<DrawMode> PROPERTY_3D_DRAW_MODE = new SimpleObjectProperty<>(DrawMode.FILL);
+    BooleanProperty PROPERTY_3D_ENABLED = new SimpleBooleanProperty(false);
+    BooleanProperty PROPERTY_3D_ENERGIZER_EXPLODES = new SimpleBooleanProperty(true);
+    ObjectProperty<Color> PROPERTY_3D_FLOOR_COLOR = new SimpleObjectProperty<>(Color.rgb(20,20,20));
+    ObjectProperty<Color> PROPERTY_3D_LIGHT_COLOR = new SimpleObjectProperty<>(Color.WHITE);
+    ObjectProperty<PerspectiveID> PROPERTY_3D_PERSPECTIVE = new SimpleObjectProperty<>(PerspectiveID.TRACK_PLAYER);
+    DoubleProperty PROPERTY_3D_WALL_HEIGHT = new SimpleDoubleProperty();
+    DoubleProperty PROPERTY_3D_WALL_OPACITY = new SimpleDoubleProperty(1.0);
 
     List<ActionBinding> DEFAULT_ACTION_BINDINGS = List.of(
         new ActionBinding(ACTION_ARCADE_INSERT_COIN,      nude(KeyCode.DIGIT5), nude(KeyCode.NUMPAD5)),
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/PacManGames_GameActions.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/PacManGames_GameActions.java
@@ -197,8 +197,8 @@ public boolean isEnabled(GameUI ui) {
     GameAction ACTION_PERSPECTIVE_NEXT = new GameAction("PERSPECTIVE_NEXT") {
         @Override
         public void execute(GameUI ui) {
-            PerspectiveID id = GameUI.property3DPerspective.get().next();
-            GameUI.property3DPerspective.set(id);
+            PerspectiveID id = GameUI.PROPERTY_3D_PERSPECTIVE.get().next();
+            GameUI.PROPERTY_3D_PERSPECTIVE.set(id);
             String msgKey = ui.theAssets().text("camera_perspective", ui.theAssets().text("perspective_id_" + id.name()));
             ui.showFlashMessage(msgKey);
         }
@@ -207,8 +207,8 @@ public void execute(GameUI ui) {
     GameAction ACTION_PERSPECTIVE_PREVIOUS = new GameAction("PERSPECTIVE_PREVIOUS") {
         @Override
         public void execute(GameUI ui) {
-            PerspectiveID id = GameUI.property3DPerspective.get().prev();
-            GameUI.property3DPerspective.set(id);
+            PerspectiveID id = GameUI.PROPERTY_3D_PERSPECTIVE.get().prev();
+            GameUI.PROPERTY_3D_PERSPECTIVE.set(id);
             String msgKey = ui.theAssets().text("camera_perspective", ui.theAssets().text("perspective_id_" + id.name()));
             ui.showFlashMessage(msgKey);
         }
@@ -367,14 +367,14 @@ public String name() {
     GameAction ACTION_TOGGLE_DEBUG_INFO = new GameAction("TOGGLE_DEBUG_INFO") {
         @Override
         public void execute(GameUI ui) {
-            toggle(GameUI.propertyDebugInfoVisible);
+            toggle(GameUI.PROPERTY_DEBUG_INFO_VISIBLE);
         }
     };
 
     GameAction ACTION_TOGGLE_DRAW_MODE = new GameAction("TOGGLE_DRAW_MODE") {
         @Override
         public void execute(GameUI ui) {
-            GameUI.property3DDrawMode.set(GameUI.property3DDrawMode.get() == DrawMode.FILL ? DrawMode.LINE : DrawMode.FILL);
+            GameUI.PROPERTY_3D_DRAW_MODE.set(GameUI.PROPERTY_3D_DRAW_MODE.get() == DrawMode.FILL ? DrawMode.LINE : DrawMode.FILL);
         }
 
         @Override
@@ -396,17 +396,17 @@ public void execute(GameUI ui) {
     GameAction ACTION_TOGGLE_MINI_VIEW_VISIBILITY = new GameAction("TOGGLE_MINI_VIEW_VISIBILITY") {
         @Override
         public void execute(GameUI ui) {
-            toggle(GameUI.propertyMiniViewOn);
+            toggle(GameUI.PROPERTY_MINI_VIEW_ON);
             if (!ui.isCurrentGameSceneID(SCENE_ID_PLAY_SCENE_3D)) {
-                ui.showFlashMessage(ui.theAssets().text(GameUI.propertyMiniViewOn.get() ? "pip_on" : "pip_off"));
+                ui.showFlashMessage(ui.theAssets().text(GameUI.PROPERTY_MINI_VIEW_ON.get() ? "pip_on" : "pip_off"));
             }
         }
     };
 
     GameAction ACTION_TOGGLE_MUTED = new GameAction("TOGGLE_MUTED") {
         @Override
         public void execute(GameUI ui) {
-            GameUI.propertyMuted.set(!GameUI.propertyMuted.get());
+            GameUI.PROPERTY_MUTED.set(!GameUI.PROPERTY_MUTED.get());
         }
     };
 
@@ -425,13 +425,13 @@ public void execute(GameUI ui) {
         @Override
         public void execute(GameUI ui) {
             ui.currentGameScene().ifPresent(gameScene -> {
-                toggle(GameUI.property3DEnabled);
+                toggle(GameUI.PROPERTY_3D_ENABLED);
                 if (ui.isCurrentGameSceneID(SCENE_ID_PLAY_SCENE_2D) || ui.isCurrentGameSceneID(SCENE_ID_PLAY_SCENE_3D)) {
                     ui.updateGameScene(true);
                     ui.theGameContext().theGameController().updateGameState(); //TODO needed?
                 }
                 if (!ui.theGameContext().theGame().isPlaying()) {
-                    ui.showFlashMessage(ui.theAssets().text(GameUI.property3DEnabled.get() ? "use_3D_scene" : "use_2D_scene"));
+                    ui.showFlashMessage(ui.theAssets().text(GameUI.PROPERTY_3D_ENABLED.get() ? "use_3D_scene" : "use_2D_scene"));
                 }
             });
         }
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/PacManGames_UI_Impl.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/PacManGames_UI_Impl.java
@@ -85,9 +85,8 @@ public PacManGames_UI_Impl(GameContext gameContext, Stage stage, double width, d
             globalActionBindings.matchingAction(theKeyboard).orElse(null),
             () -> currentView().handleKeyboardInput(this))
         );
-
-        mainScene.currentGameSceneProperty().bindBidirectional(propertyCurrentGameScene);
-        mainScene.currentViewProperty().bindBidirectional(propertyCurrentView);
+        mainScene.currentGameSceneProperty().bindBidirectional(PROPERTY_CURRENT_GAME_SCENE);
+        mainScene.currentViewProperty().bindBidirectional(PROPERTY_CURRENT_VIEW);
 
         configureStage(stage);
 
@@ -97,8 +96,8 @@ public PacManGames_UI_Impl(GameContext gameContext, Stage stage, double width, d
         theGameClock.setPausableAction(this::doSimulationStepAndUpdateGameScene);
         theGameClock.setPermanentAction(this::drawCurrentView);
 
-        property3DWallHeight.set(theUIPrefs.getFloat("3d.obstacle.base_height"));
-        property3DWallOpacity.set(theUIPrefs.getFloat("3d.obstacle.opacity"));
+        PROPERTY_3D_WALL_HEIGHT.set(theUIPrefs.getFloat("3d.obstacle.base_height"));
+        PROPERTY_3D_WALL_OPACITY.set(theUIPrefs.getFloat("3d.obstacle.opacity"));
     }
 
     private void configureStage(Stage stage) {
@@ -111,12 +110,12 @@ private void configureStage(Stage stage) {
                 return currentView == null
                     ? "No View?"
                     : currentView.title().map(ObservableObjectValue::get)
-                        .orElse(mainScene.computeTitle(property3DEnabled.get(), propertyDebugInfoVisible.get()));
+                        .orElse(mainScene.computeTitle(PROPERTY_3D_ENABLED.get(), PROPERTY_DEBUG_INFO_VISIBLE.get()));
             },
-            propertyCurrentGameScene,
-            propertyCurrentView,
-            propertyDebugInfoVisible,
-            property3DEnabled,
+                PROPERTY_CURRENT_GAME_SCENE,
+                PROPERTY_CURRENT_VIEW,
+                PROPERTY_DEBUG_INFO_VISIBLE,
+                PROPERTY_3D_ENABLED,
             theGameClock().pausedProperty(),
             mainScene.heightProperty()
         );
@@ -143,7 +142,7 @@ private void selectView(PacManGames_View view) {
         view.actionBindingMap().updateKeyboard(theKeyboard);
         theGameContext.theGameEventManager().addEventListener(view);
 
-        GameUI.propertyCurrentView.set(view);
+        GameUI.PROPERTY_CURRENT_VIEW.set(view);
     }
 
     public void applyConfiguration(String gameVariant, Class<?> configClass) {
@@ -153,7 +152,7 @@ public void applyConfiguration(String gameVariant, Class<?> configClass) {
             Logger.info("Game scenes for game variant '{}' created", gameVariant);
             config.gameScenes().forEach(scene -> {
                 if (scene instanceof GameScene2D gameScene2D) {
-                    gameScene2D.debugInfoVisibleProperty().bind(propertyDebugInfoVisible);
+                    gameScene2D.debugInfoVisibleProperty().bind(PROPERTY_DEBUG_INFO_VISIBLE);
                 }
             });
             setConfig(gameVariant, config);
@@ -258,7 +257,7 @@ public void selectGameVariant(String gameVariant) {
         GameUI_Config newConfig = config(gameVariant);
         Logger.info("Loading assets for game variant {}", gameVariant);
         newConfig.storeAssets(theAssets());
-        newConfig.soundManager().mutedProperty().bind(propertyMuted);
+        newConfig.soundManager().mutedProperty().bind(PROPERTY_MUTED);
 
         Image appIcon = theAssets.image(newConfig.assetNamespace() + ".app_icon");
         if (appIcon != null) {
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_3d/GameLevel3D.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_3d/GameLevel3D.java
@@ -267,10 +267,10 @@ public GameLevel3D(GameUI ui) {
         this.ui = requireNonNull(ui);
         this.gameLevel = requireNonNull(ui.theGameContext().theGameLevel());
 
-        wallOpacityProperty.bind(GameUI.property3DWallOpacity);
+        wallOpacityProperty.bind(GameUI.PROPERTY_3D_WALL_OPACITY);
 
-        wallBaseHeightProperty.bind(GameUI.property3DWallHeight);
-        GameUI.property3DDrawMode.addListener(this::handleDrawModeChange);
+        wallBaseHeightProperty.bind(GameUI.PROPERTY_3D_WALL_HEIGHT);
+        GameUI.PROPERTY_3D_DRAW_MODE.addListener(this::handleDrawModeChange);
 
         setMouseTransparent(true); // this increases performance, they say...
 
@@ -325,7 +325,7 @@ private void createMaterials() {
         particleMaterial.setSpecularColor(particleMaterial.getDiffuseColor().brighter());
 
         floorMaterial = new PhongMaterial();
-        floorMaterial.diffuseColorProperty().bind(GameUI.property3DFloorColor);
+        floorMaterial.diffuseColorProperty().bind(GameUI.PROPERTY_3D_FLOOR_COLOR);
         floorMaterial.specularColorProperty().bind(floorMaterial.diffuseColorProperty().map(Color::brighter));
         floorMaterial.setSpecularPower(128);
 
@@ -474,7 +474,7 @@ private void createLevelCounter3D() {
 
     private void createAmbientLight() {
         ambientLight = new AmbientLight();
-        ambientLight.colorProperty().bind(GameUI.property3DLightColor);
+        ambientLight.colorProperty().bind(GameUI.PROPERTY_3D_LIGHT_COLOR);
     }
 
     private void createGhostLight() {
@@ -770,8 +770,8 @@ public void onLevelComplete(GameState state, ObjectProperty<PerspectiveID> persp
             pauseSec(1)
         );
         animation.setOnFinished(e -> {
-            wallBaseHeightProperty.bind(GameUI.property3DWallHeight);
-            perspectiveIDProperty.bind(GameUI.property3DPerspective);
+            wallBaseHeightProperty.bind(GameUI.PROPERTY_3D_WALL_HEIGHT);
+            perspectiveIDProperty.bind(GameUI.PROPERTY_3D_PERSPECTIVE);
             ui.theGameContext().theGameController().letCurrentGameStateExpire();
         });
         animation.play();
@@ -892,7 +892,7 @@ public void dispose() {
         }
         animationRegistry.clear();
 
-        GameUI.property3DDrawMode.removeListener(this::handleDrawModeChange);
+        GameUI.PROPERTY_3D_DRAW_MODE.removeListener(this::handleDrawModeChange);
         Logger.info("Removed 'draw mode' listener");
 
         house3D.openProperty().removeListener(this::handleHouseOpenChange);
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_3d/PlayScene3D.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_3d/PlayScene3D.java
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/dashboard/InfoBox3DSettings.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/dashboard/InfoBox3DSettings.java
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/dashboard/InfoBoxGeneral.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/dashboard/InfoBoxGeneral.java
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/layout/MainScene.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/layout/MainScene.java
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/layout/PlayView.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/layout/PlayView.java

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public GameScene selectGameScene(GameContext gameContext) {`
`276`	`276`	`int cutSceneNumber = gameContext.theGame().<Integer>getProperty("intermissionTestNumber");`
`277`	`277`	`yield SCENE_ID_CUT_SCENE_N_2D.formatted(cutSceneNumber);`
`278`	`278`	`}`
`279`		`- default -> GameUI.property3DEnabled.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;`
	`279`	`+ default -> GameUI.PROPERTY_3D_ENABLED.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;`
`280`	`280`	`};`
`281`	`281`	`return scenesByID.get(sceneID);`
`282`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ public GameScene selectGameScene(GameContext gameContext) {`
`264`	`264`	`int cutSceneNumber = gameContext.theGame().<Integer>getProperty("intermissionTestNumber");`
`265`	`265`	`yield SCENE_ID_CUT_SCENE_N_2D.formatted(cutSceneNumber);`
`266`	`266`	`}`
`267`		`- default -> GameUI.property3DEnabled.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;`
	`267`	`+ default -> GameUI.PROPERTY_3D_ENABLED.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;`
`268`	`268`	`};`
`269`	`269`	`return scenesByID.get(sceneID);`
`270`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ public GameScene selectGameScene(GameContext gameContext) {`
`258`	`258`	`int cutSceneNumber = gameContext.theGame().<Integer>getProperty("intermissionTestNumber");`
`259`	`259`	`yield SCENE_ID_CUT_SCENE_N_2D.formatted(cutSceneNumber);`
`260`	`260`	`}`
`261`		`- default -> GameUI.property3DEnabled.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;`
	`261`	`+ default -> GameUI.PROPERTY_3D_ENABLED.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;`
`262`	`262`	`};`
`263`	`263`	`return scenesByID.get(sceneID);`
`264`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ public TengenMsPacMan_SpriteSheet spriteSheet() {`
`305`	`305`	`@Override`
`306`	`306`	`public TengenMsPacMan_GameRenderer createGameRenderer(Canvas canvas) {`
`307`	`307`	`var renderer = new TengenMsPacMan_GameRenderer(ui.theAssets(), spriteSheet(), mapRepository, canvas);`
`308`		`- renderer.backgroundColorProperty().bind(GameUI.propertyCanvasBackgroundColor);`
	`308`	`+ renderer.backgroundColorProperty().bind(GameUI.PROPERTY_CANVAS_BACKGROUND_COLOR);`
`309`	`309`	`return renderer;`
`310`	`310`	`}`
`311`	`311`
`@@ -426,7 +426,7 @@ public GameScene selectGameScene(GameContext gameContext) {`
`426`	`426`	`int cutSceneNumber = gameContext.theGame().<Integer>getProperty("intermissionTestNumber");`
`427`	`427`	`yield SCENE_ID_CUT_SCENE_N_2D.formatted(cutSceneNumber);`
`428`	`428`	`}`
`429`		`- default -> GameUI.property3DEnabled.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;`
	`429`	`+ default -> GameUI.PROPERTY_3D_ENABLED.get() ? SCENE_ID_PLAY_SCENE_3D : SCENE_ID_PLAY_SCENE_2D;`
`430`	`430`	`};`
`431`	`431`	`return scenesByID.get(sceneID);`
`432`	`432`	`}`