Fix build error

skylicht-lab · Oct 3, 2024 · cbd797f · cbd797f
1 parent d09e58d
commit cbd797f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/Projects/Skylicht/Engine/Graphics2D/CGraphics2D.h b/Projects/Skylicht/Engine/Graphics2D/CGraphics2D.h
@@ -188,6 +188,11 @@ namespace Skylicht
 			return m_2dMaterial;
 		}
 
+		IMeshBuffer* getCurrentBuffer()
+		{
+			return m_buffer;
+		}
+
 	private:
 
 		void updateRectBuffer(video::S3DVertex* vtx, const core::rectf& r, const core::matrix4& mat);

diff --git a/Projects/SpineCpp/CSpineLoader.cpp → Projects/SpineCpp/CSpineResource.cpp b/Projects/SpineCpp/CSpineLoader.cpp → Projects/SpineCpp/CSpineResource.cpp
@@ -23,13 +23,13 @@ This file is part of the "Skylicht Engine".
 */
 
 #include "pch.h"
-#include "CSpineLoader.h"
+#include "CSpineResource.h"
 
 using namespace Skylicht;
 
 namespace spine
 {
-	CSpineLoader::CSpineLoader() :
+	CSpineResource::CSpineResource() :
 		m_textureLoader(NULL),
 		m_drawable(NULL),
 		m_atlas(NULL),
@@ -40,12 +40,12 @@ namespace spine
 
 	}
 
-	CSpineLoader::~CSpineLoader()
+	CSpineResource::~CSpineResource()
 	{
 		free();
 	}
 
-	bool CSpineLoader::loadAtlas(const char* path, const char* folder)
+	bool CSpineResource::loadAtlas(const char* path, const char* folder)
 	{
 		io::IFileSystem* fs = getIrrlichtDevice()->getFileSystem();
 
@@ -70,11 +70,11 @@ namespace spine
 		return true;
 	}
 
-	bool CSpineLoader::loadSkeletonJson(const char* path)
+	bool CSpineResource::loadSkeletonJson(const char* path)
 	{
 		if (m_atlas == NULL)
 		{
-			os::Printer::log("[CSpineLoader] loadSkeletonJson with NULL atlas");
+			os::Printer::log("[CSpineResource] loadSkeletonJson with NULL atlas");
 			return false;
 		}
 
@@ -109,15 +109,15 @@ namespace spine
 		}
 		else
 		{
-			os::Printer::log("[CSpineLoader] loadSkeletonJson load json failed!");
+			os::Printer::log("[CSpineResource] loadSkeletonJson load json failed!");
 			os::Printer::log(m_skeletonJson->getError().buffer());
 		}
 
 		delete[]fileData;
 		return true;
 	}
 
-	void CSpineLoader::free()
+	void CSpineResource::free()
 	{
 		if (m_skeletonJson)
 			delete m_skeletonJson;

diff --git a/Projects/SpineCpp/CSpineLoader.h → Projects/SpineCpp/CSpineResource.h b/Projects/SpineCpp/CSpineLoader.h → Projects/SpineCpp/CSpineResource.h
@@ -29,7 +29,7 @@ This file is part of the "Skylicht Engine".
 
 namespace spine
 {
-	class CSpineLoader
+	class CSpineResource
 	{
 	protected:
 		CTextureLoader* m_textureLoader;
@@ -41,14 +41,19 @@ namespace spine
 		spine::SkeletonData* m_skeletonData;
 
 	public:
-		CSpineLoader();
+		CSpineResource();
 
-		virtual ~CSpineLoader();
+		virtual ~CSpineResource();
 
 		bool loadAtlas(const char* path, const char* folder);
 
 		bool loadSkeletonJson(const char* path);
 
 		void free();
+
+		inline CSkeletonDrawable* getDrawable()
+		{
+			return m_drawable;
+		}
 	};
 }
diff --git a/Projects/SpineCpp/flags.cmake b/Projects/SpineCpp/flags.cmake
@@ -5,8 +5,8 @@ if(MSVC)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
 else()
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic -Wno-unused-parameter -std=c99")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wnon-virtual-dtor -pedantic -Wno-unused-parameter -std=c++11 -fno-exceptions -fno-rtti")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c99")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -std=c++11 -fno-exceptions")
     if (${SPINE_SANITIZE})
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined")

diff --git a/Samples/Spine2D/Source/CViewDemo.cpp b/Samples/Spine2D/Source/CViewDemo.cpp
@@ -5,7 +5,7 @@
 #include "CImguiManager.h"
 #include "imgui.h"
 
-#include "CSpineLoader.h"
+#include "CSpineResource.h"
 
 CViewDemo::CViewDemo()
 {
@@ -37,9 +37,9 @@ void CViewDemo::onInit()
 	io::IFileSystem* fs = getIrrlichtDevice()->getFileSystem();
 
 	// spine2d
-	spine::CSpineLoader spineLoader;
-	spineLoader.loadAtlas("SampleSpine2D/spineboy-pma.atlas", "SampleSpine2D");
-	spineLoader.loadSkeletonJson("SampleSpine2D/spineboy-pro.json");
+	spine::CSpineResource spineRes;
+	spineRes.loadAtlas("SampleSpine2D/spineboy-pma.atlas", "SampleSpine2D");
+	spineRes.loadSkeletonJson("SampleSpine2D/spineboy-pro.json");
 
 	scene->updateIndexSearchObject();
 }