Update CSprite2d, Texture Example

Author: gennariarmando

examples/Texture/Main.cpp

@@ -1,21 +1,25 @@
 #include "plugin.h"
+#include "SpriteLoader.h"
 #include "CSprite2d.h"
 
 using namespace plugin;
 
 class TextureExample {
 public:
-    TextureExample() {
-        static CSprite2d sprite;
+    static inline plugin::SpriteLoader spriteLoader = {};
 
-        Events::drawingEvent += [] {
-            if(!sprite.m_pTexture) // load texture only once
-                sprite.m_pTexture = RwD3D9DDSTextureRead(PLUGIN_PATH((char*)"image"), 0); // rw api gives you ability to load dds images
+    TextureExample() {
+        Events::drawHudEvent += [] {
+			auto sprite = spriteLoader.GetSprite("image"); // get sprite called image
             sprite.Draw(CRect(10.0f, 10.0f, 300.0f, 300.0f), CRGBA(255, 255, 255, 255)); // draw sprite
         };
 
+        Events::initRwEvent += []() {
+ 			spriteLoader.LoadSpriteFromFolder(PLUGIN_PATH("image.png")); // load single sprite called image.png
+        };
+
         Events::shutdownRwEvent += [] {
-            sprite.Delete(); // delete loaded texture
+            spriteLoader.Clear(); // delete any loaded sprites
         };
     }
 } texExample;

examples/examples.csv

@@ -15,7 +15,7 @@ ScriptCommands,ASI,,GTA3,GTAVC,GTASA,,,,,,,
 ScriptDrawsTest,ASI,,GTA3,GTAVC,GTASA,,,,,,,
 Speedometer,ASI,,,,GTASA,,,,,,,
 Test,ASI,GTA2,GTA3,GTAVC,GTASA,GTA4,,,,,,
-Texture,ASI,,,,GTASA,,,,,,,
+Texture,ASI,,GTA3,GTAVC,GTASA,,,,,,,
 TimeNotTouchingPadOpcode,CLEO,,,,GTASA,,,,,,,
 UniversalTurnlights,ASI,,,,GTASA,,,,,,,
 VehicleRemap,ASI,,,,GTASA,,,,,,,

plugin_sa/game_sa/CSprite2d.cpp

@@ -18,10 +18,18 @@ CSprite2d::CSprite2d()
 	((void (__thiscall *)(CSprite2d *))0x727230)(this);
 }
 
-CSprite2d::~CSprite2d()
-{
-	((void (__thiscall *)(CSprite2d *))0x7281E0)(this);
-}
+// Removed CSprite2d destructor to prevent automatic resource cleanup
+// example: when sprites are returned by value from SpriteLoader::GetSprite().
+// The destructor was invalidating texture resources on temporary objects,
+// causing sprites to not render when allocated on the stack,
+// also static objects were affected, since they're deletion time is unknown,
+// and most likely when the game is already shut down, resulting in random crashes.
+// Manual resource management via Delete() method is used instead.
+//
+//CSprite2d::~CSprite2d()
+//{
+//	((void (__thiscall *)(CSprite2d *))0x7281E0)(this);
+//}
 
 // delete this sprite (similar to destructor)
 void CSprite2d::Delete()

plugin_sa/game_sa/CSprite2d.h

@@ -28,7 +28,7 @@ class PLUGIN_API CSprite2d
 	static struct RwD3D9Vertex *maVertices;
 	// class functions
 	CSprite2d();
-	~CSprite2d();
+	//~CSprite2d();
 	// delete this sprite (similar to destructor)
 	void Delete();
 	// set texture by name from current txd