Separate Playes class

.vscode/launch.json

@@ -4,6 +4,7 @@
     // Для получения дополнительной информации посетите: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+    
         {
             "name": "(gdb-win) Launch Packer",
             "type": "cppdbg",

pge/src/olcPGEX_Graphics2D.cpp

@@ -33,7 +33,7 @@ namespace olc
 		sx = std::min(sx, px); sy = std::min(sy, py);
 		ex = std::max(ex, px); ey = std::max(ey, py);
 
-		transform.Forward((float)sprite->width, -y0, px, py);
+		transform.Forward((float)sprite->width-x0, -y0, px, py);
 		sx = std::min(sx, px); sy = std::min(sy, py);
 		ex = std::max(ex, px); ey = std::max(ey, py);
 
@@ -89,7 +89,7 @@ namespace olc
 		sx = std::min(sx, px); sy = std::min(sy, py);
 		ex = std::max(ex, px); ey = std::max(ey, py);
 
-		transform.Forward((float)w, -yOff, px, py);
+		transform.Forward((float)w-xOff, -yOff, px, py);
 		sx = std::min(sx, px); sy = std::min(sy, py);
 		ex = std::max(ex, px); ey = std::max(ey, py);
 

src/pabloader/awoorwae.cpp

@@ -18,7 +18,7 @@ bool Awoorwae::OnUserCreate()
 
 bool Awoorwae::OnUserUpdate(float fElapsedTime)
 {
-    Clear(olc::BLACK);
+    Clear(olc::VERY_DARK_CYAN);
 
     player->Update(fElapsedTime);
     player->Draw();
@@ -29,17 +29,26 @@ Entity::Entity(Awoorwae* game_)
     : game(game_)
 {
     xv = 0;
-    yv = 30;
-    x = game->ScreenWidth() / 2;
-    y = game->ScreenHeight() / 2;
+    yv = 0;}
+
+Player::Player(Awoorwae* game_)
+    : Entity(game_)
+{
 }
 
-olc::rcode Entity::Load()
+olc::rcode Player::Load()
 {
-    return img.LoadFromPGESprFile("res/awoorwa.spr");
+    olc::rcode result = img.LoadFromPGESprFile("res/awoorwa.spr");
+    if (result) {
+        w = img.width / 4;
+        h = img.height / 4;
+    }
+    x = (game->ScreenWidth() - w) / 2;
+    y = game->ScreenHeight() / 2;
+    return result;
 }
 
-void Entity::Update(float dt)
+void Player::Update(float dt)
 {
     x += xv * dt;
     y += yv * dt;
@@ -49,6 +58,8 @@ void Entity::Update(float dt)
     if (!onGround) {
         yv += 50 * dt;
         yv *= 1 - 0.05 * dt;
+    } else {
+        xv *= 1 - 0.5 * dt;
     }
 
     transform.Reset();
@@ -76,26 +87,39 @@ void Entity::Update(float dt)
         userInput = true;
     }
 
-    if (x > game->ScreenWidth() - img.width / 2) {
+    if (game->GetKey(olc::J).bPressed) {
+        skin = 1 - skin;
+    }
+
+    if (x > game->ScreenWidth() - w / 2) {
         xv *= -0.3;
-        x = game->ScreenWidth() - img.width / 2;
+        x = game->ScreenWidth() - w / 2;
     }
 
-    if (x < img.width / 2) {
+    if (x < w / 2) {
         xv *= -0.3;
-        x = img.width / 2;
+        x = w / 2;
     }
 
-    if (y > game->ScreenHeight() - img.height / 4) {
+    if (y > game->ScreenHeight() - h / 2) {
         yv *= -0.3;
 
         if (std::abs(yv) < 2) {
             yv = 0;
         }
-        y = game->ScreenHeight() - img.height / 4;
+        y = game->ScreenHeight() - h / 2;
     }
 
-    onGround = y >= game->ScreenHeight() - img.height / 4;
+    onGround = y >= game->ScreenHeight() - h / 2;
+
+    if (onGround) {
+        tile = 2;
+        tileCounter = 30;
+    } else if (tileCounter <= 0) {
+        tile = 0;
+    } else {
+        tileCounter--;
+    }
 
     if (!userInput && std::abs(xv) < 2) {
         xv = 0;
@@ -106,12 +130,13 @@ void Entity::Update(float dt)
     transform.Translate(x, y);
 }
 
-void Entity::Draw()
+void Player::Draw()
 {
+    float xOff = xv < 0 ? -1: 0;
     if (std::abs(xv) < 1) {
-        olc::GFX2D::DrawPartialSprite(&img, 0, img.height / 2, img.width, img.height / 2, transform, true);
+        olc::GFX2D::DrawPartialSprite(&img, skin * w + xOff, h + tile * h, w, h, transform, true);
     } else {
-        olc::GFX2D::DrawPartialSprite(&img, 0, 0, img.width, img.height / 2, transform, true);
+        olc::GFX2D::DrawPartialSprite(&img, skin * w + xOff, 0 + tile * h, w, h, transform, true);
     }
 #ifdef _DEBUG
     float x, y;

src/pabloader/awoorwae.h

@@ -8,31 +8,44 @@ namespace pabloader {
 class Awoorwae;
 
 class Entity {
-private:
+protected:
     Awoorwae* game;
     olc::Sprite img;
     olc::GFX2D::Transform2D transform;
     float x, y;
     float xv, yv;
+    int w, h;
+    int tile = 0;
+    int skin = 0;
+    int tileCounter = 0;
     bool onGround = false;
 
 public:
     Entity(Awoorwae* game_);
+    virtual ~Entity(){};
+
+    virtual olc::rcode Load() = 0;
+    virtual void Update(float dt) = 0;
+    virtual void Draw() = 0;
+};
 
-    void Update(float dt);
-    void Draw();
-    olc::rcode Load();
+class Player : public Entity {
+public:
+    Player(Awoorwae* game);
+    olc::rcode Load() override;
+    void Update(float dt) override;
+    void Draw() override;
 };
 
 class Awoorwae : public olc::PixelGameEngine {
 private:
-    Entity* player;
+    Player* player;
 
 public:
     Awoorwae()
     {
         sAppName = "Awoorwa";
-        player = new Entity(this);
+        player = new Player(this);
     }
 
     ~Awoorwae()