Modify player class & add animations

Co-Authored-By: Deivid Donchev <85338879+DNDonchev20@users.noreply.github.com>

Program/Game/El Octavo-Functions.cpp

@@ -1,21 +1,26 @@
 #include "Precompile.h"
 #include "El Octavo-Functions.h";
+
 #include "GameClass.h";
 
 namespace variables {
     int keyTime = 0;
+    float deltaTime = 0.0f;
+
     RenderWindow window(VideoMode(1500, 800), "The legend of Kurabirov", sf::Style::Titlebar | sf::Style::Close);;
     Event ev;
+
     Texture bgTexture;
     Sprite bgImage;
-    Player plr;
+
     Texture plrT;
-    Sprite plrS;
+    Sprite plrRect;
+
 }
 
 using namespace variables;
 
-void update(int& keyTime, RectangleShape& square, RenderWindow& window);
+//void update(int& keyTime, RectangleShape& square, RenderWindow& window);
 void moveCamera(string direction, Sprite& image);
 
 void setVars()
@@ -27,105 +32,31 @@ void setVars()
     bgTexture.loadFromFile("../Images and fonts/Bg/test bg.png");
     bgImage.setTexture(bgTexture);
 
-    plrT.loadFromFile("../Images and fonts/Main character/Main Character 81x129.png");
-    plrS.setTexture(plrT);
-
-
-    plr.setPublicVariables(window.getSize().x / 2, window.getSize().y / 2, 100, plrS);
-    plr.setValues();
-
+    plrRect.setTexture(plrT);
+    plrRect.setPosition(window.getSize().x / 2, window.getSize().y / 2);
+    plrT.loadFromFile("../Images and fonts/Main character/Main character walking sheet.png");
+
     //setting position of the background
     bgImage.setOrigin(1920, 1080);
     bgImage.setPosition(window.getSize().x / 2, window.getSize().y / 2);
+
 }
 
-void moveCamera(string direction, Sprite& image) {
-    if (direction == "left" && image.getPosition().x != 1920) 
-    {
-        image.move(5.f, 0.f);
-    }
-
-    if (direction == "right" && image.getPosition().x != -420) 
-    {
-        image.move(-5.f, 0.f);
-    }
-
-    if (direction == "up") 
-    {
-        if (image.getPosition().y != 1080) {
-            image.move(0.f, 5.f);
-        }
-        else {
-            if (!plr.getMoved()) {
-                plr.updatePos(0.f, 5.f);
-
-                if (plr.getPos('y') >= ) {
-
-                }
-            }
-        }
-    }
-
-
-    if (direction == "down" && image.getPosition().y != -280) 
-    {
-        image.move(0.f, -5.f);
-    }
-}
-
-void update(int& keyTime, RectangleShape& square, RenderWindow& window)
+void setup()
 {
-    if (keyTime < 1)
-    {
-        keyTime++;
-    }
-
-    //WASD moving
-    if (keyTime >= 1)
-    {
-        if (Keyboard::isKeyPressed(Keyboard::A))
-        {
-            moveCamera("left", bgImage);
-            keyTime = 0;
-        }
-
-        if (Keyboard::isKeyPressed(Keyboard::D))
-        {
-            moveCamera("right", bgImage);
-            keyTime = 0;
-        }
-
-        if (Keyboard::isKeyPressed(Keyboard::W))
-        {
-            moveCamera("up", bgImage);
-            keyTime = 0;
-        }
+    setVars();
 
-        if (Keyboard::isKeyPressed(Keyboard::S))
-        {
-            moveCamera("down", bgImage);
-            keyTime = 0;
-        }
+    // start of sussy variables
 
-        if (Mouse::isButtonPressed(Mouse::Left))
-        {
-            square.setFillColor(Color::Blue);
-            keyTime = 0;
-        }
-        else {
-            square.setFillColor(Color::Red);
-            keyTime = 0;
-        }
-    }
-}
+    Clock clock;
+    Player plr(&plrT, Vector2u(3, 2), 0.3f);
 
-
-void setup()
-{
-    setVars();
+    // end of sussy variables
 
     while (window.isOpen())
     {
+        deltaTime = clock.restart().asSeconds();
+
         while (window.pollEvent(ev))
         {
             if (ev.type == Event::Closed)
@@ -139,13 +70,87 @@ void setup()
             }
         }
 
+        //cout << plrRect.getPosition().x << " " << plrRect.getPosition().y << endl;
+
+        plr.update(0, deltaTime);
+        plrRect.setTextureRect(plr.uvRect);
+
         window.clear(Color::Green);
 
-        window.draw(bgImage);
+        //window.draw(bgImage);
+        window.draw(plrRect);
 
         //display character
-        plr.draw(window);
 
         window.display();
     }
-}
+}
+
+void moveCamera(string direction, Sprite& image) {
+    if (direction == "left" && image.getPosition().x != 1920) 
+    {
+        image.move(5.f, 0.f);
+    }
+
+    if (direction == "right" && image.getPosition().x != -420) 
+    {
+        image.move(-5.f, 0.f);
+    }
+
+    if (direction == "up" && image.getPosition().y != 1080)
+    {
+        image.move(0.f, 5.f);
+    }
+
+
+    if (direction == "down" && image.getPosition().y != -280) 
+    {
+        image.move(0.f, -5.f);
+    }
+}
+
+//void update(int& keyTime, RectangleShape& square, RenderWindow& window)
+//{
+//    if (keyTime < 1)
+//    {
+//        keyTime++;
+//    }
+//
+//    //WASD moving
+//    if (keyTime >= 1)
+//    {
+//        if (Keyboard::isKeyPressed(Keyboard::A))
+//        {
+//            moveCamera("left", bgImage);
+//            keyTime = 0;
+//        }
+//
+//        if (Keyboard::isKeyPressed(Keyboard::D))
+//        {
+//            moveCamera("right", bgImage);
+//            keyTime = 0;
+//        }
+//
+//        if (Keyboard::isKeyPressed(Keyboard::W))
+//        {
+//            moveCamera("up", bgImage);
+//            keyTime = 0;
+//        }
+//
+//        if (Keyboard::isKeyPressed(Keyboard::S))
+//        {
+//            moveCamera("down", bgImage);
+//            keyTime = 0;
+//        }
+//
+//        if (Mouse::isButtonPressed(Mouse::Left))
+//        {
+//            square.setFillColor(Color::Blue);
+//            keyTime = 0;
+//        }
+//        else {
+//            square.setFillColor(Color::Red);
+//            keyTime = 0;
+//        }
+//    }
+//}

Program/Game/Game.vcxproj

@@ -146,6 +146,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="El Octavo-Functions.cpp" />
+    <ClCompile Include="GameClass.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="Menu.cpp" />
   </ItemGroup>

Program/Game/Game.vcxproj.filters

@@ -24,6 +24,9 @@
     <ClCompile Include="El Octavo-Functions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="GameClass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="GameClass.h">

Program/Game/GameClass.cpp

@@ -0,0 +1,38 @@
+#include "GameClass.h";
+
+Player::Player(Texture* texture, Vector2u imageCount, float switchTime)
+{
+	this->imageCount = imageCount;
+	this->switchTime = switchTime;
+
+	totalTime = 0.0f;
+
+	currentImage.x = 0;
+
+	uvRect.width = texture->getSize().x / float(imageCount.x);
+	uvRect.height = texture->getSize().y / float(imageCount.y);
+}
+
+Player::~Player()
+{
+}
+
+void Player::update(int row, float deltaTime)
+{
+	currentImage.y = row;
+	totalTime += deltaTime;
+
+	if(totalTime >= switchTime)
+	{
+		totalTime -= switchTime;
+		currentImage.x++;
+
+		if(currentImage.x >= imageCount.x)
+		{
+			currentImage.x = 0;
+		}
+	}
+
+	uvRect.left = currentImage.x * uvRect.width;
+	uvRect.top = currentImage.y * uvRect.height;
+}

Program/Game/GameClass.h

@@ -11,23 +11,27 @@ class Player {
 	int hp;
 	int pSC;
 	bool pMoved;
-	Sprite pSprite;
+	float totalTime;
+	float switchTime;
+	Vector2u imageCount;
+	Vector2u currentImage;
 
 public:
+	IntRect uvRect;
 
-	void setPublicVariables(float posX, float posY, int hp, Sprite pSprite)
+	Player(Texture* texture, Vector2u imageCount, float switchTime);
+	~Player();
+
+	void update(int row, float deltaTime);
+
+	void setPublicVariables(float posX, float posY, int hp)
 	{
 		this->posX = posX;
 		this->posY = posY;
 		this->hp = hp;
-		this->pSprite = pSprite;
 		this->pMoved = false;
 	}
 
-	void setValues()
-	{
-		this->pSprite.setPosition(this->posX, this->posY);
-	}
 	// misc functions
 
 	float getPos(char cord) {
@@ -46,25 +50,10 @@ class Player {
 
 	// update functions
 
-	void updatePos(float moveX, float moveY) {
-		this->pSprite.move(moveX, moveY);
-
-		this->posX = pSprite.getPosition().x;
-		this->posY = pSprite.getPosition().y;
-	}
-
-	void changeSprite(Texture* newTexture) {
-		this->pSprite.setTexture(*newTexture);
-	}
-
 	void updateHealth(int newHp) {
 		this->hp = newHp;
 	}
 
-	void draw(RenderWindow& window) {
-		window.draw(pSprite);
-	}
-
 
 	// combat functions