From b8c4a9c818207f8e1f394689903f10cfecd7773e Mon Sep 17 00:00:00 2001 From: Jonathan Six Date: Thu, 3 Nov 2022 13:15:56 +0100 Subject: [PATCH 1/2] Fix animation sizes --- resources/sprites/drag1.png | 3 --- resources/sprites/drag2.png | 3 --- resources/sprites/grab.png | 3 +++ resources/sprites/idle.png | 4 ++-- resources/sprites/idle2.png | 4 ++-- resources/sprites/jumpAir.png | 4 ++-- resources/sprites/jumpEnd.png | 4 ++-- resources/sprites/sleep.png | 4 ++-- resources/sprites/startJump.png | 4 ++-- resources/sprites/walk.png | 4 ++-- src/main.cpp | 19 +++---------------- 11 files changed, 20 insertions(+), 36 deletions(-) delete mode 100644 resources/sprites/drag1.png delete mode 100644 resources/sprites/drag2.png create mode 100644 resources/sprites/grab.png diff --git a/resources/sprites/drag1.png b/resources/sprites/drag1.png deleted file mode 100644 index 097e1bd..0000000 --- a/resources/sprites/drag1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03930e9a9a99a7e46c5ef9f2040c4311e0ce65a7dfa9aa838765148d238b9218 -size 414 diff --git a/resources/sprites/drag2.png b/resources/sprites/drag2.png deleted file mode 100644 index bbe2c00..0000000 --- a/resources/sprites/drag2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa3457d1bd07de14f25f78bd02eaba778f7f9872d1162f80b96f6a7e0f036fa5 -size 300 diff --git a/resources/sprites/grab.png b/resources/sprites/grab.png new file mode 100644 index 0000000..1f4d701 --- /dev/null +++ b/resources/sprites/grab.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8de4bf9c8d53bfa3ba885d99d7efbebfdcb0b4d4f37f365186903171a2364b85 +size 391 diff --git a/resources/sprites/idle.png b/resources/sprites/idle.png index d1f12c4..41d5598 100644 --- a/resources/sprites/idle.png +++ b/resources/sprites/idle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e67805272a264d735005b7c1285f290bca6976db5aad5b37d69b58056cfa23f9 -size 593 +oid sha256:3857a0320926fb6b33d694426b7818f00ef2d1da189fc4628f24ae6b2b51072c +size 483 diff --git a/resources/sprites/idle2.png b/resources/sprites/idle2.png index 018193a..466d061 100644 --- a/resources/sprites/idle2.png +++ b/resources/sprites/idle2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1beab77960d939ada0f12c88936ccf076997133c2a0df2a65fe775c40423044 -size 1086 +oid sha256:e1c56f1a8cc0607cd7792fd7e0a533e6b1b92f8254055ae5a16bea703103df9f +size 832 diff --git a/resources/sprites/jumpAir.png b/resources/sprites/jumpAir.png index d348d83..2439a2a 100644 --- a/resources/sprites/jumpAir.png +++ b/resources/sprites/jumpAir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e06277e685668f202c91e95fc42d25810df4717c07b22706844eeecacd50016 -size 275 +oid sha256:95828ca43f9ff3450e0f92c12642bf2147ebb34795ebdecaf98062f4e541b630 +size 272 diff --git a/resources/sprites/jumpEnd.png b/resources/sprites/jumpEnd.png index cbd24a3..fa5c240 100644 --- a/resources/sprites/jumpEnd.png +++ b/resources/sprites/jumpEnd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dda34472f2579bd2a1cfbf4bdf12b3f3b211ba7be4d22b88724bd29d051e0da8 -size 727 +oid sha256:329dc6d8bb355755e6a0ef65b2b0f184ef6f4c62454b11bdbf7bb5cab13c2d54 +size 636 diff --git a/resources/sprites/sleep.png b/resources/sprites/sleep.png index a14f37b..f24ec54 100644 --- a/resources/sprites/sleep.png +++ b/resources/sprites/sleep.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3c0f96ee2af48d7f7acc0ffbb18bf50d1696e1f89b67caa0df82908bd3f1430 -size 410 +oid sha256:88738db2d7afc750956d584d9800743fe88eb5a414870a80a45a5e266565a432 +size 361 diff --git a/resources/sprites/startJump.png b/resources/sprites/startJump.png index c863296..7f8e49d 100644 --- a/resources/sprites/startJump.png +++ b/resources/sprites/startJump.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2715c839743a6a76f4762a2348bb7d843a8a35d39b455b78b1df7e717adcd7c -size 606 +oid sha256:db4c7f389faeb60006f333de721dc510f4e3aef6b32658d3dc53a61474c2e952 +size 550 diff --git a/resources/sprites/walk.png b/resources/sprites/walk.png index e3e5a83..a575691 100644 --- a/resources/sprites/walk.png +++ b/resources/sprites/walk.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41a68a326fcf6b7478f348aa9047a260e084755050cef51743a1e3692cde85d5 -size 898 +oid sha256:ab440f008dd983604d7deb31d9719ea090112169c4c99ac1016d605b3a6afb4c +size 775 diff --git a/src/main.cpp b/src/main.cpp index 3d5254c..b5fe8f1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1418,7 +1418,7 @@ class GrabNode : public AnimationNode { public: GrabNode(SpriteAnimator& inSpriteAnimator, SpriteSheet& inSpriteSheets, int inFrameRate) - : AnimationNode(inSpriteAnimator, inSpriteSheets, inFrameRate, false) + : AnimationNode(inSpriteAnimator, inSpriteSheets, inFrameRate, true) { } @@ -1566,22 +1566,9 @@ struct RandomDelayTransitionMultipleExit : public RandomDelayTransition struct StartLeftClicTransition : public StateMachine::Node::Transition { -protected: - bool leftWasPressed = false; - -public: bool canTransition(GameData& blackBoard) final { - if (blackBoard.leftButtonEvent == GLFW_PRESS) - { - if (leftWasPressed) - { - leftWasPressed = false; - return true; - } - leftWasPressed = true; - } - return false; + return blackBoard.leftButtonEvent == GLFW_PRESS; }; }; @@ -1635,7 +1622,7 @@ class Pet spriteSheets.emplace_back("./resources/sprites/idle.png"); spriteSheets.emplace_back("./resources/sprites/idle2.png"); spriteSheets.emplace_back("./resources/sprites/walk.png"); - spriteSheets.emplace_back("./resources/sprites/drag2.png"); + spriteSheets.emplace_back("./resources/sprites/grab.png"); spriteSheets.emplace_back("./resources/sprites/startJump.png"); spriteSheets.emplace_back("./resources/sprites/jumpAir.png"); spriteSheets.emplace_back("./resources/sprites/jumpEnd.png"); From 27f33e01e4c82bd33058fe5cc8c42a40bb858254 Mon Sep 17 00:00:00 2001 From: Jonathan Six Date: Thu, 3 Nov 2022 13:31:57 +0100 Subject: [PATCH 2/2] Fix missing submodule --- deps/Boxer | 1 + 1 file changed, 1 insertion(+) create mode 160000 deps/Boxer diff --git a/deps/Boxer b/deps/Boxer new file mode 160000 index 0000000..0451c59 --- /dev/null +++ b/deps/Boxer @@ -0,0 +1 @@ +Subproject commit 0451c595aecf00857ecd8b4c62b92184e8095d79