Merge pull request #388 from Gusgo99/make_sprites_safe_to_move

Allow move operations on sprites

Author: OneLoneCoder

olcPixelGameEngine.h

@@ -1081,7 +1081,10 @@ namespace olc
 		Sprite(const std::string& sImageFile, olc::ResourcePack* pack = nullptr);
 		Sprite(int32_t w, int32_t h);
 		Sprite(const olc::Sprite&) = delete;
+		Sprite(olc::Sprite&&);
 		~Sprite();
+		Sprite& operator=(const olc::Sprite&) = delete;
+		Sprite& operator=(olc::Sprite&&);
 
 	public:
 		olc::rcode LoadFromFile(const std::string& sImageFile, olc::ResourcePack* pack = nullptr);
@@ -1143,6 +1146,8 @@ namespace olc
 
 	public: // But dont touch
 		int32_t id = -1;
+		int32_t width = 0;
+		int32_t height = 0;
 		olc::Sprite* sprite = nullptr;
 		olc::vf2d vUVScale = { 1.0f, 1.0f };
 	};
@@ -1994,6 +1999,32 @@ namespace olc
 		SetSize(w, h);
 	}
 
+	Sprite::Sprite(olc::Sprite&& spr)
+	{
+		width = spr.width;
+		spr.width = 0;
+
+		height = spr.height;
+		spr.height = 0;
+
+		pColData = std::move(spr.pColData);
+
+		modeSample = spr.modeSample;
+	}
+
+	Sprite& Sprite::operator=(olc::Sprite&& spr)
+	{
+		std::swap(width, spr.width);
+
+		std::swap(height, spr.height);
+
+		std::swap(pColData, spr.pColData);
+
+		std::swap(modeSample, spr.modeSample);
+
+		return *this;
+	}
+
 	void Sprite::SetSize(int32_t w, int32_t h)
 	{
 		width = w;		height = h;
@@ -2157,6 +2188,8 @@ namespace olc
 	{
 		id = -1;
 		if (spr == nullptr) return;
+		width = spr->width;
+		height = spr->height;
 		sprite = spr;
 		id = renderer->CreateTexture(sprite->width, sprite->height, filter, clamp);
 		Update();
@@ -2171,14 +2204,17 @@ namespace olc
 	void Decal::Update()
 	{
 		if (sprite == nullptr) return;
-		vUVScale = { 1.0f / float(sprite->width), 1.0f / float(sprite->height) };
+		width = sprite->width;
+		height = sprite->height;
+		vUVScale = { 1.0f / float(width), 1.0f / float(height) };
 		renderer->ApplyTexture(id);
 		renderer->UpdateTexture(id, sprite);
 	}
 
 	void Decal::UpdateSprite()
 	{
 		if (sprite == nullptr) return;
+		sprite->SetSize(width, height);
 		renderer->ApplyTexture(id);
 		renderer->ReadTexture(id, sprite);
 	}
@@ -3521,8 +3557,8 @@ namespace olc
 
 		olc::vf2d vScreenSpaceDim =
 		{
-			vScreenSpacePos.x + (2.0f * (float(decal->sprite->width) * vInvScreenSize.x)) * scale.x,
-			vScreenSpacePos.y - (2.0f * (float(decal->sprite->height) * vInvScreenSize.y)) * scale.y
+			vScreenSpacePos.x + (2.0f * (float(decal->width) * vInvScreenSize.x)) * scale.x,
+			vScreenSpacePos.y - (2.0f * (float(decal->height) * vInvScreenSize.y)) * scale.y
 		};
 
 		DecalInstance di;