Daniele Bartolini 9 ani în urmă
părinte
comite
055434e225

+ 2 - 2
src/resource/config_resource.cpp

@@ -34,8 +34,8 @@ namespace config_resource_internal
 		DynamicString boot_package(ta);
 		sjson::parse_string(boot_script_json, boot_script);
 		sjson::parse_string(boot_package_json, boot_package);
-		DATA_COMPILER_ASSERT_RESOURCE_EXISTS(RESOURCE_EXTENSION_SCRIPT, boot_script.c_str(), opts);
-		DATA_COMPILER_ASSERT_RESOURCE_EXISTS(RESOURCE_EXTENSION_PACKAGE, boot_package.c_str(), opts);
+		DATA_COMPILER_ASSERT_RESOURCE_EXISTS("lua", boot_script.c_str(), opts);
+		DATA_COMPILER_ASSERT_RESOURCE_EXISTS("package", boot_package.c_str(), opts);
 
 		opts.write(buf);
 	}

+ 1 - 1
src/resource/material_resource.cpp

@@ -87,7 +87,7 @@ namespace material_resource_internal
 
 			DynamicString texture(ta);
 			sjson::parse_string(value, texture);
-			DATA_COMPILER_ASSERT_RESOURCE_EXISTS(RESOURCE_EXTENSION_TEXTURE, texture.c_str(), opts);
+			DATA_COMPILER_ASSERT_RESOURCE_EXISTS("texture", texture.c_str(), opts);
 
 			TextureHandle th;
 			th.sampler_handle = 0;

+ 2 - 2
src/resource/physics_resource.cpp

@@ -150,8 +150,8 @@ namespace physics_resource_internal
 		DynamicString name(ta);
 		sjson::parse_string(obj["scene"], scene);
 		sjson::parse_string(obj["name"], name);
-		DATA_COMPILER_ASSERT_RESOURCE_EXISTS(RESOURCE_EXTENSION_MESH, scene.c_str(), opts);
-		scene += "." RESOURCE_EXTENSION_MESH;
+		DATA_COMPILER_ASSERT_RESOURCE_EXISTS("mesh", scene.c_str(), opts);
+		scene += ".mesh";
 
 		Buffer file = opts.read(scene.c_str());
 		JsonObject json_mesh(ta);

+ 0 - 16
src/resource/resource_types.h

@@ -35,22 +35,6 @@ struct UnitResource;
 
 /// @addtogroup Resource
 /// @{
-#define RESOURCE_EXTENSION_CONFIG           "config"
-#define RESOURCE_EXTENSION_FONT             "font"
-#define RESOURCE_EXTENSION_LEVEL            "level"
-#define RESOURCE_EXTENSION_MATERIAL         "material"
-#define RESOURCE_EXTENSION_MESH             "mesh"
-#define RESOURCE_EXTENSION_PACKAGE          "package"
-#define RESOURCE_EXTENSION_PHYSICS_CONFIG   "physics_config"
-#define RESOURCE_EXTENSION_PHYSICS          "physics"
-#define RESOURCE_EXTENSION_SCRIPT           "lua"
-#define RESOURCE_EXTENSION_SHADER           "shader"
-#define RESOURCE_EXTENSION_SOUND            "sound"
-#define RESOURCE_EXTENSION_SPRITE_ANIMATION "sprite_animation"
-#define RESOURCE_EXTENSION_SPRITE           "sprite"
-#define RESOURCE_EXTENSION_TEXTURE          "texture"
-#define RESOURCE_EXTENSION_UNIT             "unit"
-
 #define RESOURCE_TYPE_CONFIG           StringId64(0x82645835e6b73232)
 #define RESOURCE_TYPE_FONT             StringId64(0x9efe0a916aae7880)
 #define RESOURCE_TYPE_LEVEL            StringId64(0x2a690fd348fe9ac5)

+ 5 - 5
src/resource/unit_compiler.cpp

@@ -119,7 +119,7 @@ static Buffer compile_mesh_renderer(const char* json, CompileOptions& opts)
 
 	DynamicString mesh_resource(ta);
 	sjson::parse_string(obj["mesh_resource"], mesh_resource);
-	DATA_COMPILER_ASSERT_RESOURCE_EXISTS(RESOURCE_EXTENSION_MESH
+	DATA_COMPILER_ASSERT_RESOURCE_EXISTS("mesh"
 		, mesh_resource.c_str()
 		, opts
 		);
@@ -143,7 +143,7 @@ static Buffer compile_sprite_renderer(const char* json, CompileOptions& opts)
 
 	DynamicString sprite_resource(ta);
 	sjson::parse_string(obj["sprite_resource"], sprite_resource);
-	DATA_COMPILER_ASSERT_RESOURCE_EXISTS(RESOURCE_EXTENSION_SPRITE
+	DATA_COMPILER_ASSERT_RESOURCE_EXISTS("sprite"
 		, sprite_resource.c_str()
 		, opts
 		);
@@ -194,7 +194,7 @@ static Buffer compile_script(const char* json, CompileOptions& opts)
 
 	DynamicString script_resource(ta);
 	sjson::parse_string(obj["script_resource"], script_resource);
-	DATA_COMPILER_ASSERT_RESOURCE_EXISTS(RESOURCE_EXTENSION_SCRIPT
+	DATA_COMPILER_ASSERT_RESOURCE_EXISTS("lua"
 		, script_resource.c_str()
 		, opts
 		);
@@ -258,11 +258,11 @@ void UnitCompiler::compile_unit_from_json(const char* json)
 		TempAllocator512 ta;
 		DynamicString path(ta);
 		sjson::parse_string(prefab["prefab"], path);
-		DATA_COMPILER_ASSERT_RESOURCE_EXISTS(RESOURCE_EXTENSION_UNIT
+		DATA_COMPILER_ASSERT_RESOURCE_EXISTS("unit"
 			, path.c_str()
 			, _opts
 			);
-		path += "." RESOURCE_EXTENSION_UNIT;
+		path += ".unit";
 
 		Buffer buf = read_unit(path.c_str());
 		const char* d = array::end(data);