- refactor CompositeTexture as a TexturePack

Author: dgengin

CMakeLists.txt

@@ -52,8 +52,6 @@ set(SOURCE_FILES
     src/Circle.h
     src/CmdLineUtils.cpp
     src/CmdLineUtils.h
-    src/CompositeTexture.cpp
-    src/CompositeTexture.h
     src/DrawableText.h
     src/Event.cpp
     src/Event.h
@@ -191,8 +189,6 @@ set(SOURCE_FILES
     src/Parser/ParseButton.h
     src/Parser/ParseCircle.cpp
     src/Parser/ParseCircle.h
-    src/Parser/ParseCompositeTexture.cpp
-    src/Parser/ParseCompositeTexture.h
     src/Parser/ParseCondition.cpp
     src/Parser/ParseCondition.h
     src/Parser/ParseCursor.cpp
@@ -302,6 +298,8 @@ set(SOURCE_FILES
     src/TexturePacks/BitmapFontTexturePack.h
     src/TexturePacks/CachedTexturePack.cpp
     src/TexturePacks/CachedTexturePack.h
+    src/TexturePacks/CompositeTexturePack.cpp
+    src/TexturePacks/CompositeTexturePack.h
     src/TexturePacks/IndexedTexturePack.cpp
     src/TexturePacks/IndexedTexturePack.h
     src/TexturePacks/RectTexturePack.cpp
@@ -327,6 +325,7 @@ set(SOURCE_FILES
     src/Utils/UnorderedStringMap.h
     src/Utils/Utils.cpp
     src/Utils/Utils.h
+    src/Utils/Vector2D.h
 )
 
 if(FFmpeg_FOUND)

Project.vcxproj

@@ -77,7 +77,6 @@
     <ClCompile Include="src\CachedImagePack.cpp" />
     <ClCompile Include="src\Circle.cpp" />
     <ClCompile Include="src\CmdLineUtils.cpp" />
-    <ClCompile Include="src\CompositeTexture.cpp" />
     <ClCompile Include="src\Event.cpp" />
     <ClCompile Include="src\FadeInOut.cpp" />
     <ClCompile Include="src\FileUtils.cpp" />
@@ -114,7 +113,6 @@
     <ClCompile Include="src\Parser\ParseAudioCommon.cpp" />
     <ClCompile Include="src\Parser\ParseButton.cpp" />
     <ClCompile Include="src\Parser\ParseCircle.cpp" />
-    <ClCompile Include="src\Parser\ParseCompositeTexture.cpp" />
     <ClCompile Include="src\Parser\ParseCondition.cpp" />
     <ClCompile Include="src\Parser\ParseCursor.cpp" />
     <ClCompile Include="src\Parser\ParseEvent.cpp" />
@@ -208,6 +206,7 @@
     <ClCompile Include="src\Text.cpp" />
     <ClCompile Include="src\TexturePacks\BitmapFontTexturePack.cpp" />
     <ClCompile Include="src\TexturePacks\CachedTexturePack.cpp" />
+    <ClCompile Include="src\TexturePacks\CompositeTexturePack.cpp" />
     <ClCompile Include="src\TexturePacks\IndexedTexturePack.cpp" />
     <ClCompile Include="src\TexturePacks\RectTexturePack.cpp" />
     <ClCompile Include="src\TexturePacks\SimpleTexturePack.cpp" />
@@ -263,7 +262,6 @@
     <ClInclude Include="src\CachedImagePack.h" />
     <ClInclude Include="src\Circle.h" />
     <ClInclude Include="src\CmdLineUtils.h" />
-    <ClInclude Include="src\CompositeTexture.h" />
     <ClInclude Include="src\FadeInOut.h" />
     <ClInclude Include="src\FileBytes.h" />
     <ClInclude Include="src\FileUtils.h" />
@@ -304,7 +302,6 @@
     <ClInclude Include="src\Parser\ParseAudioCommon.h" />
     <ClInclude Include="src\Parser\ParseButton.h" />
     <ClInclude Include="src\Parser\ParseCircle.h" />
-    <ClInclude Include="src\Parser\ParseCompositeTexture.h" />
     <ClInclude Include="src\Parser\ParseCondition.h" />
     <ClInclude Include="src\Parser\ParseCursor.h" />
     <ClInclude Include="src\Parser\ParseEvent.h" />
@@ -428,6 +425,7 @@
     <ClInclude Include="src\TextureInfo.h" />
     <ClInclude Include="src\TexturePacks\BitmapFontTexturePack.h" />
     <ClInclude Include="src\TexturePacks\CachedTexturePack.h" />
+    <ClInclude Include="src\TexturePacks\CompositeTexturePack.h" />
     <ClInclude Include="src\TexturePacks\IndexedTexturePack.h" />
     <ClInclude Include="src\TexturePacks\RectTexturePack.h" />
     <ClInclude Include="src\TexturePacks\SimpleTexturePack.h" />
@@ -449,6 +447,7 @@
     <ClInclude Include="src\Utils\ReverseIterable.h" />
     <ClInclude Include="src\Utils\UnorderedStringMap.h" />
     <ClInclude Include="src\Utils\Utils.h" />
+    <ClInclude Include="src\Utils\Vector2D.h" />
     <ClInclude Include="src\Variable.h" />
     <ClInclude Include="src\VarOrPredicate.h" />
   </ItemGroup>

src/Actions/ActAnimation.h

@@ -41,46 +41,24 @@ class ActAnimationSetAnimation : public Action
 	sf::Time refresh;
 	bool resetAnimation;
 	bool updateAnimationType;
-	bool setCompositeTexture;
 
 public:
 	ActAnimationSetAnimation(const std::string_view id_,
 		const std::string_view idTexturePack_, int32_t groupIdx_, int32_t directionIdx_,
-		sf::Time refresh_, bool resetAnimation_, bool updateAnimationType_,
-		bool setCompositeTexture_) : id(id_), idTexturePack(idTexturePack_),
-		groupIdx(groupIdx_), directionIdx(directionIdx_), refresh(refresh_),
-		resetAnimation(resetAnimation_), updateAnimationType(updateAnimationType_),
-		setCompositeTexture(setCompositeTexture_) {}
+		sf::Time refresh_, bool resetAnimation_, bool updateAnimationType_) : id(id_),
+		idTexturePack(idTexturePack_), groupIdx(groupIdx_), directionIdx(directionIdx_),
+		refresh(refresh_), resetAnimation(resetAnimation_), updateAnimationType(updateAnimationType_) {}
 
 	bool execute(Game& game) override
 	{
 		auto animation = game.Resources().getDrawable<Animation>(id);
 		if (animation != nullptr)
 		{
-			TexturePackVariant texVar;
-			if (idTexturePack.empty() == false)
-			{
-				if (setCompositeTexture == false)
-				{
-					auto tex = game.Resources().getTexturePack(idTexturePack);
-					if (tex != nullptr)
-					{
-						texVar = std::move(tex);
-					}
-				}
-				else
-				{
-					auto tex = game.Resources().getCompositeTexture(idTexturePack);
-					if (tex != nullptr)
-					{
-						texVar = std::move(tex);
-					}
-				}
-			}
-			if (texVar.holdsNullTexturePack() == false)
+			auto texPack = game.Resources().getTexturePack(idTexturePack);
+			if (texPack != nullptr)
 			{
 				animation->setAnimation(
-					std::move(texVar), groupIdx, directionIdx,
+					texPack, groupIdx, directionIdx,
 					resetAnimation, updateAnimationType
 				);
 			}

src/Animation.cpp

@@ -2,14 +2,14 @@
 #include "Game.h"
 #include "Utils/Utils.h"
 
-Animation::Animation(TexturePackVariant texturePackVar, bool pause)
-	: animation(texturePackVar, pause)
+Animation::Animation(const std::shared_ptr<TexturePack>& texturePack, bool pause)
+	: animation(texturePack, pause)
 {
 	animation.updateTexture(sprite);
 }
 
-Animation::Animation(TexturePackVariant texturePackVar,
-	const AnimationInfo& animInfo, bool pause) : animation(texturePackVar, animInfo, pause)
+Animation::Animation(const std::shared_ptr<TexturePack>& texturePack,
+	const AnimationInfo& animInfo, bool pause) : animation(texturePack, animInfo, pause)
 {
 	animation.updateTexture(sprite);
 }
@@ -25,10 +25,10 @@ void Animation::setAnimation(const AnimationInfo& animInfo)
 	animation.updateTexture(sprite);
 }
 
-void Animation::setAnimation(TexturePackVariant texturePackVar,
+void Animation::setAnimation(const std::shared_ptr<TexturePack>& texturePack,
 	const AnimationInfo& animInfo)
 {
-	animation.setTexturePack(std::move(texturePackVar));
+	animation.setTexturePack(texturePack);
 	animation.setAnimation(animInfo);
 	animation.updateTexture(sprite);
 }
@@ -39,10 +39,10 @@ void Animation::setAnimation(int32_t groupIdx, int32_t directionIdx)
 	animation.updateTexture(sprite);
 }
 
-void Animation::setAnimation(TexturePackVariant texturePackVar,
+void Animation::setAnimation(const std::shared_ptr<TexturePack>& texturePack,
 	int32_t groupIdx, int32_t directionIdx)
 {
-	animation.setTexturePack(std::move(texturePackVar));
+	animation.setTexturePack(texturePack);
 	animation.setAnimation(groupIdx, directionIdx);
 	animation.updateTexture(sprite);
 }
@@ -56,11 +56,11 @@ void Animation::setAnimation(int32_t groupIdx, int32_t directionIdx,
 	animation.updateTexture(sprite);
 }
 
-void Animation::setAnimation(TexturePackVariant texturePackVar,
+void Animation::setAnimation(const std::shared_ptr<TexturePack>& texturePack,
 	int32_t groupIdx, int32_t directionIdx,
 	bool resetAnimation, bool updateAnimationType)
 {
-	animation.setTexturePack(std::move(texturePackVar));
+	animation.setTexturePack(texturePack);
 	animation.setAnimation(
 		groupIdx, directionIdx, resetAnimation, updateAnimationType
 	);
@@ -74,10 +74,10 @@ void Animation::setAnimation(int32_t groupIdx, int32_t directionIdx,
 	animation.updateTexture(sprite);
 }
 
-void Animation::setAnimation(TexturePackVariant texturePackVar_,
+void Animation::setAnimation(const std::shared_ptr<TexturePack>& texturePack,
 	int32_t groupIdx, int32_t directionIdx, AnimationType animationType)
 {
-	animation.setTexturePack(std::move(texturePackVar_));
+	animation.setTexturePack(texturePack);
 	animation.setAnimation(groupIdx, directionIdx, animationType);
 	animation.updateTexture(sprite);
 }
@@ -87,26 +87,6 @@ bool Animation::holdsNullTexturePack() const noexcept
 	return animation.holdsNullTexturePack();
 }
 
-bool Animation::holdsTexturePack() const noexcept
-{
-	return animation.holdsTexturePack();
-}
-
-bool Animation::holdsTexturePack(const std::shared_ptr<TexturePack>& obj) const noexcept
-{
-	return animation.holdsTexturePack();
-}
-
-bool Animation::holdsCompositeTexture() const noexcept
-{
-	return animation.holdsCompositeTexture();
-}
-
-bool Animation::holdsCompositeTexture(const std::shared_ptr<CompositeTexture>& obj) const noexcept
-{
-	return animation.holdsCompositeTexture();
-}
-
 const std::shared_ptr<TexturePack>& Animation::getTexturePack() const
 {
 	return animation.getTexturePack();
@@ -117,16 +97,6 @@ std::shared_ptr<TexturePack>& Animation::getTexturePack()
 	return animation.getTexturePack();
 }
 
-const std::shared_ptr<CompositeTexture>& Animation::getCompositeTexture() const
-{
-	return animation.getCompositeTexture();
-}
-
-std::shared_ptr<CompositeTexture>& Animation::getCompositeTexture()
-{
-	return animation.getCompositeTexture();
-}
-
 void Animation::update(Game& game)
 {
 	if (Visible() == true &&

src/Animation.h

@@ -11,9 +11,9 @@ class Animation : public Image
 public:
 	Animation() {}
 	Animation(const sf::Texture& texture) : Image(texture) {}
-	Animation(TexturePackVariant texturePackVar, bool pause = false);
+	Animation(const std::shared_ptr<TexturePack>& texturePack, bool pause = false);
 
-	Animation(TexturePackVariant texturePackVar,
+	Animation(const std::shared_ptr<TexturePack>& texturePack,
 		const AnimationInfo& animInfo, bool pause = false);
 
 	void updateTexture();
@@ -22,23 +22,23 @@ class Animation : public Image
 	void Pause(bool pause) noexcept { animation.pause = pause; }
 
 	void setAnimation(const AnimationInfo& animInfo);
-	void setAnimation(TexturePackVariant texturePackVar, const AnimationInfo& animInfo);
+	void setAnimation(const std::shared_ptr<TexturePack>& texturePack, const AnimationInfo& animInfo);
 	void setAnimation(int32_t groupIdx, int32_t directionIdx);
 
-	void setAnimation(TexturePackVariant texturePackVar,
+	void setAnimation(const std::shared_ptr<TexturePack>& texturePack,
 		int32_t groupIdx, int32_t directionIdx);
 
 	void setAnimation(int32_t groupIdx, int32_t directionIdx,
 		bool resetAnimation, bool updateAnimationType);
 
-	void setAnimation(TexturePackVariant texturePackVar,
+	void setAnimation(const std::shared_ptr<TexturePack>& texturePack,
 		int32_t groupIdx, int32_t directionIdx,
 		bool resetAnimation, bool updateAnimationType);
 
 	void setAnimation(int32_t groupIdx, int32_t directionIdx,
 		AnimationType animationType);
 
-	void setAnimation(TexturePackVariant texturePackVar,
+	void setAnimation(const std::shared_ptr<TexturePack>& texturePack,
 		int32_t groupIdx, int32_t directionIdx,
 		AnimationType animationType);
 
@@ -51,14 +51,8 @@ class Animation : public Image
 	bool hasPlayOnceAnimationFinished() const noexcept { return animation.hasPlayOnceAnimationFinished(); }
 
 	bool holdsNullTexturePack() const noexcept;
-	bool holdsTexturePack() const noexcept;
-	bool holdsTexturePack(const std::shared_ptr<TexturePack>& obj) const noexcept;
-	bool holdsCompositeTexture() const noexcept;
-	bool holdsCompositeTexture(const std::shared_ptr<CompositeTexture>& obj) const noexcept;
 	const std::shared_ptr<TexturePack>& getTexturePack() const;
 	std::shared_ptr<TexturePack>& getTexturePack();
-	const std::shared_ptr<CompositeTexture>& getCompositeTexture() const;
-	std::shared_ptr<CompositeTexture>& getCompositeTexture();
 
 	void update(Game& game) override;