Merge pull request #1258 from lairworks/spriteDelegate

Add `Sprite` constructors taking a `Delegate`
lairworks · Mar 3, 2025 · 10cc6bc · 10cc6bc
2 parents e600f8f + a63c25f
commit 10cc6bc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/NAS2D/Resource/Sprite.cpp b/NAS2D/Resource/Sprite.cpp
@@ -41,6 +41,20 @@ Sprite::Sprite(const AnimationSet& animationSet, const std::string& initialActio
 }
 
 
+Sprite::Sprite(const std::string& filePath, const std::string& initialAction, Delegate<void()> animationCompleteHandler) :
+	Sprite(filePath, initialAction)
+{
+	mAnimationCompleteSignal.connect(animationCompleteHandler);
+}
+
+
+Sprite::Sprite(const AnimationSet& animationSet, const std::string& initialAction, Delegate<void()> animationCompleteHandler) :
+	Sprite(animationSet, initialAction)
+{
+	mAnimationCompleteSignal.connect(animationCompleteHandler);
+}
+
+
 Vector<int> Sprite::size() const
 {
 	return (*mCurrentAction)[mCurrentFrame].bounds.size;

diff --git a/NAS2D/Resource/Sprite.h b/NAS2D/Resource/Sprite.h
@@ -11,10 +11,11 @@
 #pragma once
 
 #include "AnimationSet.h"
-#include "../Signal/Signal.h"
 #include "../Timer.h"
 #include "../Math/Angle.h"
 #include "../Renderer/Color.h"
+#include "../Signal/Signal.h"
+#include "../Signal/Delegate.h"
 
 #include <vector>
 #include <string>
@@ -35,9 +36,12 @@ namespace NAS2D
 
 		Sprite(const std::string& filePath, const std::string& initialAction);
 		Sprite(const AnimationSet& animationSet, const std::string& initialAction);
+		Sprite(const std::string& filePath, const std::string& initialAction, Delegate<void()> animationCompleteHandler);
+		Sprite(const AnimationSet& animationSet, const std::string& initialAction, Delegate<void()> animationCompleteHandler);
 		Sprite(const Sprite&) = default;
 		Sprite(Sprite&&) = default;
-		const Sprite& operator=(const Sprite&) = delete;
+
+		Sprite& operator=(const Sprite&) = delete;
 		Sprite& operator=(Sprite&&) = delete;
 
 		Vector<int> size() const;