#158 implement serializable for GUISprite

Author: ducphamhong

Projects/Editor/Source/Editor/SpaceController/CGUIDesignController.cpp

@@ -117,34 +117,45 @@ namespace Skylicht
 
 			SColor c(255, 255, 255, 255);
 
+			std::wstring nameHint;
+
 			if (command == L"GUI Element")
 			{
+				nameHint = L"GUI";
 				newNode = parentNode->getCanvas()->createElement(parentNode, r);
 			}
 			else if (command == L"GUI Rect")
 			{
+				nameHint = L"Rect";
 				newNode = parentNode->getCanvas()->createRect(parentNode, r, c);
 			}
 			else if (command == L"GUI Image")
 			{
+				nameHint = L"Img";
 				newNode = parentNode->getCanvas()->createImage(parentNode, r);
 			}
 			else if (command == L"GUI Sprite")
 			{
+				nameHint = L"Sprite";
 				newNode = parentNode->getCanvas()->createSprite(parentNode, r, NULL);
 			}
 			else if (command == L"GUI Text")
 			{
+				nameHint = L"Txt";
 			}
 			else if (command == L"GUI Mask")
 			{
+				nameHint = L"Mask";
 				newNode = parentNode->getCanvas()->createMask(parentNode, r);
 			}
 
 			if (newNode)
 			{
+				std::wstring newName = nameHint + L" " + newNode->getNameW();
+				newNode->setName(newName.c_str());
+
 				CGUIHierachyNode* node = parent->addChild();
-				node->setName(newNode->getNameW().c_str());
+				node->setName(newName.c_str());
 				node->setTagData(newNode, CGUIHierachyNode::GUIElement);
 
 				setNodeEvent(node);

Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUISprite.cpp

@@ -25,6 +25,7 @@ This file is part of the "Skylicht Engine".
 #include "pch.h"
 #include "CGUISprite.h"
 #include "Graphics2D/CGraphics2D.h"
+#include "Graphics2D/SpriteFrame/CSpriteManager.h"
 
 namespace Skylicht
 {
@@ -123,19 +124,42 @@ namespace Skylicht
 	CObjectSerializable* CGUISprite::createSerializable()
 	{
 		CObjectSerializable* object = CGUIElement::createSerializable();
-		object->autoRelease(new CFrameSourceProperty(object, "spriteSrc", m_resource.c_str()));
+
+		CFrameSourceProperty* frame = new CFrameSourceProperty(object, "spriteSrc", m_frameName.c_str());
+		frame->setGUID(m_guid.c_str());
+		frame->setSprite(m_sprite.c_str());
+		frame->setSpriteGUID(m_spriteId.c_str());
+
+		object->autoRelease(frame);
 		return object;
 	}
 
 	void CGUISprite::loadSerializable(CObjectSerializable* object)
 	{
-		std::string src = object->get("spriteSrc", std::string(""));
+		CFrameSourceProperty* frame = dynamic_cast<CFrameSourceProperty*>(object->getProperty("spriteSrc"));
 		CGUIElement::loadSerializable(object);
 
-		if (src != m_resource)
+		if (frame != NULL)
 		{
-			m_resource = src;
-
+			if (m_guid != frame->getGUID())
+			{
+				m_guid = frame->getGUID();
+				m_frameName = frame->get();
+				m_sprite = frame->getSprite();
+				m_spriteId = frame->getSpriteGUID();
+
+				CSpriteManager* spriteMgr = CSpriteManager::getInstance();
+
+				// load by id first
+				CSpriteFrame* sprite = spriteMgr->getSpriteById(m_spriteId.c_str());
+				if (!sprite)
+					sprite = spriteMgr->loadSprite(m_spriteId.c_str());
+
+				if (sprite && sprite->getId() == m_spriteId)
+				{
+					m_frame = sprite->getFrameById(m_guid.c_str());
+				}
+			}
 		}
 	}
 }

Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUISprite.h

@@ -41,7 +41,10 @@ namespace Skylicht
 		float m_frameSpeed;
 		float m_animationTime;
 
-		std::string m_resource;
+		std::string m_guid;
+		std::string m_frameName;
+		std::string m_sprite;
+		std::string m_spriteId;
 
 	protected:
 		CGUISprite(CCanvas* canvas, CGUIElement* parent, SFrame* frame);

Projects/Skylicht/Engine/Source/Graphics2D/SpriteFrame/CSpriteManager.cpp

@@ -28,7 +28,8 @@ This file is part of the "Skylicht Engine".
 
 namespace Skylicht
 {
-	CSpriteManager::CSpriteManager()
+	CSpriteManager::CSpriteManager() :
+		m_currentCategory("global")
 	{
 
 	}
@@ -51,6 +52,11 @@ namespace Skylicht
 	{
 		char ansiPath[512];
 
+		if (category == NULL)
+		{
+			category = m_currentCategory.c_str();
+		}
+
 		std::string fixPath = CPath::normalizePath(path);
 		strcpy(ansiPath, fixPath.c_str());
 

Projects/Skylicht/Engine/Source/Graphics2D/SpriteFrame/CSpriteManager.h

@@ -38,6 +38,8 @@ namespace Skylicht
 			CSpriteFrame* Sprite;
 		};
 
+		std::string m_currentCategory;
+
 		std::map<std::string, CSpriteFrame*> m_idToSprite;
 		std::map<std::string, CSpriteFrame*> m_pathToSprite;
 		std::vector<SSpritePackage*> m_spriteList;
@@ -47,12 +49,17 @@ namespace Skylicht
 
 		virtual ~CSpriteManager();
 
-		CSpriteFrame* loadSprite(const char* path, const char* category = "global");
+		CSpriteFrame* loadSprite(const char* path, const char* category = NULL);
 
 		CSpriteFrame* getSpriteById(const char* id);
 
 		void releaseSprite(const char* category);
 
 		void releaseSprite(CSpriteFrame* sprite);
+
+		inline void setCategory(const char* category)
+		{
+			m_currentCategory = category;
+		}
 	};
 }

Projects/Skylicht/Engine/Source/Serializable/CValuePropertyTemplate.h

@@ -508,7 +508,9 @@ namespace Skylicht
 		{
 			CFrameSourceProperty* value = new CFrameSourceProperty(NULL, Name.c_str());
 			value->m_value = m_value;
+			value->m_guid = m_guid;
 			value->m_sprite = m_sprite;
+			value->m_spriteId = m_spriteId;
 			return value;
 		}