Added wall collision for ne and se directions

Author: Callum-OP

Player.cpp

@@ -1,5 +1,8 @@
+#include <iostream>
+
 #include "Player.hpp"
 #include <SFML/Window/Keyboard.hpp>
+#include <SFML/Graphics.hpp>
 
 Player::Player()
     : texture{},
@@ -78,34 +81,41 @@ Player::Player()
     sprintingWestXStart = 240; sprintingWestYStart = 3120; sprintingWestXEnd = 1440; sprintingWestYEnd = 3120;
 }
 
-void Player::handleInput() {
+void Player::handleInput(std::vector<sf::FloatRect> wallBounds) {
+    // Predict future collision
+    sf::FloatRect nextBounds = sprite.getGlobalBounds();
+
     // If both right and up key pressed then move character right and up at same time
     if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Right) && sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Up) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::D) && sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::W)) {
         moving = true; northEast = true;
         north = false; east = false; southEast = false; south = false; southWest = false; west = false; northWest = false;
-        sprite.move({horizontalSpeed / 1.5f, -verticalSpeed / 1.5f});
-        // Waits for set amount of time then plays Jog north east animation
-        timer += 0.08f;
-        // Sprinting animation
-        if (timer >= timerMax && sprinting) {sprite.move({horizontalSpeed / 1.5f, -verticalSpeed / 1.5f}); textureX += 240; animate(sprintingNorthEastXStart, sprintingNorthEastXEnd, 
-            sprintingNorthEastYStart, sprintingNorthEastYEnd); timer = 0.0f;}
-        // Jog animation
-        else if (timer >= timerMax) {textureX += 240; animate(JogNorthEastXStart, JogNorthEastXEnd, 
-            JogNorthEastYStart, JogNorthEastYEnd); timer = 0.0f;}
+        sf::Vector2f movement{horizontalSpeed / 1.5f, -verticalSpeed / 1.5f};
+        if (!handleCollision(movement, nextBounds, wallBounds)) {
+            // Waits for set amount of time then plays Jog north east animation
+            timer += 0.08f;
+            // Sprinting animation
+            if (timer >= timerMax && sprinting) {sprite.move({horizontalSpeed / 1.5f, -verticalSpeed / 1.5f}); textureX += 240; animate(sprintingNorthEastXStart, sprintingNorthEastXEnd, 
+                sprintingNorthEastYStart, sprintingNorthEastYEnd); timer = 0.0f;}
+            // Jog animation
+            else if (timer >= timerMax) {textureX += 240; animate(JogNorthEastXStart, JogNorthEastXEnd, 
+                JogNorthEastYStart, JogNorthEastYEnd); timer = 0.0f;}
+        }
     }
     // If both right and down key pressed then move character right and down at same time
     else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Right) && sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Down) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::D) && sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::S)) {
         moving = true; southEast = true;
         north = false; northEast = false; east = false; south = false; southWest = false; west = false; northWest = false;
-        sprite.move({horizontalSpeed / 1.5f, verticalSpeed / 1.5f});
-        // Waits for set amount of time then plays Jog south east animation
-        timer += 0.08f;
-        // Sprinting animation
-        if (timer >= timerMax && sprinting) {sprite.move({(horizontalSpeed / 1.5f) * 3, (verticalSpeed / 1.5f) * 3}); textureX += 240; animate(sprintingSouthEastXStart, sprintingSouthEastXEnd, 
-            sprintingSouthEastYStart, sprintingSouthEastYEnd); timer = 0.0f;}
-        // Jog animation
-        else if (timer >= timerMax) {textureX += 240; animate(JogSouthEastXStart, JogSouthEastXEnd, 
-            JogSouthEastYStart, JogSouthEastYEnd); timer = 0.0f;}
+        sf::Vector2f movement{horizontalSpeed / 1.5f, verticalSpeed / 1.5f};
+        if (!handleCollision(movement, nextBounds, wallBounds)) {
+            // Waits for set amount of time then plays Jog south east animation
+            timer += 0.08f;
+            // Sprinting animation
+            if (timer >= timerMax && sprinting) {sprite.move({(horizontalSpeed / 1.5f) * 3, (verticalSpeed / 1.5f) * 3}); textureX += 240; animate(sprintingSouthEastXStart, sprintingSouthEastXEnd, 
+                sprintingSouthEastYStart, sprintingSouthEastYEnd); timer = 0.0f;}
+            // Jog animation
+            else if (timer >= timerMax) {textureX += 240; animate(JogSouthEastXStart, JogSouthEastXEnd, 
+                JogSouthEastYStart, JogSouthEastYEnd); timer = 0.0f;}
+        }
     }
     // If both left and up key pressed then move character left and up at same time
     else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Left) && sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Up) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::A) && sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::W)) {
@@ -236,6 +246,39 @@ void Player::handleInput() {
     }
 }
 
+bool Player::handleCollision(sf::Vector2f movement, sf::FloatRect nextBounds, std::vector<sf::FloatRect> wallBounds) {
+// Full movement prediction
+    nextBounds.position += movement;
+
+    for (const auto& wall : wallBounds) {
+        if (nextBounds.findIntersection(wall).has_value()) {
+            // Try horizontal-only movement
+            sf::Rect<float> horizontalBounds = nextBounds;
+            horizontalBounds.position.x -= movement.x; // Undo x movement
+
+            if (!horizontalBounds.findIntersection(wall).has_value()) {
+                sprite.move({0.f, movement.y}); // Slide vertically
+                return true;
+            }
+
+            // Try vertical-only movement
+            sf::Rect<float> verticalBounds = nextBounds;
+            verticalBounds.position.y -= movement.y; // Undo y movement
+
+            if (!verticalBounds.findIntersection(wall).has_value()) {
+                sprite.move({movement.x, 0.f}); // Slide horizontally
+                return true;
+            }
+
+            std::cout << "Blocked from all sides\n";
+            return true; // Fully blocked
+        }
+    }
+    // No collision — move freely
+    sprite.move(movement);
+    return false;
+}
+
 // Reusable function for animating player
 void Player::animate(int xStart, int xEnd, int yStart, int yEnd) {
     // If current texture coordinates outside of expected values then use start coordinates

Player.hpp

@@ -6,11 +6,12 @@
 class Player {
 public:
     Player();
-    void handleInput();
+    void handleInput(std::vector<sf::FloatRect> wallBounds);
     void Player::sprint(bool sprint);
     void update();
     sf::Vector2f getPosition();
     void draw(sf::RenderWindow& window);
+    bool handleCollision(sf::Vector2f movement, sf::FloatRect nextBounds, std::vector<sf::FloatRect> wallBounds);
     void animate(int xStart, int xEnd, int yStart, int yEnd);
     sf::Texture texture;
     sf::Sprite sprite;

main.cpp

@@ -17,22 +17,37 @@ int main()
     // Create a player
     Player player;
 
-    // Create a enemy
+    // Create enemies
     std::vector<Enemy> enemies;
-    sf::Vector2<float> position1(275.f, 200.f);
+    // Create enemy 1
+    sf::Vector2<float> position1(275.f, 200.f); // Set coordinates
     Enemy enemy1(position1, sf::Color::Red);
     enemies.push_back(enemy1);
-    sf::Vector2<float> position2(255.f, 220.f);
+    // Create enemy 2
+    sf::Vector2<float> position2(255.f, 210.f); // Set coordinates
     Enemy enemy2(position2, sf::Color::Red);
     enemies.push_back(enemy2);
 
     // Create walls
     std::vector<sf::RectangleShape> walls;
-    sf::RectangleShape wall(sf::Vector2f(50.f, 50.f));
-    sf::Vector2<float> position(275.f, 200.f); // Set coordinates
-    wall.setPosition(position);
-    wall.setFillColor(sf::Color::Red);
-    walls.push_back(wall);
+    // Create wall 1
+    sf::Vector2<float> wallPos1(275.f, 200.f); // Set coordinates
+    sf::RectangleShape wall1(wallPos1);
+    wall1.setOrigin(wall1.getLocalBounds().size / 2.f);
+    wall1.setPosition(wallPos1);
+    wall1.setFillColor(sf::Color::Red);
+    wall1.setScale({0.5f,0.5f});
+    walls.push_back(wall1);
+    // Create wall 2
+    sf::Vector2<float> wallPos2(255.f, 180.f); // Set coordinates
+    sf::RectangleShape wall2(wallPos2);
+    wall2.setOrigin(wall2.getLocalBounds().size / 2.f);
+    wall2.setPosition(wallPos2);
+    wall2.setFillColor(sf::Color::Red);
+    wall2.setScale({0.5f,0.5f});
+    walls.push_back(wall2);
+
+    std::vector<sf::FloatRect> wallBounds;
 
     // Create game window
     sf::RenderWindow window(sf::VideoMode({800, 600}), "2D Game", sf::Style::Titlebar | sf::Style::Close);
@@ -89,7 +104,7 @@ int main()
         window.handleEvents(onClose, onKeyPressed, onKeyReleased);
 
         // Handle player controls and enemy updates
-        player.handleInput();
+        player.handleInput(wallBounds);
         player.update();
 
         // Create new window with sprites drawn in
@@ -99,6 +114,9 @@ int main()
         // Display walls
         for (const auto& wall : walls) {
             window.draw(wall);
+            sf::FloatRect bounds = wall.getGlobalBounds();
+            bounds.size = wall.getGlobalBounds().size *= 0.2f;
+            wallBounds.push_back(bounds);
         }
         // Display and update enemies
         for (auto& enemy : enemies) {