Преглед изворни кода

resource: materials require all shaders to be online first

Daniele Bartolini пре 1 година
родитељ
комит
42050b0b95
2 измењених фајлова са 3 додато и 1 уклоњено
  1. 2 0
      src/resource/material_resource.cpp
  2. 1 1
      src/resource/types.h

+ 2 - 0
src/resource/material_resource.cpp

@@ -293,6 +293,8 @@ namespace material_resource_internal
 		Array<char> names(default_allocator());
 		Array<char> names(default_allocator());
 		Array<char> dynblob(default_allocator());
 		Array<char> dynblob(default_allocator());
 
 
+		opts.add_requirement_glob("*.shader");
+
 		DynamicString shader(ta);
 		DynamicString shader(ta);
 		RETURN_IF_ERROR(sjson::parse_string(shader, obj["shader"]), opts);
 		RETURN_IF_ERROR(sjson::parse_string(shader, obj["shader"]), opts);
 
 

+ 1 - 1
src/resource/types.h

@@ -79,7 +79,7 @@ struct Platform
 #define RESOURCE_VERSION_FONT             RESOURCE_VERSION(1)
 #define RESOURCE_VERSION_FONT             RESOURCE_VERSION(1)
 #define RESOURCE_VERSION_UNIT             RESOURCE_VERSION(11)
 #define RESOURCE_VERSION_UNIT             RESOURCE_VERSION(11)
 #define RESOURCE_VERSION_LEVEL            (RESOURCE_VERSION_UNIT + 4) //!< Level embeds UnitResource
 #define RESOURCE_VERSION_LEVEL            (RESOURCE_VERSION_UNIT + 4) //!< Level embeds UnitResource
-#define RESOURCE_VERSION_MATERIAL         RESOURCE_VERSION(5)
+#define RESOURCE_VERSION_MATERIAL         RESOURCE_VERSION(6)
 #define RESOURCE_VERSION_MESH             RESOURCE_VERSION(6)
 #define RESOURCE_VERSION_MESH             RESOURCE_VERSION(6)
 #define RESOURCE_VERSION_PACKAGE          RESOURCE_VERSION(7)
 #define RESOURCE_VERSION_PACKAGE          RESOURCE_VERSION(7)
 #define RESOURCE_VERSION_PHYSICS_CONFIG   RESOURCE_VERSION(3)
 #define RESOURCE_VERSION_PHYSICS_CONFIG   RESOURCE_VERSION(3)