Update due to GuiResource removal

engine/CMakeLists.txt

@@ -212,7 +212,6 @@ set (RENDERERS_HEADERS
 set (RESOURCE_SRC
 	resource/FileBundle.cpp
 	resource/FontResource.cpp
-	resource/GuiResource.cpp
 	resource/LevelResource.cpp
 	resource/LuaResource.cpp
 	resource/MaterialResource.cpp
@@ -232,7 +231,6 @@ set (RESOURCE_HEADERS
 	resource/Bundle.h
 	resource/FontResource.h
 	resource/FontResource.h
-	resource/GuiResource.h
 	resource/LevelResource.h
 	resource/LuaResource.h
 	resource/MaterialResource.h

engine/compilers/BundleCompiler.cpp

@@ -49,7 +49,6 @@ namespace unit_resource { extern void compile(Filesystem&, const char*, File*);
 namespace sound_resource { extern void compile(Filesystem&, const char*, File*); }
 namespace sprite_resource { extern void compile(Filesystem&, const char*, File*); }
 namespace material_resource { extern void compile(Filesystem&, const char*, File*); }
-namespace gui_resource { extern void compile(Filesystem&, const char*, File*); }
 namespace font_resource { extern void compile(Filesystem&, const char*, File*); }
 namespace level_resource { extern void compile(Filesystem&, const char*, File*); }
 
@@ -170,10 +169,6 @@ bool BundleCompiler::compile(const char* bundle_dir, const char* source_dir, con
 			{
 				material_resource::compile(root_fs, filename, out_file);
 			}
-			else if (resource_type_hash == GUI_TYPE)
-			{
-				gui_resource::compile(root_fs, filename, out_file);
-			}
 			else if (resource_type_hash == PHYSICS_CONFIG_TYPE)
 			{
 				physics_config_resource::compile(root_fs, filename, out_file);

engine/renderers/Gui.cpp

@@ -29,7 +29,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Renderer.h"
 #include "Vector3.h"
 #include "Vector2.h"
-#include "GuiResource.h"
 #include "RenderWorld.h"
 #include "RendererTypes.h"
 #include "Vector3.h"

engine/renderers/RenderWorld.cpp

@@ -37,7 +37,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Material.h"
 #include "Config.h"
 #include "Gui.h"
-#include "GuiResource.h"
 
 namespace crown
 {

engine/resource/Resource.h

@@ -45,7 +45,6 @@ namespace crown
 #define PACKAGE_EXTENSION			"package"
 #define UNIT_EXTENSION				"unit"
 #define PHYSICS_EXTENSION			"physics"
-#define GUI_EXTENSION				"gui"
 #define PHYSICS_CONFIG_EXTENSION	"physics_config"
 #define FONT_EXTENSION				"font"
 #define LEVEL_EXTENSION				"level"
@@ -61,7 +60,6 @@ namespace crown
 #define PACKAGE_TYPE				0xC0A2212C
 #define UNIT_TYPE					0x516224CF
 #define PHYSICS_TYPE				0xFA32C012
-#define GUI_TYPE					0x2C56149A
 #define PHYSICS_CONFIG_TYPE			0x514F14A1
 #define FONT_TYPE					0x536DC7D4
 #define LEVEL_TYPE					0x349657F7

engine/resource/ResourcePackage.h

@@ -96,11 +96,6 @@ public:
 			m_resource_manager->load(MATERIAL_TYPE, m_package->get_material_id(i));
 		}
 
-		for (uint32_t i = 0; i < m_package->num_guis(); i++)
-		{
-			m_resource_manager->load(GUI_TYPE, m_package->get_gui_id(i));
-		}
-
 		for (uint32_t i = 0; i < m_package->num_fonts(); i++)
 		{
 			m_resource_manager->load(FONT_TYPE, m_package->get_font_id(i));
@@ -125,11 +120,6 @@ public:
 			m_resource_manager->unload(m_package->get_font_id(i));
 		}
 
-		for (uint32_t i = 0; i < m_package->num_guis(); i++)
-		{
-			m_resource_manager->unload(m_package->get_gui_id(i));
-		}
-
 		for (uint32_t i = 0; i < m_package->num_materials(); i++)
 		{
 			m_resource_manager->unload(m_package->get_material_id(i));

engine/resource/ResourceRegistry.cpp

@@ -34,7 +34,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "UnitResource.h"
 #include "PhysicsResource.h"
 #include "MaterialResource.h"
-#include "GuiResource.h"
 #include "FontResource.h"
 #include "LevelResource.h"
 
@@ -52,7 +51,6 @@ static const ResourceCallback RESOURCE_CALLBACK_REGISTRY[] =
 	{ PACKAGE_TYPE, PackageResource::load, PackageResource::unload, PackageResource::online, PackageResource::offline },
 	{ PHYSICS_TYPE, PhysicsResource::load, PhysicsResource::unload, PhysicsResource::online, PhysicsResource::offline },
 	{ MATERIAL_TYPE, MaterialResource::load, MaterialResource::unload, MaterialResource::online, MaterialResource::offline },
-	{ GUI_TYPE, GuiResource::load, GuiResource::unload, GuiResource::online, GuiResource::offline },
 	{ PHYSICS_CONFIG_TYPE, PhysicsConfigResource::load, PhysicsConfigResource::unload, PhysicsConfigResource::online, PhysicsConfigResource::offline },
 	{ FONT_TYPE, FontResource::load, FontResource::unload, FontResource::online, FontResource::offline },
 	{ LEVEL_TYPE, LevelResource::load, LevelResource::unload, LevelResource::online, LevelResource::offline },