Skip to content

Commit 740226a

Browse files
Enhanced state machine, separated test states from game play states.
1 parent 9382448 commit 740226a

File tree

15 files changed

+34
-17
lines changed

15 files changed

+34
-17
lines changed

pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_UIConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import de.amr.pacmanfx.arcade.ms_pacman.scenes.*;
1010
import de.amr.pacmanfx.arcade.pacman.scenes.ArcadePacMan_BootScene2D;
1111
import de.amr.pacmanfx.arcade.pacman.scenes.ArcadePacMan_PlayScene2D;
12-
import de.amr.pacmanfx.controller.CutScenesTestState;
1312
import de.amr.pacmanfx.controller.GamePlayState;
13+
import de.amr.pacmanfx.controller.teststates.CutScenesTestState;
1414
import de.amr.pacmanfx.lib.RectShort;
1515
import de.amr.pacmanfx.lib.tilemap.WorldMap;
1616
import de.amr.pacmanfx.model.AbstractGameModel;

pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_UIConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import de.amr.pacmanfx.GameContext;
88
import de.amr.pacmanfx.arcade.pacman.rendering.*;
99
import de.amr.pacmanfx.arcade.pacman.scenes.*;
10-
import de.amr.pacmanfx.controller.CutScenesTestState;
1110
import de.amr.pacmanfx.controller.GamePlayState;
11+
import de.amr.pacmanfx.controller.teststates.CutScenesTestState;
1212
import de.amr.pacmanfx.lib.RectShort;
1313
import de.amr.pacmanfx.lib.Vector2f;
1414
import de.amr.pacmanfx.lib.tilemap.WorldMap;

pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_PlayScene2D.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import de.amr.pacmanfx.controller.GamePlayState;
88
import de.amr.pacmanfx.controller.GameState;
9-
import de.amr.pacmanfx.controller.LevelMediumTestState;
10-
import de.amr.pacmanfx.controller.LevelShortTestState;
9+
import de.amr.pacmanfx.controller.teststates.LevelMediumTestState;
10+
import de.amr.pacmanfx.controller.teststates.LevelShortTestState;
1111
import de.amr.pacmanfx.event.GameEvent;
1212
import de.amr.pacmanfx.lib.Vector2f;
1313
import de.amr.pacmanfx.lib.Vector2i;

pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_MsPacMan_UIConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import de.amr.pacmanfx.arcade.ms_pacman.scenes.*;
1414
import de.amr.pacmanfx.arcade.pacman.scenes.ArcadePacMan_BootScene2D;
1515
import de.amr.pacmanfx.arcade.pacman.scenes.ArcadePacMan_PlayScene2D;
16-
import de.amr.pacmanfx.controller.CutScenesTestState;
1716
import de.amr.pacmanfx.controller.GamePlayState;
17+
import de.amr.pacmanfx.controller.teststates.CutScenesTestState;
1818
import de.amr.pacmanfx.lib.RectShort;
1919
import de.amr.pacmanfx.lib.tilemap.WorldMap;
2020
import de.amr.pacmanfx.model.AbstractGameModel;

pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_UIConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import de.amr.pacmanfx.arcade.pacman.rendering.ArcadePacMan_SpriteSheet;
1212
import de.amr.pacmanfx.arcade.pacman.rendering.SpriteID;
1313
import de.amr.pacmanfx.arcade.pacman.scenes.*;
14-
import de.amr.pacmanfx.controller.CutScenesTestState;
1514
import de.amr.pacmanfx.controller.GamePlayState;
15+
import de.amr.pacmanfx.controller.teststates.CutScenesTestState;
1616
import de.amr.pacmanfx.lib.RectShort;
1717
import de.amr.pacmanfx.lib.tilemap.WorldMap;
1818
import de.amr.pacmanfx.model.AbstractGameModel;

pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/TengenMsPacMan_UIConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package de.amr.pacmanfx.tengen.ms_pacman;
66

77
import de.amr.pacmanfx.GameContext;
8-
import de.amr.pacmanfx.controller.CutScenesTestState;
8+
import de.amr.pacmanfx.controller.teststates.CutScenesTestState;
99
import de.amr.pacmanfx.lib.RectShort;
1010
import de.amr.pacmanfx.lib.Vector2f;
1111
import de.amr.pacmanfx.lib.Vector2i;

pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_PlayScene2D.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import de.amr.pacmanfx.controller.GamePlayState;
88
import de.amr.pacmanfx.controller.GameState;
9-
import de.amr.pacmanfx.controller.LevelMediumTestState;
10-
import de.amr.pacmanfx.controller.LevelShortTestState;
9+
import de.amr.pacmanfx.controller.teststates.LevelMediumTestState;
10+
import de.amr.pacmanfx.controller.teststates.LevelShortTestState;
1111
import de.amr.pacmanfx.event.GameEvent;
1212
import de.amr.pacmanfx.lib.Vector2f;
1313
import de.amr.pacmanfx.model.GameLevel;

pacman-core/src/main/java/de/amr/pacmanfx/Globals.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
*/
55
package de.amr.pacmanfx;
66

7-
import de.amr.pacmanfx.controller.*;
7+
import de.amr.pacmanfx.controller.GameController;
8+
import de.amr.pacmanfx.controller.GamePlayState;
9+
import de.amr.pacmanfx.controller.GameState;
10+
import de.amr.pacmanfx.controller.teststates.CutScenesTestState;
11+
import de.amr.pacmanfx.controller.teststates.LevelMediumTestState;
12+
import de.amr.pacmanfx.controller.teststates.LevelShortTestState;
813

914
import java.util.ArrayList;
1015
import java.util.List;

pacman-core/src/main/java/de/amr/pacmanfx/controller/CutScenesTestState.java renamed to pacman-core/src/main/java/de/amr/pacmanfx/controller/teststates/CutScenesTestState.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package de.amr.pacmanfx.controller;
1+
package de.amr.pacmanfx.controller.teststates;
22

33
import de.amr.pacmanfx.GameContext;
4+
import de.amr.pacmanfx.controller.GamePlayState;
5+
import de.amr.pacmanfx.controller.GameState;
46
import de.amr.pacmanfx.event.GameEventType;
57
import de.amr.pacmanfx.lib.timer.TickTimer;
68
import de.amr.pacmanfx.model.AbstractGameModel;

pacman-core/src/main/java/de/amr/pacmanfx/controller/LevelMediumTestState.java renamed to pacman-core/src/main/java/de/amr/pacmanfx/controller/teststates/LevelMediumTestState.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package de.amr.pacmanfx.controller;
1+
package de.amr.pacmanfx.controller.teststates;
22

33
import de.amr.pacmanfx.GameContext;
4+
import de.amr.pacmanfx.controller.GamePlayState;
5+
import de.amr.pacmanfx.controller.GameState;
46
import de.amr.pacmanfx.event.GameEventType;
57
import de.amr.pacmanfx.lib.timer.TickTimer;
68
import de.amr.pacmanfx.model.GameLevel;

0 commit comments

Comments
 (0)