Daniele Bartolini 10 лет назад
Родитель
Сommit
d90f8cd6e2

+ 1 - 1
src/device.cpp

@@ -70,7 +70,7 @@ void Device::init()
 	_boot_package->load();
 	_boot_package->load();
 	_boot_package->flush();
 	_boot_package->flush();
 
 
-	_lua_environment->execute((LuaResource*)_resource_manager->get(LUA_TYPE, _boot_script_id));
+	_lua_environment->execute((LuaResource*)_resource_manager->get(SCRIPT_TYPE, _boot_script_id));
 	_lua_environment->call_global("init", 0);
 	_lua_environment->call_global("init", 0);
 }
 }
 
 

+ 1 - 1
src/lua/lua_environment.cpp

@@ -80,7 +80,7 @@ static int require(lua_State* L)
 {
 {
 	using namespace lua_resource;
 	using namespace lua_resource;
 	LuaStack stack(L);
 	LuaStack stack(L);
-	const LuaResource* lr = (LuaResource*)device()->resource_manager()->get(LUA_TYPE, stack.get_resource_id(1));
+	const LuaResource* lr = (LuaResource*)device()->resource_manager()->get(SCRIPT_TYPE, stack.get_resource_id(1));
 	luaL_loadbuffer(L, program(lr), size(lr), "");
 	luaL_loadbuffer(L, program(lr), size(lr), "");
 	return 1;
 	return 1;
 }
 }

+ 3 - 3
src/resource/resource_package.h

@@ -45,7 +45,7 @@ struct ResourcePackage
 
 
 		for (uint32_t i = 0; i < num_scripts(_package); i++)
 		for (uint32_t i = 0; i < num_scripts(_package); i++)
 		{
 		{
-			_resman->load(LUA_TYPE, get_script_id(_package, i));
+			_resman->load(SCRIPT_TYPE, get_script_id(_package, i));
 		}
 		}
 
 
 		for (uint32_t i = 0; i < num_sounds(_package); i++)
 		for (uint32_t i = 0; i < num_sounds(_package); i++)
@@ -166,7 +166,7 @@ struct ResourcePackage
 
 
 		for (uint32_t i = 0; i < num_scripts(_package); i++)
 		for (uint32_t i = 0; i < num_scripts(_package); i++)
 		{
 		{
-			_resman->unload(LUA_TYPE, get_script_id(_package, i));
+			_resman->unload(SCRIPT_TYPE, get_script_id(_package, i));
 		}
 		}
 
 
 		for (uint32_t i = 0; i < num_textures(_package); i++)
 		for (uint32_t i = 0; i < num_textures(_package); i++)
@@ -194,7 +194,7 @@ struct ResourcePackage
 
 
 		for (uint32_t i = 0; i < num_scripts(_package); i++)
 		for (uint32_t i = 0; i < num_scripts(_package); i++)
 		{
 		{
-			if (!_resman->can_get(LUA_TYPE, get_script_id(_package, i)))
+			if (!_resman->can_get(SCRIPT_TYPE, get_script_id(_package, i)))
 				return false;
 				return false;
 		}
 		}
 
 

+ 1 - 1
src/resource/resource_registry.cpp

@@ -56,7 +56,7 @@ struct ResourceCallback
 
 
 static const ResourceCallback RESOURCE_CALLBACK_REGISTRY[] =
 static const ResourceCallback RESOURCE_CALLBACK_REGISTRY[] =
 {
 {
-	{ LUA_TYPE,              lur::compile, lur::load, lur::unload, lur::online, lur::offline },
+	{ SCRIPT_TYPE,           lur::compile, lur::load, lur::unload, lur::online, lur::offline },
 	{ TEXTURE_TYPE,          txr::compile, txr::load, txr::unload, txr::online, txr::offline },
 	{ TEXTURE_TYPE,          txr::compile, txr::load, txr::unload, txr::online, txr::offline },
 	{ MESH_TYPE,             mhr::compile, mhr::load, mhr::unload, mhr::online, mhr::offline },
 	{ MESH_TYPE,             mhr::compile, mhr::load, mhr::unload, mhr::online, mhr::offline },
 	{ SOUND_TYPE,            sdr::compile, sdr::load, sdr::unload, sdr::online, sdr::offline },
 	{ SOUND_TYPE,            sdr::compile, sdr::load, sdr::unload, sdr::online, sdr::offline },

+ 2 - 2
src/resource/resource_types.h

@@ -7,7 +7,7 @@
 
 
 #define FONT_EXTENSION             "font"
 #define FONT_EXTENSION             "font"
 #define LEVEL_EXTENSION            "level"
 #define LEVEL_EXTENSION            "level"
-#define LUA_EXTENSION              "lua"
+#define SCRIPT_EXTENSION           "lua"
 #define MATERIAL_EXTENSION         "material"
 #define MATERIAL_EXTENSION         "material"
 #define MESH_EXTENSION             "mesh"
 #define MESH_EXTENSION             "mesh"
 #define PACKAGE_EXTENSION          "package"
 #define PACKAGE_EXTENSION          "package"
@@ -22,7 +22,7 @@
 
 
 #define FONT_TYPE                  StringId64(0x9efe0a916aae7880)
 #define FONT_TYPE                  StringId64(0x9efe0a916aae7880)
 #define LEVEL_TYPE                 StringId64(0x2a690fd348fe9ac5)
 #define LEVEL_TYPE                 StringId64(0x2a690fd348fe9ac5)
-#define LUA_TYPE                   StringId64(0xa14e8dfa2cd117e2)
+#define SCRIPT_TYPE                StringId64(0xa14e8dfa2cd117e2)
 #define MATERIAL_TYPE              StringId64(0xeac0b497876adedf)
 #define MATERIAL_TYPE              StringId64(0xeac0b497876adedf)
 #define MESH_TYPE                  StringId64(0x48ff313713a997a1)
 #define MESH_TYPE                  StringId64(0x48ff313713a997a1)
 #define PACKAGE_TYPE               StringId64(0xad9c6d9ed1e5e77a)
 #define PACKAGE_TYPE               StringId64(0xad9c6d9ed1e5e77a)