Now draws shadows seperately first so they appear below player and enemies

Author: Callum-OP

Enemy.cpp

@@ -195,7 +195,10 @@ sf::Vector2f Enemy::getPosition() {
     return sprite.getPosition();
 }
 
-void Enemy::draw(sf::RenderWindow& window) {
+// For drawing enemy in main
+
+// Draw shadow seperately
+void Enemy::drawShadow(sf::RenderWindow& window) {
     // Add shadow under character
     sf::CircleShape shadow(spriteSize / 5.f);
     shadow.setFillColor(sf::Color(0, 0, 0, 100));
@@ -204,6 +207,9 @@ void Enemy::draw(sf::RenderWindow& window) {
     sf::Vector2f position = sprite.getPosition();
     shadow.setPosition({position.x + spriteSize / 3.18f, position.y + spriteSize / 2.6f});
     window.draw(shadow);
+}
 
+// Draw enemy sprite
+void Enemy::drawEnemy(sf::RenderWindow& window) {
     window.draw(sprite);
 }

Enemy.hpp

@@ -13,7 +13,8 @@ class Enemy {
 
     void update(float deltaTime, Grid& grid, const sf::Vector2f& playerPosition, bool playerAttacking);
     sf::Vector2f getPosition();
-    void draw(sf::RenderWindow& window);
+    void drawShadow(sf::RenderWindow& window);
+    void drawEnemy(sf::RenderWindow& window);
     void animate(int xStart, int xEnd, int yStart, int yEnd);
 
     void takeDamage(int amount);

Player.cpp

@@ -213,7 +213,9 @@ sf::Vector2f Player::getPosition() {
 }
 
 // For drawing player in main
-void Player::draw(sf::RenderWindow& window, const sf::View& camera) {
+
+// Draw shadow seperately
+void Player::drawShadow(sf::RenderWindow& window) {
     // Add shadow under character
     sf::CircleShape shadow(spriteSize / 5.f);
     shadow.setFillColor(sf::Color(0, 0, 0, 100));
@@ -222,10 +224,17 @@ void Player::draw(sf::RenderWindow& window, const sf::View& camera) {
     sf::Vector2f position = sprite.getPosition();
     shadow.setPosition({position.x + spriteSize / 3.18f, position.y + spriteSize / 2.6f});
     window.draw(shadow);
+}
 
-    const sf::Font font("assets/fonts/MagicSchoolOne.ttf");
+// Draw player sprite
+void Player::drawPlayer(sf::RenderWindow& window) {
     window.draw(sprite);
+}
 
+// Draw user interface features
+void Player::drawUI(sf::RenderWindow& window, const sf::View& camera) {
+    const sf::Font font("assets/fonts/MagicSchoolOne.ttf");
+    
     // Set up UI
     // Draw health bar at top left of camera
     sf::Vector2f cameraLocation = camera.getCenter() - (camera.getSize() / 2.f);

Player.hpp

@@ -8,17 +8,19 @@ class Player {
     Player();
 
     void handleInput();
-    void Player::sprint(bool sprint);
+    void sprint(bool sprint);
     void update();
     sf::Vector2f getPosition();
-    void draw(sf::RenderWindow& window, const sf::View& view);
+    void drawUI(sf::RenderWindow& window, const sf::View& view);
+    void drawShadow(sf::RenderWindow& window);
+    void drawPlayer(sf::RenderWindow& window);
     void animate(int xStart, int xEnd, int yStart, int yEnd);
 
-    void Player::takeDamage(int amount);
-    void Player::heal(int amount);
-    int Player::getHealth() const { return health; };
-    int Player::getMaxHealth() const { return maxHealth; };
-    bool Player::isDead() const { return health <= 0; };
+    void takeDamage(int amount);
+    void heal(int amount);
+    int getHealth() const { return health; };
+    int getMaxHealth() const { return maxHealth; };
+    bool isDead() const { return health <= 0; };
 
     int getGold() const { return gold; };;
     void addGold(int amount);

main.cpp

@@ -205,6 +205,8 @@ int main()
         // Create new window with sprites drawn in
         window.clear(sf::Color::White);
 
+        //---- Collision detection ----
+
         // Try movement
         Vec2 originalPos = playerCollider.pos;
         // --- X axis ---
@@ -294,21 +296,28 @@ int main()
             }
         }
 
+        //---- Draw items ----
+
         // Draw tilemap with walls and healthPickups
         renderer.draw(window, map);
+        // Draw shadows first and update enemies
+        player.drawShadow(window);
+        for (auto& enem : enemies) {
+            enem.enemy.sprite.setPosition(toSF(enem.enemy.collider.pos));
+            enem.enemy.update(deltaTime, grid, player.getPosition(), player.attacking);
+            enem.enemy.drawShadow(window);
+        }
         // Draw player
         player.sprite.setPosition(toSF(playerCollider.pos));
-        player.draw(window, camera);
+        player.drawUI(window, camera);
+        player.drawPlayer(window);
         camera.setCenter(player.getPosition());
         window.setView(camera);
         if (player.isDead()) {
         }
-
-        // Draw and update enemies
+        // Draw enemies
         for (auto& enem : enemies) {
-            enem.enemy.sprite.setPosition(toSF(enem.enemy.collider.pos));
-            enem.enemy.update(deltaTime, grid, player.getPosition(), player.attacking);
-            enem.enemy.draw(window);
+            enem.enemy.drawEnemy(window);
         }
         // Delete dead enemies
         enemies.erase(
@@ -318,6 +327,7 @@ int main()
             enemies.end()
         );
 
+        // Display window
         window.display();
     }
     return 0;