Merge pull request #206 from powerpuff-luv/main

jvondermarck · web-flow · commit 1e43ef66878c · 2025-05-13T13:10:30.000+02:00
[Feature]: Added level progress bar
diff --git a/src/main/java/com/dinosaur/dinosaurexploder/components/LevelProgressBarComponent.java b/src/main/java/com/dinosaur/dinosaurexploder/components/LevelProgressBarComponent.java
@@ -0,0 +1,53 @@
+package com.dinosaur.dinosaurexploder.components;
+
+import com.almasb.fxgl.animation.Interpolators;
+import com.almasb.fxgl.dsl.FXGL;
+import com.almasb.fxgl.entity.component.Component;
+import com.dinosaur.dinosaurexploder.utils.LevelManager;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Duration;
+
+/**
+ * Summary:
+ * This class extends Component and handles filling the level progress bar
+ */
+public class LevelProgressBarComponent extends Component {
+    private static final double MAX_WIDTH = 148;
+    private static final Duration UPDATE_DURATION = Duration.seconds(0.3);
+    private static final Duration RESET_DURATION = Duration.seconds(0.5);
+
+    private final Rectangle fill;
+    private final LevelManager levelManager;
+    private boolean isLocked = false;
+
+    public LevelProgressBarComponent(Rectangle fill, LevelManager levelManager) {
+        this.fill = fill;
+        this.levelManager = levelManager;
+    }
+
+    public void updateProgress() {
+        if (isLocked) return;
+
+        float progress = Math.min(levelManager.getLevelProgress(), 1);
+        updateWidth(MAX_WIDTH * progress, UPDATE_DURATION);
+
+        if (progress >= 1) isLocked = true;
+    }
+
+    public void resetProgress() {
+        isLocked = false;
+
+        float progress = Math.min(levelManager.getLevelProgress(), 1);
+        updateWidth(MAX_WIDTH * progress, RESET_DURATION);
+    }
+
+    private void updateWidth(double targetWidth, Duration duration) {
+        FXGL.animationBuilder()
+                .duration(duration)
+                .interpolator(Interpolators.EXPONENTIAL.EASE_OUT())
+                .animate(fill.widthProperty())
+                .from(fill.getWidth())
+                .to(targetWidth)
+                .buildAndPlay();
+    }
+}
diff --git a/src/main/java/com/dinosaur/dinosaurexploder/constants/EntityType.java b/src/main/java/com/dinosaur/dinosaurexploder/constants/EntityType.java
@@ -4,5 +4,5 @@
  *  This handles with all the entities in the game like lives, player projectile etc.
  */
 public enum EntityType {
-    PLAYER, GREEN_DINO,RED_DINO, PROJECTILE, ENEMY_PROJECTILE, SCORE, LIFE, BOMB, COIN, HEART, LEVEL, HEALTHBAR
+    PLAYER, GREEN_DINO,RED_DINO, PROJECTILE, ENEMY_PROJECTILE, SCORE, LIFE, BOMB, COIN, HEART, LEVEL, HEALTHBAR, LEVEL_PROGRESS_BAR
 }
diff --git a/src/main/java/com/dinosaur/dinosaurexploder/controller/DinosaurController.java b/src/main/java/com/dinosaur/dinosaurexploder/controller/DinosaurController.java
@@ -2,6 +2,7 @@
 
 import com.almasb.fxgl.dsl.FXGL;
 import com.almasb.fxgl.entity.Entity;
+import com.almasb.fxgl.entity.SpawnData;
 import com.almasb.fxgl.time.TimerAction;
 import com.dinosaur.dinosaurexploder.components.*;
 import com.dinosaur.dinosaurexploder.constants.EntityType;
@@ -34,6 +35,7 @@ public class DinosaurController {
     private CollectedCoinsComponent collectedCoinsComponent;
     private Entity levelDisplay;
     private Entity life;
+    private Entity levelProgressBar;
     private LevelManager levelManager;
     private TimerAction enemySpawnTimer;
     private boolean isSpawningPaused = false;
@@ -87,8 +89,8 @@ public void initInput() {
     }
 
     public void initGame() {
-        initGameEntities();
         levelManager = new LevelManager();
+        initGameEntities();
         collisionHandler = new CollisionHandler(levelManager);
         bossSpawner = new BossSpawner(settings, levelManager);
         CoinSpawner coinSpawner = new CoinSpawner(10, 1.0);
@@ -114,6 +116,7 @@ private void initGameEntities() {
         Entity coin = spawn("Coins", getAppCenter().getX() - 260, getAppCenter().getY() - 235);
         collectedCoinsComponent = coin.getComponent(CollectedCoinsComponent.class);
         bomb.addComponent(new BombComponent());
+        levelProgressBar = spawn("levelProgressBar", new SpawnData(getAppCenter().getX() - 170, getAppCenter().getY() + 340).put("levelManager", levelManager));
     }
 
     /**
@@ -169,6 +172,11 @@ private void resumeEnemySpawning() {
      * and shows a message when the level is changed
      */
     private void showLevelMessage() {
+        // Hide the progress bar for boss levels
+        if (levelManager.getCurrentLevel() % 5 == 0) {
+            levelProgressBar.setVisible(false);
+        }
+
         //Pause game elements during level transition
         FXGL.getGameWorld().getEntitiesByType(EntityType.GREEN_DINO).forEach(e -> {
             if (e.hasComponent(GreenDinoComponent.class)) {
@@ -192,9 +200,17 @@ private void showLevelMessage() {
 
         // Resume gameplay after a delay
         runOnce(() -> {
+            if (levelManager.getCurrentLevel() % 5 != 0) {
+                levelProgressBar.setVisible(true);
+            }
+
             getGameScene().removeUINode(levelText);
             updateLevelDisplay();
 
+            if (levelProgressBar.hasComponent(LevelProgressBarComponent.class)) {
+                levelProgressBar.getComponent(LevelProgressBarComponent.class).resetProgress();
+            }
+
             FXGL.getGameWorld().getEntitiesByType(EntityType.GREEN_DINO).forEach(e -> {
                 if (e.hasComponent(GreenDinoComponent.class)) {
                     e.getComponent(GreenDinoComponent.class).setPaused(false);
@@ -250,7 +266,9 @@ public void initPhysics() {
             }
             projectile.removeFromWorld();
             greenDino.removeFromWorld();
-            if (collisionHandler.isLevelUpAfterHitDino(score.getComponent(ScoreComponent.class))) {
+            if (collisionHandler.isLevelUpAfterHitDino(
+                    score.getComponent(ScoreComponent.class),
+                    levelProgressBar.getComponent(LevelProgressBarComponent.class))) {
                 showLevelMessage();
                 System.out.println("Level up!");
             }
diff --git a/src/main/java/com/dinosaur/dinosaurexploder/model/CollisionHandler.java b/src/main/java/com/dinosaur/dinosaurexploder/model/CollisionHandler.java
@@ -2,6 +2,7 @@
 
 import com.dinosaur.dinosaurexploder.components.BombComponent;
 import com.dinosaur.dinosaurexploder.components.CollectedCoinsComponent;
+import com.dinosaur.dinosaurexploder.components.LevelProgressBarComponent;
 import com.dinosaur.dinosaurexploder.components.LifeComponent;
 import com.dinosaur.dinosaurexploder.components.RedDinoComponent;
 import com.dinosaur.dinosaurexploder.components.ScoreComponent;
@@ -15,9 +16,10 @@ public CollisionHandler(LevelManager levelManager) {
         this.levelManager = levelManager;
     }
 
-    public boolean isLevelUpAfterHitDino(ScoreComponent scoreComponent) {
+    public boolean isLevelUpAfterHitDino(ScoreComponent scoreComponent, LevelProgressBarComponent levelProgressBarComponent) {
         scoreComponent.incrementScore(1);
         levelManager.incrementDefeatedEnemies();
+        levelProgressBarComponent.updateProgress();
 
         return adjustLevel();
     }
diff --git a/src/main/java/com/dinosaur/dinosaurexploder/model/GameEntityFactory.java b/src/main/java/com/dinosaur/dinosaurexploder/model/GameEntityFactory.java
@@ -19,8 +19,10 @@
 import com.dinosaur.dinosaurexploder.constants.EntityType;
 import com.dinosaur.dinosaurexploder.constants.GameConstants;
 import com.dinosaur.dinosaurexploder.utils.FXGLGameTimer;
+import com.dinosaur.dinosaurexploder.utils.LevelManager;
 import javafx.geometry.Orientation;
 import javafx.geometry.Point2D;
+import javafx.scene.Group;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.paint.Color;
@@ -280,6 +282,30 @@ public Entity newLevel(SpawnData data) {
                 .build();
     }
 
+    /**
+     * Summary :
+     * Creates level progress bar
+     */
+    @Spawns("levelProgressBar")
+    public Entity newLevelProgressBar(SpawnData data) {
+        LevelManager levelManager = data.get("levelManager");
+
+        Rectangle background = new Rectangle(150, 10, Color.DARKGRAY);
+        background.setStroke(Color.GRAY);
+        background.setStrokeWidth(1);
+
+        Rectangle filled = new Rectangle(0, 8, Color.LIMEGREEN);
+        filled.setLayoutX(1);
+        filled.setLayoutY(1);
+
+        Group progressBar = new Group(background, filled);
+
+        return entityBuilderBase(data, EntityType.LEVEL_PROGRESS_BAR)
+                .view(progressBar)
+                .with(new LevelProgressBarComponent(filled, levelManager))
+                .build();
+    }
+
     /**
      * Summary :
      * Reusable part of every entity
diff --git a/src/main/java/com/dinosaur/dinosaurexploder/utils/LevelManager.java b/src/main/java/com/dinosaur/dinosaurexploder/utils/LevelManager.java
@@ -24,6 +24,10 @@ public double getEnemySpeed() {
         return enemySpeed;
     }
 
+    public float getLevelProgress() {
+        return (float) defeatedEnemies / enemiesToDefeat;
+    }
+
     public void incrementDefeatedEnemies() {
         defeatedEnemies++;
     }
diff --git a/src/test/java/com/dinosaur/dinosaurexploder/model/CollisionHandlerTest.java b/src/test/java/com/dinosaur/dinosaurexploder/model/CollisionHandlerTest.java
@@ -3,11 +3,14 @@
 import com.almasb.fxgl.entity.Entity;
 import com.dinosaur.dinosaurexploder.components.BombComponent;
 import com.dinosaur.dinosaurexploder.components.CollectedCoinsComponent;
+import com.dinosaur.dinosaurexploder.components.LevelProgressBarComponent;
 import com.dinosaur.dinosaurexploder.components.LifeComponent;
 import com.dinosaur.dinosaurexploder.components.RedDinoComponent;
 import com.dinosaur.dinosaurexploder.components.ScoreComponent;
 import com.dinosaur.dinosaurexploder.utils.LevelManager;
 import com.dinosaur.dinosaurexploder.utils.MockGameTimer;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -34,17 +37,27 @@ void setUp() {
     @Test
     void projectileHitDino_thenLevelUp() {
         ScoreComponent scoreComponent = new ScoreComponent();
+        Rectangle rect = new Rectangle(0, 8, Color.LIMEGREEN);
+        LevelProgressBarComponent levelProgressBarComponent = new LevelProgressBarComponent(rect, levelManager) {
+            @Override
+            public void updateProgress() {}
+        };
 
-        for (int i = 0; i < LEVEL_UP_COUNT; i++) collisionHandler.isLevelUpAfterHitDino(scoreComponent);
+        for (int i = 0; i < LEVEL_UP_COUNT; i++) collisionHandler.isLevelUpAfterHitDino(scoreComponent, levelProgressBarComponent);
 
         assertEquals(2, levelManager.getCurrentLevel());
     }
 
     @Test
     void projectileHitDino_thenScoreIncrease() {
         ScoreComponent scoreComponent = new ScoreComponent();
+        Rectangle rect = new Rectangle(0, 8, Color.LIMEGREEN);
+        LevelProgressBarComponent levelProgressBarComponent = new LevelProgressBarComponent(rect, levelManager) {
+            @Override
+            public void updateProgress() {}
+        };
 
-        collisionHandler.isLevelUpAfterHitDino(scoreComponent);
+        collisionHandler.isLevelUpAfterHitDino(scoreComponent, levelProgressBarComponent);
 
         assertEquals(1, scoreComponent.getScore());
     }

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`	`* This handles with all the entities in the game like lives, player projectile etc.`
`5`	`5`	`*/`
`6`	`6`	`public enum EntityType {`
`7`		`- PLAYER, GREEN_DINO,RED_DINO, PROJECTILE, ENEMY_PROJECTILE, SCORE, LIFE, BOMB, COIN, HEART, LEVEL, HEALTHBAR`
	`7`	`+ PLAYER, GREEN_DINO,RED_DINO, PROJECTILE, ENEMY_PROJECTILE, SCORE, LIFE, BOMB, COIN, HEART, LEVEL, HEALTHBAR, LEVEL_PROGRESS_BAR`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ public double getEnemySpeed() {`
`24`	`24`	`return enemySpeed;`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ public float getLevelProgress() {`
	`28`	`+ return (float) defeatedEnemies / enemiesToDefeat;`
	`29`	`+ }`
	`30`	`+`
`27`	`31`	`public void incrementDefeatedEnemies() {`
`28`	`32`	`defeatedEnemies++;`
`29`	`33`	`}`