update

lesson#29 - Player movement animation/ourGame/source/game/player.d

@@ -1,54 +0,0 @@
-module game.player;
-
-import game.data;
-import game.animation.animation;
-import game.animation.manager;
-
-class Player: Entity {
-    private int playerSpeed;
-    private AnimationManager animation;
-
-    this(in Texture2D texture, in Rectangle frame, in Vector2 position, in int playerSpeed) {
-        super(texture, frame, position);
-        this.playerSpeed = playerSpeed;
-
-        animation = AnimationManager();
-        animation.addAnimation(KeyboardKey.KEY_NULL, Animation(texture, 8, 3, 0.1f, 1));
-        animation.addAnimation(KeyboardKey.KEY_W, Animation(texture, 8, 3, 0.1f, 3));
-        animation.addAnimation(KeyboardKey.KEY_S, Animation(texture, 8, 3, 0.1f, 2));
-        animation.addAnimation(KeyboardKey.KEY_A, Animation(texture, 8, 3, 0.1f, 2));
-        animation.addAnimation(KeyboardKey.KEY_D, Animation(texture, 8, 3, 0.1f, 3));
-    }
-    
-    override void update() {}
-
-    override void processEvents() {
-        if(IsKeyDown(KeyboardKey.KEY_W)) {
-            move(0, -playerSpeed);
-            animation.update(KeyboardKey.KEY_W);
-        } else if(IsKeyDown(KeyboardKey.KEY_S)) {
-            move(0, playerSpeed);
-            animation.update(KeyboardKey.KEY_S);
-        } else if(IsKeyDown(KeyboardKey.KEY_A)) {
-            move(-playerSpeed, 0);
-            animation.update(KeyboardKey.KEY_A);
-        } else if(IsKeyDown(KeyboardKey.KEY_D)) {
-            move(playerSpeed, 0);
-            animation.update(KeyboardKey.KEY_D);
-        } else {
-            animation.update(KeyboardKey.KEY_NULL);
-        }
-    }
-
-    override void draw() {
-        animation.draw(position);
-    }
-}
-
-
-
-
-
-
-
-

lesson#29 - Player spritesheet animation/ourGame/source/app.d

@@ -2,8 +2,8 @@ module app;
 
 import game.data;
 import game.gstatemanager;
-import game.menu;
-import game.play;
+import game.state.menu;
+import game.state.play;
 
 void main() {
     validateRaylibBinding();

lesson#29 - Player spritesheet animation/ourGame/source/game/animation/animation.d

@@ -13,7 +13,7 @@ struct Animation {
         bool isActive;
     }
 
-    this(in Texture2D texture, in int numFrames, in int numVerticalFrames, in float frameTimeSecs, in int row = 1) {
+    this(in Texture2D texture, in int numFrames, in int numRows, in float frameTimeSecs, in int useRow = 1) {
         this.texture = texture;
         this.numFrames = numFrames;
         this.frameTimeSecs = frameTimeSecs;
@@ -23,9 +23,9 @@ struct Animation {
 
         // create rectangle frames
         immutable frameWidth = texture.width / numFrames;
-        immutable frameHeight = texture.height / numVerticalFrames;
+        immutable frameHeight = texture.height / numRows;
         foreach(i; 0 .. numFrames) {
-            this.rectFrames ~= Rectangle(i * frameWidth, (row - 1) * frameHeight, frameWidth, frameHeight);
+            this.rectFrames ~= Rectangle(i * frameWidth, (useRow - 1) * frameHeight, frameWidth, frameHeight);
         }
     }
     
@@ -48,7 +48,7 @@ struct Animation {
         }
 
         frameTimeSecsLeft -= GetFrameTime();
-        if(frameTimeSecsLeft < 0) {
+        if(frameTimeSecsLeft <= 0) {
             frameTimeSecsLeft += frameTimeSecs;
             currentFrame = (currentFrame + 1) % numFrames;
         }

lesson#29 - Player spritesheet animation/ourGame/source/game/animation/manager.d

@@ -7,7 +7,7 @@ struct AnimationManager {
     private Animation[KeyboardKey] animations;
     private KeyboardKey lastKey;
 
-    void addAnimation(in KeyboardKey key, Animation animation) {
+    void add(in KeyboardKey key, Animation animation) {
         animations[key] = animation;
         lastKey = key;
     }
@@ -27,3 +27,4 @@ struct AnimationManager {
         animations[lastKey].draw(position);
     }
 }
+

lesson#29 - Player spritesheet animation/ourGame/source/game/data.d

@@ -26,7 +26,7 @@ class Entity {
     Rectangle frame;
     Vector2 position;
     
-    this(in Texture2D texture, in Rectangle frame, in Vector2 Position) { 
+    this(in Texture2D texture, in Rectangle frame, in Vector2 position) { 
         this.texture = texture;
         this.frame = frame;
         this.position = position;
@@ -45,10 +45,3 @@ class Entity {
     abstract void processEvents();
 }
 
-
-
-
-
-
-
-

lesson#29 - Player spritesheet animation/ourGame/source/game/entity/coin.d

@@ -0,0 +1,27 @@
+module game.entity.coin;
+
+import game.data;
+import game.animation.animation;
+
+class Coin: Entity {
+    private {
+        Animation animation;
+    }
+
+    this(in Texture2D texture, in Rectangle frame, in Vector2 position) {
+        super(texture, frame, position);
+        
+        animation = Animation(texture, 5, 1, 0.1, 0);
+    }
+    
+    override void update() {
+        animation.update();
+    }
+
+    override void processEvents() {}
+
+    override void draw() {
+        animation.draw(position);
+    }
+}
+

lesson#29 - Player spritesheet animation/ourGame/source/game/entity/player.d

@@ -0,0 +1,56 @@
+module game.entity.player;
+
+import game.data;
+import game.animation.animation;
+import game.animation.manager;
+
+class Player: Entity {
+    private int movementSpeed;
+    private AnimationManager animationManager;
+
+    this(in Texture2D texture, in Rectangle frame, in Vector2 position, in int movementSpeed = 5) {
+        super(texture, frame, position);
+
+        this.movementSpeed = movementSpeed;
+        animationManager.add(KeyboardKey.KEY_NULL, Animation(texture, 6, 6, 0.15, 1));
+        animationManager.add(KeyboardKey.KEY_W, Animation(texture, 6, 6, 0.1, 5));
+        animationManager.add(KeyboardKey.KEY_S, Animation(texture, 6, 6, 0.1, 5));
+        animationManager.add(KeyboardKey.KEY_A, Animation(texture, 6, 6, 0.1, 6));
+        animationManager.add(KeyboardKey.KEY_D, Animation(texture, 6, 6, 0.1, 5));
+        animationManager.add(KeyboardKey.KEY_SPACE, Animation(texture, 6, 6, 0.12, 2));
+        animationManager.add(KeyboardKey.KEY_X, Animation(texture, 6, 6, 0.1, 3));
+        animationManager.add(KeyboardKey.KEY_Z, Animation(texture, 6, 6, 0.13, 4));
+    }
+    
+    override void update() {}
+
+    override void processEvents() {
+        if (IsKeyDown(KeyboardKey.KEY_W)) {
+            this.move(0, -movementSpeed);
+            animationManager.update(KeyboardKey.KEY_W);
+        } else if (IsKeyDown(KeyboardKey.KEY_S)) {
+            this.move(0, movementSpeed);
+            animationManager.update(KeyboardKey.KEY_S);
+        } else if (IsKeyDown(KeyboardKey.KEY_A)) {
+            this.move(-movementSpeed, 0);
+            animationManager.update(KeyboardKey.KEY_A);
+        } else if (IsKeyDown(KeyboardKey.KEY_D)) {
+            this.move(movementSpeed, 0);
+            animationManager.update(KeyboardKey.KEY_D);
+        } else if (IsKeyDown(KeyboardKey.KEY_SPACE)) {
+            //
+            animationManager.update(KeyboardKey.KEY_SPACE);
+        } else if (IsKeyDown(KeyboardKey.KEY_X)) {
+            animationManager.update(KeyboardKey.KEY_X);
+        } else if (IsKeyDown(KeyboardKey.KEY_Z)) {
+            animationManager.update(KeyboardKey.KEY_Z);
+        } else {
+            animationManager.update(KeyboardKey.KEY_NULL);
+        }
+    }
+
+    override void draw() {
+        animationManager.draw(position);
+    }
+}
+

lesson#29 - Player spritesheet animation/ourGame/source/game/state/menu.d

@@ -1,4 +1,4 @@
-module game.menu;
+module game.state.menu;
 
 import game.data;
 import game.gstatemanager;

lesson#29 - Player spritesheet animation/ourGame/source/game/state/play.d

@@ -1,8 +1,9 @@
-module game.play;
+module game.state.play;
 
 import game.data;
 import game.gstatemanager;
-import game.player;
+import game.entity.player;
+import game.entity.coin;
 
 import std.file: getcwd;
 import std.path: buildPath;
@@ -11,17 +12,24 @@ import std.string: toStringz;
 class Play: IState {
     // variables
     private {
-        Texture2D texPlayer;
+        Texture2D texPlayer, texCoin;
         Player player;
+        Coin coin;
     }
     
     this() {
-        texPlayer = LoadTexture(getcwd.buildPath("../../assets/Evil Wizard/Evil Wizard.png").toStringz);
-        player = new Player(texPlayer, Rectangle(0, 0, 80, 110), Vector2(0, 0), 5);
+        // player
+        texPlayer = LoadTexture(getcwd.buildPath("../../assets/spritesheets/player/woodcutter/Woodcutter_spritesheet.png").toStringz);
+        player = new Player(texPlayer, Rectangle(0, 0, 48, 48), Vector2(0, 0));
+
+        // coin
+        texCoin = LoadTexture(getcwd.buildPath("../../assets/spritesheets/coins/MonedaD.png").toStringz);
+        coin = new Coin(texCoin, Rectangle(0, 0, 16, 16), Vector2(0, 0));
     }
     
     ~this() {
         UnloadTexture(texPlayer);
+        UnloadTexture(texCoin);
     }
 
     // inherited from IState interface
@@ -33,6 +41,7 @@ class Play: IState {
     
     void update() {
         player.update();
+        coin.update();
     }
 
     void processEvents() {
@@ -52,5 +61,6 @@ class Play: IState {
         
         // draw
         player.draw();
+        coin.draw();
     }
 }