Updated animate function to fix potential bugs, updated spritesheet

Author: Callum-OP

Ball.png

@@ -5,7 +5,7 @@ Player::Player()
     : texture{},
         sprite( // Create a player sprite
             [this]() {
-              if (!texture.loadFromFile("spritesheet.png"))
+              if (!texture.loadFromFile("playerSpritesheet.png"))
                   throw std::runtime_error("Failed to load sprite sheet");
               return sf::Sprite(texture);
             }()
@@ -24,37 +24,29 @@ Player::Player()
     horizontalSpeed = 2.0f;
 
     // Coordinates for current texture in spritesheet
-    textureX = 1;
-    textureY = 1;
+    textureX = 0;
+    textureY = 0;
 
     // Timer for animations and delays
     timer = 0.0f;
     timerMax = 0.5f;
 
     // When x coordinates have reached the final column
-    finalColumn = 1211;
+    finalColumn = 2160;
+    finalRow = 2400;
 
     // Start and end coordinates for animation textures in spritesheet
     // These values will need to be changed if the spritesheet changes
-    walkingDownXStart = 485;
-    walkingDownYStart = 727;
-    walkingDownXEnd = 727;
-    walkingDownYEnd = 969;
-
-    walkingUpXStart = 1;
-    walkingUpYStart = 485;
-    walkingUpXEnd = 243;
-    walkingUpYEnd = 727;
-
-    walkingLeftXStart = 969;
-    walkingLeftYStart = 969;
-    walkingLeftXEnd = 1211;
-    walkingLeftYEnd = 1211;
-
-    walkingRightXStart = 969;
-    walkingRightYStart = 1;
-    walkingRightXEnd = 1211;
-    walkingRightYEnd = 243;
+
+    joggingEastXStart = 1920; joggingEastYStart = 0; joggingEastXEnd = 720; joggingEastYEnd = 240;
+    joggingNorthXStart = 960; joggingNorthYStart = 240; joggingNorthXEnd = 2160; joggingNorthYEnd = 240;
+    joggingNorthEastXStart = 0; joggingNorthEastYStart = 480; joggingNorthEastXEnd = 1200; joggingNorthEastYEnd = 480;
+    joggingNorthWestXStart = 1440; joggingNorthWestYStart = 480; joggingNorthWestXEnd = 240; joggingNorthWestYEnd = 720;
+    joggingSouthXStart = 480; joggingSouthYStart = 720; joggingSouthXEnd = 1680; joggingSouthYEnd = 720;
+    joggingSouthEastXStart = 1920; joggingSouthEastYStart = 720; joggingSouthEastXEnd = 720; joggingSouthEastYEnd = 960;
+    joggingSouthWestXStart = 960; joggingSouthWestYStart = 960; joggingSouthWestXEnd = 2160; joggingSouthWestYEnd = 960;
+    joggingWestXStart = 0; joggingWestYStart = 1200; joggingWestXEnd = 1200; joggingWestYEnd = 1200;
+
 }
 
 void Player::handleInput() {
@@ -63,78 +55,79 @@ void Player::handleInput() {
     if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Left) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::A)) {
         sprite.move({-horizontalSpeed, 0.0f});
 
-        // Walking left animation
+        // jogging left animation
         timer += 0.08f;
         // Will wait for set amount of time
         if (timer >= timerMax) {
-            textureX += 242;
-            // Call animate function to play the walking left animation
-            animate(walkingLeftXStart, walkingLeftXEnd, 
-                walkingLeftYStart, walkingLeftYEnd, finalColumn);
+            textureX += 240;
+            // Call animate function to play the jogging left animation
+            animate(joggingWestXStart, joggingWestXEnd, 
+                joggingWestYStart, joggingWestYEnd);
             timer = 0.0f;
         }
     }
     // If right key pressed then move character right
-    if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Right) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::D)) {
+    else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Right) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::D)) {
         sprite.move({horizontalSpeed, 0.0f});
 
-        // Walking right animation
+        // jogging right animation
         timer += 0.08f;
         // Will wait for set amount of time
         if (timer >= timerMax) {
-            textureX += 242;
-            // Call animate function to play the walking right animation
-            animate(walkingRightXStart, walkingRightXEnd, 
-                walkingRightYStart, walkingRightYEnd, finalColumn);
+            textureX += 240;
+            // Call animate function to play the jogging right animation
+            animate(joggingEastXStart, joggingEastXEnd, 
+                joggingEastYStart, joggingEastYEnd);
             timer = 0.0f;
         }
     }
     // If up key pressed then move character up
-    if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Up) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::W)) {
+    else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Up) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::W)) {
         sprite.move({0.0f, -verticalSpeed});
 
-        // Walking up animation
+        // jogging up animation
         timer += 0.08f;
         // Will wait for set amount of time
         if (timer >= timerMax) {
-            textureX += 242;
-            // Call animate function to play the walking up animation
-            animate(walkingUpXStart, walkingUpXEnd, 
-                walkingUpYStart, walkingUpYEnd, finalColumn);
+            textureX += 240;
+            // Call animate function to play the jogging up animation
+            animate(joggingNorthXStart, joggingNorthXEnd, 
+                joggingNorthYStart, joggingNorthYEnd);
             timer = 0.0f;
         }
     }
     // If down key pressed then move character down
-    if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Down) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::S)) {
+    else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::Down) || sf::Keyboard::isKeyPressed(sf::Keyboard::Scan::S)) {
         sprite.move({0.0f, verticalSpeed});
 
-        // Walking down animation
+        // jogging down animation
         timer += 0.08f;
         // Will wait for set amount of time
         if (timer >= timerMax) {
-            textureX += 242;
-            // Call animate function to play the walking down animation
-            animate(walkingDownXStart, walkingDownXEnd, 
-                walkingDownYStart, walkingDownYEnd, finalColumn);
+            textureX += 240;
+            // Call animate function to play the jogging down animation
+            animate(joggingSouthXStart, joggingSouthXEnd, 
+                joggingSouthYStart, joggingSouthYEnd);
             timer = 0.0f;
         }
     }
 }
 
 // Reusable function for animating player
-void Player::animate(int xStart, int xEnd, int yStart, int yEnd, int finalCol) {
+void Player::animate(int xStart, int xEnd, int yStart, int yEnd) {
     // If current texture coordinates outside of expected values then use start coordinates
-    if(textureY == yStart) {if(textureX < xStart) {textureX = xStart;}} // If column is incorrect
-    else if(textureY == yEnd) {if(textureX > xEnd) {textureX = xStart; textureY = yStart;}}
-    if(textureY < yStart || textureY > yEnd) {textureX = xStart; textureY = yStart;} // If row is incorrect
+    if(textureY == yStart) {if(textureX < xStart) {textureX = xStart; textureY = yStart;}} // If column is before start of anim
+    if(textureY == yEnd) {if(textureX > xEnd) {textureX = xStart; textureY = yStart;}} // If column is past end of anim
+    if(textureY < yStart || textureY > yEnd) {textureX = xStart; textureY = yStart;} // If row is before or after anim
+    if(textureY != yStart && textureY != yEnd) {textureX = xStart; textureY = yStart;} // Row value is invalid
 
     // If x is at final column, switch to next row
-    if (textureX > finalCol) { textureX = 1; textureY += 242;}
-    // If y is at final column, then use start coordinates
-    if (textureY > finalCol) {textureX = xStart; textureY = yStart;}
+    if (textureX > finalColumn) { textureX = 0; textureY += 240;}
+    // If y is at final row, then use start coordinates
+    if (textureY > finalRow) {textureX = xStart; textureY = yStart;}
 
     // If x value is valid, then change current sprite texture coordinates
-    if (textureX <= finalCol) {
+    if (textureX <= finalColumn) {
         sprite.setTextureRect({{textureX, textureY}, {240, 240}});
     }
 }

Player.cpp

@@ -9,19 +9,23 @@ class Player {
     void handleInput();
     void update();
     void draw(sf::RenderWindow& window);
-    void animate(int xStart, int xEnd, int yStart, int yEnd, int finalCol);
+    void animate(int xStart, int xEnd, int yStart, int yEnd);
     private:
     sf::Texture texture;
     sf::Sprite sprite;
 
     int textureX, textureY;
     float timer, timerMax;
     float verticalSpeed, horizontalSpeed;
-    int finalColumn;
-    int walkingDownXStart, walkingDownYStart, walkingDownXEnd, walkingDownYEnd;
-    int walkingUpXStart, walkingUpYStart, walkingUpXEnd, walkingUpYEnd;
-    int walkingLeftXStart, walkingLeftYStart, walkingLeftXEnd, walkingLeftYEnd;
-    int walkingRightXStart, walkingRightYStart, walkingRightXEnd, walkingRightYEnd;
+    int finalColumn, finalRow;
+    int joggingNorthXStart, joggingNorthYStart, joggingNorthXEnd, joggingNorthYEnd;
+    int joggingNorthEastXStart, joggingNorthEastYStart, joggingNorthEastXEnd, joggingNorthEastYEnd;
+    int joggingEastXStart, joggingEastYStart, joggingEastXEnd, joggingEastYEnd;
+    int joggingSouthEastXStart, joggingSouthEastYStart, joggingSouthEastXEnd, joggingSouthEastYEnd;
+    int joggingSouthXStart, joggingSouthYStart, joggingSouthXEnd, joggingSouthYEnd;
+    int joggingSouthWestXStart, joggingSouthWestYStart, joggingSouthWestXEnd, joggingSouthWestYEnd;
+    int joggingWestXStart, joggingWestYStart, joggingWestXEnd, joggingWestYEnd;
+    int joggingNorthWestXStart, joggingNorthWestYStart, joggingNorthWestXEnd, joggingNorthWestYEnd;
 };
 
 #endif // PLAYER_HPP

Player.hpp

@@ -0,0 +1 @@
+{"FaceEast":{"x":0,"y":0,"rotation":0,"width":240,"height":240},"FaceNorth":{"x":240,"y":0,"rotation":0,"width":240,"height":240},"FaceNorthEast":{"x":480,"y":0,"rotation":0,"width":240,"height":240},"FaceNorthWest":{"x":720,"y":0,"rotation":0,"width":240,"height":240},"FaceSouth":{"x":960,"y":0,"rotation":0,"width":240,"height":240},"FaceSouthEast":{"x":1200,"y":0,"rotation":0,"width":240,"height":240},"FaceSouthWest":{"x":1440,"y":0,"rotation":0,"width":240,"height":240},"FaceWest":{"x":1680,"y":0,"rotation":0,"width":240,"height":240},"JogEast1":{"x":1920,"y":0,"rotation":0,"width":240,"height":240},"JogEast2":{"x":2160,"y":0,"rotation":0,"width":240,"height":240},"JogEast3":{"x":0,"y":240,"rotation":0,"width":240,"height":240},"JogEast4":{"x":240,"y":240,"rotation":0,"width":240,"height":240},"JogEast5":{"x":480,"y":240,"rotation":0,"width":240,"height":240},"JogEast6":{"x":720,"y":240,"rotation":0,"width":240,"height":240},"JogNorth1":{"x":960,"y":240,"rotation":0,"width":240,"height":240},"JogNorth2":{"x":1200,"y":240,"rotation":0,"width":240,"height":240},"JogNorth3":{"x":1440,"y":240,"rotation":0,"width":240,"height":240},"JogNorth4":{"x":1680,"y":240,"rotation":0,"width":240,"height":240},"JogNorth5":{"x":1920,"y":240,"rotation":0,"width":240,"height":240},"JogNorth6":{"x":2160,"y":240,"rotation":0,"width":240,"height":240},"JogNorthEast1":{"x":0,"y":480,"rotation":0,"width":240,"height":240},"JogNorthEast2":{"x":240,"y":480,"rotation":0,"width":240,"height":240},"JogNorthEast3":{"x":480,"y":480,"rotation":0,"width":240,"height":240},"JogNorthEast4":{"x":720,"y":480,"rotation":0,"width":240,"height":240},"JogNorthEast5":{"x":960,"y":480,"rotation":0,"width":240,"height":240},"JogNorthEast6":{"x":1200,"y":480,"rotation":0,"width":240,"height":240},"JogNorthWest1":{"x":1440,"y":480,"rotation":0,"width":240,"height":240},"JogNorthWest2":{"x":1680,"y":480,"rotation":0,"width":240,"height":240},"JogNorthWest3":{"x":1920,"y":480,"rotation":0,"width":240,"height":240},"JogNorthWest4":{"x":2160,"y":480,"rotation":0,"width":240,"height":240},"JogNorthWest5":{"x":0,"y":720,"rotation":0,"width":240,"height":240},"JogNorthWest6":{"x":240,"y":720,"rotation":0,"width":240,"height":240},"JogSouth1":{"x":480,"y":720,"rotation":0,"width":240,"height":240},"JogSouth2":{"x":720,"y":720,"rotation":0,"width":240,"height":240},"JogSouth3":{"x":960,"y":720,"rotation":0,"width":240,"height":240},"JogSouth4":{"x":1200,"y":720,"rotation":0,"width":240,"height":240},"JogSouth5":{"x":1440,"y":720,"rotation":0,"width":240,"height":240},"JogSouth6":{"x":1680,"y":720,"rotation":0,"width":240,"height":240},"JogSouthEast1":{"x":1920,"y":720,"rotation":0,"width":240,"height":240},"JogSouthEast2":{"x":2160,"y":720,"rotation":0,"width":240,"height":240},"JogSouthEast3":{"x":0,"y":960,"rotation":0,"width":240,"height":240},"JogSouthEast4":{"x":240,"y":960,"rotation":0,"width":240,"height":240},"JogSouthEast5":{"x":480,"y":960,"rotation":0,"width":240,"height":240},"JogSouthEast6":{"x":720,"y":960,"rotation":0,"width":240,"height":240},"JogSouthWest1":{"x":960,"y":960,"rotation":0,"width":240,"height":240},"JogSouthWest2":{"x":1200,"y":960,"rotation":0,"width":240,"height":240},"JogSouthWest3":{"x":1440,"y":960,"rotation":0,"width":240,"height":240},"JogSouthWest4":{"x":1680,"y":960,"rotation":0,"width":240,"height":240},"JogSouthWest5":{"x":1920,"y":960,"rotation":0,"width":240,"height":240},"JogSouthWest6":{"x":2160,"y":960,"rotation":0,"width":240,"height":240},"JogWest1":{"x":0,"y":1200,"rotation":0,"width":240,"height":240},"JogWest2":{"x":240,"y":1200,"rotation":0,"width":240,"height":240},"JogWest3":{"x":480,"y":1200,"rotation":0,"width":240,"height":240},"JogWest4":{"x":720,"y":1200,"rotation":0,"width":240,"height":240},"JogWest5":{"x":960,"y":1200,"rotation":0,"width":240,"height":240},"JogWest6":{"x":1200,"y":1200,"rotation":0,"width":240,"height":240},"SprintEast1":{"x":1440,"y":1200,"rotation":0,"width":240,"height":240},"SprintEast2":{"x":1680,"y":1200,"rotation":0,"width":240,"height":240},"SprintEast3":{"x":1920,"y":1200,"rotation":0,"width":240,"height":240},"SprintEast4":{"x":2160,"y":1200,"rotation":0,"width":240,"height":240},"SprintEast5":{"x":0,"y":1440,"rotation":0,"width":240,"height":240},"SprintEast6":{"x":240,"y":1440,"rotation":0,"width":240,"height":240},"SprintNorth1":{"x":480,"y":1440,"rotation":0,"width":240,"height":240},"SprintNorth2":{"x":720,"y":1440,"rotation":0,"width":240,"height":240},"SprintNorth3":{"x":960,"y":1440,"rotation":0,"width":240,"height":240},"SprintNorth4":{"x":1200,"y":1440,"rotation":0,"width":240,"height":240},"SprintNorth5":{"x":1440,"y":1440,"rotation":0,"width":240,"height":240},"SprintNorth6":{"x":1680,"y":1440,"rotation":0,"width":240,"height":240},"SprintNorthEast1":{"x":1920,"y":1440,"rotation":0,"width":240,"height":240},"SprintNorthEast2":{"x":2160,"y":1440,"rotation":0,"width":240,"height":240},"SprintNorthEast3":{"x":0,"y":1680,"rotation":0,"width":240,"height":240},"SprintNorthEast4":{"x":240,"y":1680,"rotation":0,"width":240,"height":240},"SprintNorthEast5":{"x":480,"y":1680,"rotation":0,"width":240,"height":240},"SprintNorthEast6":{"x":720,"y":1680,"rotation":0,"width":240,"height":240},"SprintNorthWest1":{"x":960,"y":1680,"rotation":0,"width":240,"height":240},"SprintNorthWest2":{"x":1200,"y":1680,"rotation":0,"width":240,"height":240},"SprintNorthWest3":{"x":1440,"y":1680,"rotation":0,"width":240,"height":240},"SprintNorthWest4":{"x":1680,"y":1680,"rotation":0,"width":240,"height":240},"SprintNorthWest5":{"x":1920,"y":1680,"rotation":0,"width":240,"height":240},"SprintNorthWest6":{"x":2160,"y":1680,"rotation":0,"width":240,"height":240},"SprintSouth1":{"x":0,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouth2":{"x":240,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouth3":{"x":480,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouth4":{"x":720,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouth5":{"x":960,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouth6":{"x":1200,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouthEast1":{"x":1440,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouthEast2":{"x":1680,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouthEast3":{"x":1920,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouthEast4":{"x":2160,"y":1920,"rotation":0,"width":240,"height":240},"SprintSouthEast5":{"x":0,"y":2160,"rotation":0,"width":240,"height":240},"SprintSouthEast6":{"x":240,"y":2160,"rotation":0,"width":240,"height":240},"SprintSouthWest1":{"x":480,"y":2160,"rotation":0,"width":240,"height":240},"SprintSouthWest2":{"x":720,"y":2160,"rotation":0,"width":240,"height":240},"SprintSouthWest3":{"x":960,"y":2160,"rotation":0,"width":240,"height":240},"SprintSouthWest4":{"x":1200,"y":2160,"rotation":0,"width":240,"height":240},"SprintSouthWest5":{"x":1440,"y":2160,"rotation":0,"width":240,"height":240},"SprintSouthWest6":{"x":1680,"y":2160,"rotation":0,"width":240,"height":240},"SprintWest1":{"x":1920,"y":2160,"rotation":0,"width":240,"height":240},"SprintWest2":{"x":2160,"y":2160,"rotation":0,"width":240,"height":240},"SprintWest3":{"x":0,"y":2400,"rotation":0,"width":240,"height":240},"SprintWest4":{"x":240,"y":2400,"rotation":0,"width":240,"height":240},"SprintWest5":{"x":480,"y":2400,"rotation":0,"width":240,"height":240},"SprintWest6":{"x":720,"y":2400,"rotation":0,"width":240,"height":240}}