Daniele Bartolini 6 лет назад
Родитель
Сommit
342f85d54b

+ 0 - 2
src/device/device.cpp

@@ -324,7 +324,6 @@ void Device::run()
 	namespace mhr = mesh_resource_internal;
 	namespace mtr = material_resource_internal;
 	namespace pcr = physics_config_resource_internal;
-	namespace phr = physics_resource_internal;
 	namespace pkr = package_resource_internal;
 	namespace sar = sprite_animation_resource_internal;
 	namespace sdr = sound_resource_internal;
@@ -345,7 +344,6 @@ void Device::run()
 	_resource_manager->register_type(RESOURCE_TYPE_MATERIAL,         RESOURCE_VERSION_MATERIAL,         mtr::load, mtr::unload, mtr::online, mtr::offline);
 	_resource_manager->register_type(RESOURCE_TYPE_MESH,             RESOURCE_VERSION_MESH,             mhr::load, mhr::unload, mhr::online, mhr::offline);
 	_resource_manager->register_type(RESOURCE_TYPE_PACKAGE,          RESOURCE_VERSION_PACKAGE,          pkr::load, pkr::unload, NULL,        NULL        );
-	_resource_manager->register_type(RESOURCE_TYPE_PHYSICS,          RESOURCE_VERSION_PHYSICS,          NULL,      NULL,        NULL,        NULL        );
 	_resource_manager->register_type(RESOURCE_TYPE_PHYSICS_CONFIG,   RESOURCE_VERSION_PHYSICS_CONFIG,   NULL,      NULL,        NULL,        NULL        );
 	_resource_manager->register_type(RESOURCE_TYPE_SCRIPT,           RESOURCE_VERSION_SCRIPT,           NULL,      NULL,        NULL,        NULL        );
 	_resource_manager->register_type(RESOURCE_TYPE_SHADER,           RESOURCE_VERSION_SHADER,           shr::load, shr::unload, shr::online, shr::offline);

+ 0 - 1
src/resource/data_compiler.cpp

@@ -577,7 +577,6 @@ int main_data_compiler(const DeviceOptions& opts)
 	dc->register_compiler(RESOURCE_TYPE_MATERIAL,         RESOURCE_VERSION_MATERIAL,         mtr::compile);
 	dc->register_compiler(RESOURCE_TYPE_MESH,             RESOURCE_VERSION_MESH,             mhr::compile);
 	dc->register_compiler(RESOURCE_TYPE_PACKAGE,          RESOURCE_VERSION_PACKAGE,          pkr::compile);
-	dc->register_compiler(RESOURCE_TYPE_PHYSICS,          RESOURCE_VERSION_PHYSICS,          phr::compile);
 	dc->register_compiler(RESOURCE_TYPE_PHYSICS_CONFIG,   RESOURCE_VERSION_PHYSICS_CONFIG,   pcr::compile);
 	dc->register_compiler(RESOURCE_TYPE_SCRIPT,           RESOURCE_VERSION_SCRIPT,           lur::compile);
 	dc->register_compiler(RESOURCE_TYPE_SHADER,           RESOURCE_VERSION_SHADER,           shr::compile);

+ 0 - 1
src/resource/physics_resource.h

@@ -17,7 +17,6 @@ namespace crown
 {
 namespace physics_resource_internal
 {
-	inline void compile(CompileOptions& /*opts*/) {}
 	Buffer compile_collider(const char* json, CompileOptions& opts);
 	Buffer compile_actor(const char* json, CompileOptions& opts);
 	Buffer compile_joint(const char* json, CompileOptions& opts);

+ 0 - 3
src/resource/types.h

@@ -25,7 +25,6 @@ struct MaterialResource;
 struct MeshResource;
 struct PackageResource;
 struct PhysicsConfigResource;
-struct PhysicsResource;
 struct ShaderResource;
 struct ShapeResource;
 struct SoundResource;
@@ -46,7 +45,6 @@ struct UnitResource;
 #define RESOURCE_TYPE_MESH             StringId64(0x48ff313713a997a1)
 #define RESOURCE_TYPE_PACKAGE          StringId64(0xad9c6d9ed1e5e77a)
 #define RESOURCE_TYPE_PHYSICS_CONFIG   StringId64(0x72e3cc03787a11a1)
-#define RESOURCE_TYPE_PHYSICS          StringId64(0x5f7203c8f280dab8)
 #define RESOURCE_TYPE_SCRIPT           StringId64(0xa14e8dfa2cd117e2)
 #define RESOURCE_TYPE_SHADER           StringId64(0xcce8d5b5f5ae333f)
 #define RESOURCE_TYPE_SOUND            StringId64(0x90641b51c98b7aac)
@@ -63,7 +61,6 @@ struct UnitResource;
 #define RESOURCE_VERSION_MESH             u32(1)
 #define RESOURCE_VERSION_PACKAGE          u32(1)
 #define RESOURCE_VERSION_PHYSICS_CONFIG   u32(1)
-#define RESOURCE_VERSION_PHYSICS          u32(1)
 #define RESOURCE_VERSION_SCRIPT           u32(1)
 #define RESOURCE_VERSION_SHADER           u32(1)
 #define RESOURCE_VERSION_SOUND            u32(1)