Created Player class files and moved relevant code from main into it

Author: Callum-OP

.vscode/settings.json

@@ -16,6 +16,59 @@
         "xstring": "cpp",
         "iterator": "cpp",
         "type_traits": "cpp",
-        "xutility": "cpp"
+        "xutility": "cpp",
+        "algorithm": "cpp",
+        "array": "cpp",
+        "bit": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "codecvt": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "exception": "cpp",
+        "map": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "format": "cpp",
+        "functional": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "locale": "cpp",
+        "memory": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "ratio": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "tuple": "cpp",
+        "typeinfo": "cpp",
+        "utility": "cpp",
+        "variant": "cpp",
+        "xfacet": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstddef": "cpp",
+        "xtr1common": "cpp"
     }
 }

Player.cpp

@@ -0,0 +1,104 @@
+#include "Player.hpp"
+#include <SFML/Window/Keyboard.hpp>
+
+Player::Player()
+    : texture{},
+        sprite( // Create a player sprite
+            [this]() {
+              if (!texture.loadFromFile("spritesheet.png"))
+                  throw std::runtime_error("Failed to load sprite sheet");
+              return sf::Sprite(texture);
+            }()
+        )
+    {
+    sprite.setTexture(texture);
+    sprite.setTextureRect({{485,1}, {240,240}});
+    sprite.setOrigin({sprite.getTextureRect().size.x / 2.0f, sprite.getTextureRect().size.y / 2.0f});
+    sf::Vector2<float> position(275.f, 200.f); // Set coordinates
+    sprite.setPosition(position); // Place sprite at coordinates
+    sprite.setScale({1.0f,1.0f});
+
+    // Default movement speed
+    verticalSpeed = 2.0f;
+    horizontalSpeed = 2.0f;
+
+    // Coordinates for current texture in spritesheet
+    textureX = 1;
+    textureY = 1;
+
+    // Timer for animations and delays
+    timer = 0.0f;
+    timerMax = 0.5f;
+
+    // When x coordinates have reached the final column
+    finalColumn = 1211;
+
+    // Start and end coordinates for animation textures in spritesheet
+    walkingDownXStart = 485;
+    walkingDownYStart = 727;
+    walkingDownXEnd = 727;
+    walkingDownYEnd = 969;
+}
+
+void Player::handleInput() {
+
+    // If left key pressed then move character left
+    if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Left)) {
+        sprite.move({-horizontalSpeed, 0.0f});
+    }
+    // If right key pressed then move character right
+    if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Right)) {
+        sprite.move({horizontalSpeed, 0.0f});
+    }
+    // If up key pressed then move character up
+    if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Up)) {
+        sprite.move({0.0f, -verticalSpeed});
+    }
+    // If down key pressed then move character down
+    if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Down)) {
+        sprite.move({0.0f, verticalSpeed});
+
+        // Walking down animation
+        timer += 0.1f;
+        // Will wait for set amount of time
+        if (timer >= timerMax) {
+            textureX += 242;
+            // If behind walking down textures, go to start
+            if(textureY == 727) {
+                if(textureX < 485) {
+                    textureX = 485;
+                }
+            }
+            // If gone past walking down textures, go back to start
+            if(textureY == 969) {
+                if(textureX > 727) {
+                    textureY = 727;
+                    textureX = 485;
+                }
+            }
+            // If not within walking down textures, go to start
+            if(textureY < 727 || textureY > 969) {
+                textureX = 485;
+                textureY = 727; 
+            }
+            // If texture width reached end of spritesheet
+            if(textureX > 1211) {
+                textureX = 1;
+                textureY += 242; 
+            }
+            // If texture width valid, then change current sprite texture
+            if(textureX <= 1211) {
+                sprite.setTextureRect({{textureX,textureY},{240,240}});
+            }
+            timer = 0.0f;
+        }
+    }
+}
+
+void Player::update() {
+    
+}
+
+void Player::draw(sf::RenderWindow& window) {
+    window.draw(sprite);
+}

Player.hpp

@@ -0,0 +1,23 @@
+#ifndef PLAYER_HPP
+#define PLAYER_HPP
+
+#include <SFML/Graphics.hpp>
+
+class Player {
+public:
+    Player();
+    void handleInput();
+    void update();
+    void draw(sf::RenderWindow& window);
+    private:
+    sf::Texture texture;
+    sf::Sprite sprite;
+
+    int textureX, textureY;
+    float timer, timerMax;
+    float verticalSpeed, horizontalSpeed;
+    int finalColumn;
+    int walkingDownXStart, walkingDownYStart, walkingDownXEnd, walkingDownYEnd;
+};
+
+#endif // PLAYER_HPP

Player.obj

@@ -6,103 +6,41 @@
 #include <SFML/Audio.hpp>
 #include <SFML/Network.hpp>
 
+#include "Player.cpp"
+#include "Player.hpp"
+
 int main()
 {
     // Create a player sprite
-    sf::Texture texture;
-    if (!texture.loadFromFile("spritesheet.png")) {
-        // Handle error
-    }
-
-    sf::Sprite sprite(texture);
-
-    int texWidth;
-    int texHeight;
-
-    sprite.setTextureRect({{485,1}, {240,240}});
-    sprite.setOrigin({sprite.getTextureRect().size.x / 2.0f, sprite.getTextureRect().size.y / 2.0f});
-    sf::Vector2<float> position(275.f, 200.f); // Set coordinates
-    sprite.setPosition(position); // Place sprite at coordinates
-    sprite.setScale({1.0f,1.0f});
-
-    float timer = 0.0f;
-    float timerMax = 0.5f;
+    Player player;
 
+    // Create game window
     sf::RenderWindow window(sf::VideoMode({800, 600}), "2D Game", sf::Style::Titlebar | sf::Style::Close);
     window.setFramerateLimit(60);
 
-    // Game loop
+    // Ensures window closes properly when closed
     const auto onClose = [&window](const sf::Event::Closed&) {
         window.close();
     };
-
+    // Ensure window is closed when Escape key is pressed
     const auto onKeyPressed = [&window](const sf::Event::KeyPressed& keyPressed) {
         if (keyPressed.scancode == sf::Keyboard::Scancode::Escape)
             window.close();
     };
 
+    // Game loop
     while (window.isOpen()) {
         window.handleEvents(onClose, onKeyPressed);
 
-        // Remainder of main loop
+        // Handle player controls
+        player.handleInput();
+        player.update();
 
         // Create new window with sprite drawn in
         window.clear(sf::Color::White);
-        window.draw(sprite);
+        player.draw(window);
         window.display();
-
-        // If left key pressed then move character left
-        if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::Left)) {
-            sprite.move({-2.f, 0.f});
-        }
-        // If right key pressed then move character right
-        if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Right))
-        {
-            sprite.move({2.f, 0.f});
-        }
-        // If down key pressed then move character down
-        if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Down))
-        {
-            sprite.move({0.f, 2.f});
-
-            // Walking down animation
-            timer += 0.1f;
-            if(timer >= timerMax) {
-                texWidth += 242;
-                // If behind walking down textures, go to start
-                if(texHeight == 727) {
-                    if(texWidth < 485) {
-                        texWidth = 485;
-                    }
-                }
-                // If gone past walking down textures, go back to start
-                if(texHeight == 969) {
-                    if(texWidth > 727) {
-                        texHeight = 727;
-                        texWidth = 485;
-                    }
-                }
-                // If not within walking down textures, go to start
-                if(texHeight < 727 || texHeight > 969) {
-                    texWidth = 485;
-                    texHeight = 727; 
-                }
-                // If texture width reached end of spritesheet
-                if(texWidth > 1211) {
-                    texWidth = 1;
-                    texHeight += 242; 
-                }
-                // If texture width valid, then change current sprite texture
-                if(texWidth <= 1211) {
-                    sprite.setTextureRect({{texWidth,texHeight},{240,240}});
-                }
-                timer = 0.0f;
-            }
-        }
-        // If up key pressed then move character up
-        if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Up))
-        {
-            sprite.move({0.f, -2.f});
-        }
     }
+
+    return 0;
 }