Merge pull request #232 from lucasstarsz/main

The rest of 1.7.0

Author: lucasstarsz

examples/java/tech/fastj/examples/behaviors/Main.java

@@ -44,7 +44,7 @@ public void init(FastJCanvas canvas) {
          * gameObject.addBehavior(Behavior, SimpleManager/Scene) -- the SimpleManager/Scene is the
          * manager the behavior is in. */
         box.addBehavior(movementBehavior, this);
-        drawableManager.addGameObject(box);
+        drawableManager().addGameObject(box);
 
 
         /* Pre-defined Behaviors */
@@ -66,7 +66,7 @@ public void init(FastJCanvas canvas) {
                 .build();
 
         premadeBehaviorsBox.addBehavior(Behavior.simpleRotation(3f), this);
-        drawableManager.addGameObject(premadeBehaviorsBox);
+        drawableManager().addGameObject(premadeBehaviorsBox);
     }
 
     @Override

examples/java/tech/fastj/examples/bullethell/scenes/GameScene.java

@@ -32,10 +32,6 @@
 
 public class GameScene extends Scene {
 
-    private Model2D player;
-    private Text2D playerMetadata;
-    private Polygon2D playerHealthBar;
-
     private Map<String, Model2D> enemies;
     private int enemyCount = 0;
     private int wave = 0;
@@ -46,31 +42,31 @@ public GameScene() {
 
     @Override
     public void load(FastJCanvas canvas) {
-        playerMetadata = createPlayerMetaData();
-        playerHealthBar = createPlayerHealthBar();
-        PlayerHealthBar playerHealthBarScript = new PlayerHealthBar(playerMetadata, this);
+        Text2D playerMetadata = createPlayerMetaData();
+        Polygon2D playerHealthBar = createPlayerHealthBar();
+        PlayerHealthBar playerHealthBarScript = new PlayerHealthBar(playerMetadata);
         playerHealthBar.addBehavior(playerHealthBarScript, this)
                 .<GameObject>addTag(Tags.PlayerHealthBar);
 
 
         PlayerController playerControllerScript = new PlayerController(3f, 3f);
         PlayerCannon playerCannonScript = new PlayerCannon(this);
-        player = createPlayer();
+        Model2D player = createPlayer();
         player.addBehavior(playerControllerScript, this)
                 .addBehavior(playerCannonScript, this)
                 .<GameObject>addTag(Tags.Player);
 
 
         // add game objects to the screen in order!
-        drawableManager.addGameObject(player);
-        drawableManager.addGameObject(playerHealthBar);
-        drawableManager.addGameObject(playerMetadata);
+        drawableManager().addGameObject(player);
+        drawableManager().addGameObject(playerHealthBar);
+        drawableManager().addGameObject(playerMetadata);
 
 
         enemies = new ConcurrentHashMap<>();
         newWave();
 
-        inputManager.addKeyboardActionListener(new KeyboardActionListener() {
+        inputManager().addKeyboardActionListener(new KeyboardActionListener() {
             @Override
             public void onKeyRecentlyPressed(KeyboardStateEvent keyboardStateEvent) {
                 switch (keyboardStateEvent.getKey()) {
@@ -93,26 +89,6 @@ public void onKeyRecentlyPressed(KeyboardStateEvent keyboardStateEvent) {
 
     @Override
     public void unload(FastJCanvas canvas) {
-        if (player != null) {
-            player.destroy(this);
-            player = null;
-        }
-
-        if (playerMetadata != null) {
-            playerMetadata.destroy(this);
-            playerMetadata = null;
-        }
-
-        if (playerHealthBar != null) {
-            playerHealthBar.destroy(this);
-            playerHealthBar = null;
-        }
-
-        if (enemies != null) {
-            enemies.forEach((id, enemy) -> enemy.destroy(this));
-            enemies.clear();
-        }
-
         enemyCount = 0;
     }
 
@@ -184,7 +160,7 @@ private Model2D createEnemy() {
         Model2D enemy = Model2D.fromPolygons(ModelUtil.loadModel(Path.of(FilePaths.PathToResources + "enemy.psdf")));
         enemy.addLateBehavior(new EnemyMovement(this), this);
         enemy.setTranslation(randomPosition);
-        drawableManager.addGameObject(enemy);
+        drawableManager().addGameObject(enemy);
         return enemy;
     }
 }

examples/java/tech/fastj/examples/bullethell/scenes/LoseScene.java

@@ -16,9 +16,6 @@
 
 public class LoseScene extends Scene {
 
-    private Text2D loseText;
-    private Text2D deathInfo;
-
     public LoseScene() {
         super(SceneNames.LoseSceneName);
     }
@@ -28,24 +25,22 @@ public void load(FastJCanvas canvas) {
         GameScene gameScene = FastJEngine.<SceneManager>getLogicManager().getScene(SceneNames.GameSceneName);
         int waveNumber = gameScene.getWaveNumber();
 
-        loseText = Text2D.create("You Lost...")
+        Text2D loseText = Text2D.create("You Lost...")
                 .withFill(Color.red)
                 .withFont(new Font("Consolas", Font.PLAIN, 96))
                 .withTransform(new Pointf(300f, 375f), Transform2D.DefaultRotation, Transform2D.DefaultScale)
                 .build();
-        deathInfo = Text2D.create("You died on wave: " + waveNumber)
+        Text2D deathInfo = Text2D.create("You died on wave: " + waveNumber)
                 .withFont(new Font("Consolas", Font.PLAIN, 16))
                 .withTransform(new Pointf(500f, 400f), Transform2D.DefaultRotation, Transform2D.DefaultScale)
                 .build();
 
-        drawableManager.addGameObject(loseText);
-        drawableManager.addGameObject(deathInfo);
+        drawableManager().addGameObject(loseText);
+        drawableManager().addGameObject(deathInfo);
     }
 
     @Override
     public void unload(FastJCanvas canvas) {
-        loseText.destroy(this);
-        deathInfo.destroy(this);
     }
 
     @Override

examples/java/tech/fastj/examples/bullethell/scripts/BulletMovement.java

@@ -7,6 +7,7 @@
 import tech.fastj.systems.behaviors.Behavior;
 
 import tech.fastj.examples.bullethell.scenes.GameScene;
+import tech.fastj.gameloop.CoreLoopState;
 
 public class BulletMovement implements Behavior {
 
@@ -53,10 +54,10 @@ public void destroy() {
     }
 
     public void bulletDied(GameObject obj) {
-        FastJEngine.runAfterUpdate(() -> {
+        FastJEngine.runLater(() -> {
             FastJEngine.log("death! of bullet {}f{}", travelAngle, travelVector);
             obj.destroy(gameScene);
             playerCannonScript.bulletDied();
-        });
+        }, CoreLoopState.FixedUpdate);
     }
 }

examples/java/tech/fastj/examples/bullethell/scripts/EnemyMovement.java

@@ -13,6 +13,7 @@
 
 import tech.fastj.examples.bullethell.scenes.GameScene;
 import tech.fastj.examples.bullethell.util.Tags;
+import tech.fastj.gameloop.CoreLoopState;
 
 public class EnemyMovement implements Behavior {
 
@@ -58,7 +59,7 @@ private void checkCollisions(GameObject obj) {
     }
 
     private void enemyDied(GameObject enemy) {
-        FastJEngine.runAfterUpdate(() -> gameScene.enemyDied((Model2D) enemy));
+        FastJEngine.runLater(() -> gameScene.enemyDied((Model2D) enemy), CoreLoopState.FixedUpdate);
     }
 
     private void moveToPlayer(GameObject obj) {

examples/java/tech/fastj/examples/bullethell/scripts/PlayerCannon.java

@@ -16,6 +16,7 @@
 
 import tech.fastj.examples.bullethell.scenes.GameScene;
 import tech.fastj.examples.bullethell.util.Tags;
+import tech.fastj.gameloop.CoreLoopState;
 
 public class PlayerCannon implements Behavior {
 
@@ -37,7 +38,7 @@ public void init(GameObject obj) {
     @Override
     public void fixedUpdate(GameObject obj) {
         if (Keyboard.isKeyRecentlyPressed(Keys.Space) && bulletCount < MaxBulletCount) {
-            FastJEngine.runAfterUpdate(() -> createBullet(obj));
+            FastJEngine.runLater(() -> createBullet(obj), CoreLoopState.FixedUpdate);
         }
     }
 
@@ -60,7 +61,7 @@ private void createBullet(GameObject player) {
                 .addLateBehavior(bulletMovementScript, gameScene)
                 .<GameObject>addTag(Tags.Bullet);
 
-        gameScene.drawableManager.addGameObject(bullet);
+        gameScene.drawableManager().addGameObject(bullet);
         bulletCount++;
     }
 

examples/java/tech/fastj/examples/bullethell/scripts/PlayerHealthBar.java

@@ -15,8 +15,8 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import tech.fastj.examples.bullethell.scenes.GameScene;
 import tech.fastj.examples.bullethell.util.SceneNames;
+import tech.fastj.gameloop.CoreLoopState;
 
 public class PlayerHealthBar implements Behavior {
 
@@ -26,13 +26,11 @@ public class PlayerHealthBar implements Behavior {
     private boolean takenDamage;
     private boolean canTakeDamage;
 
-    private final GameScene gameScene;
     private final ScheduledExecutorService damageCooldown = Executors.newSingleThreadScheduledExecutor();
     private final Text2D playerMetadata;
 
-    public PlayerHealthBar(Text2D playerMetadata, GameScene gameScene) {
+    public PlayerHealthBar(Text2D playerMetadata) {
         this.playerMetadata = Objects.requireNonNull(playerMetadata);
-        this.gameScene = gameScene;
     }
 
     @Override
@@ -62,7 +60,7 @@ public void update(GameObject gameObject) {
 
     @Override
     public void destroy() {
-        damageCooldown.shutdownNow();
+        damageCooldown.shutdown();
     }
 
     void takeDamage() {
@@ -73,10 +71,10 @@ void takeDamage() {
             damageCooldown.schedule(() -> canTakeDamage = true, 1, TimeUnit.SECONDS);
 
             if (health == 0) {
-                FastJEngine.runAfterUpdate(() -> {
+                FastJEngine.runLater(() -> {
                     SceneManager sceneManager = FastJEngine.getLogicManager();
                     sceneManager.switchScenes(SceneNames.LoseSceneName);
-                });
+                }, CoreLoopState.LateUpdate);
             }
         }
     }

examples/java/tech/fastj/examples/engineconfig/Main.java

@@ -19,7 +19,7 @@ public void init(FastJCanvas canvas) {
          * The code is not the primary focus of the example -- this is just to give a visual. */
         Pointf[] squareMesh = DrawUtil.createBox(50f, 50f, 100f);
         Polygon2D square = Polygon2D.fromPoints(squareMesh);
-        drawableManager.addGameObject(square);
+        drawableManager().addGameObject(square);
     }
 
     @Override

examples/java/tech/fastj/examples/keyboard/Main.java

@@ -42,7 +42,7 @@ public void init(FastJCanvas canvas) {
          * To demonstrate each method, I've chosen to log whenever any of the methods is called. Run the program to see
          * this in action. */
 
-        inputManager.addKeyboardActionListener(new KeyboardActionListener() {
+        inputManager().addKeyboardActionListener(new KeyboardActionListener() {
             @Override
             public void onKeyDown(Set<Keys> keysDown) {
                 FastJEngine.log("Key(s) held down: {}", keysDown);

examples/java/tech/fastj/examples/model2d/Main.java

@@ -40,7 +40,7 @@ public void init(FastJCanvas canvas) {
 
         /* Super simple! Now, this alone does not cause the model to render to the screen. In order
          * for it to be rendered, you need to add it as a game object to the drawable manager. */
-        drawableManager.addGameObject(smallSquares);
+        drawableManager().addGameObject(smallSquares);
 
         /* If you comment out the line above, you'll see that the text does not get rendered. */
 
@@ -69,7 +69,7 @@ public void init(FastJCanvas canvas) {
                 .build();
 
         // And of course, we need to add our model of squares to the drawable manager's game objects.
-        drawableManager.addGameObject(squaresTogether);
+        drawableManager().addGameObject(squaresTogether);
     }
 
     @Override