standing corner

jonylu7 · May 30, 2024 · e6826bc · e6826bc
1 parent 2e6f9ab
commit e6826bc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/include/Avatar/Moving.hpp b/include/Avatar/Moving.hpp
@@ -26,6 +26,8 @@ class Moving {
     float m_MovementSpeed = 1.F;
     glm::vec2 m_PrevCell;
 
+    int m_Corner = 0;
+
 public:
     enum class AvatarStandingCorner {
         CENTER,
@@ -55,14 +57,15 @@ class Moving {
             if (!m_MovePath.empty()) {
                 setCurrentDir(m_MovePath.front());
             } else {
-                finishedmovingUpdate();
+                finishedmovingUpdate(AvatarStandingCorner(m_Corner));
             }
         }
         moveToNextCell();
     }
 
-    void finishedmovingUpdate() {
-        moveToCellCorner(AvatarStandingCorner::CENTER);
+    void finishedmovingUpdate(
+        AvatarStandingCorner corner = AvatarStandingCorner::CENTER) {
+        moveToCellCorner(corner);
         setCurrentDir(MoveDirection::IDLE);
     }
 
@@ -90,5 +93,8 @@ class Moving {
     }
 
     void setMovementSpeed(float speed) { m_MovementSpeed = speed; }
+
+    int getStandingCorner() { return m_Corner; }
+    void setStandingCorner(int value) { m_Corner = value; }
 };
 #endif // PRACTICALTOOLSFORSIMPLEDESIGN_MOVING_HPP
diff --git a/include/Map/Tile.hpp b/include/Map/Tile.hpp
@@ -50,6 +50,7 @@ class TileClass {
         m_Structure = structure;
     }
     void pushAvatars(std::shared_ptr<Avatar> avatar) {
+        avatar->getMoving()->setStandingCorner(m_Avatars.size());
         m_Avatars.push_back(avatar);
         if (m_Avatars.size() == 4) {
             setWalkable(false);

diff --git a/src/Map/Tile.cpp b/src/Map/Tile.cpp