Simplify package resource compiler

engine/resource/PackageResource.cpp

@@ -24,33 +24,18 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Allocator.h"
 #include "File.h"
 #include "Filesystem.h"
-#include "StringUtils.h"
 #include "JSONParser.h"
-#include "Log.h"
 #include "PackageResource.h"
 #include "TempAllocator.h"
+#include "ReaderWriter.h"
 
 namespace crown
 {
 namespace package_resource
 {
 
-//-----------------------------------------------------------------------------
-void parse_resources(JSONElement arr, const char* type, Array<ResourceId>& out)
-{
-	const uint32_t num = arr.size();
-
-	for (uint32_t i = 0; i < num; i++)
-	{
-		DynamicString name;
-		arr[i].to_string(name);
-		array::push_back(out, ResourceId(type, name.c_str()));
-	}
-}
-
 //-----------------------------------------------------------------------------
 void compile(Filesystem& fs, const char* resource_path, File* out_file)
 {
@@ -59,123 +44,90 @@ void compile(Filesystem& fs, const char* resource_path, File* out_file)
 	fs.close(file);
 
 	JSONElement root = json.root();
+	BinaryWriter bw(*out_file);
+
+	const uint32_t num_textures  = root.key("texture").size();
+	const uint32_t num_scripts   = root.key("lua").size();
+	const uint32_t num_sounds    = root.key("sound").size();
+	const uint32_t num_meshes    = root.key("mesh").size();
+	const uint32_t num_units     = root.key("unit").size();
+	const uint32_t num_sprites   = root.key("sprite").size();
+	const uint32_t num_physics   = root.key("physics").size();
+	const uint32_t num_materials = root.key("material").size();
+	const uint32_t num_fonts     = root.key("font").size();
+	const uint32_t num_levels    = root.key("level").size();
+
+	// Write header
+	bw.write(num_textures);
+	uint32_t offt = sizeof(PackageHeader);
+	bw.write(offt);
+
+	bw.write(num_scripts);
+	offt += sizeof(ResourceId) * num_textures;
+	bw.write(offt);
+
+	bw.write(num_sounds);
+	offt += sizeof(ResourceId) * num_scripts;
+	bw.write(offt);
+
+	bw.write(num_meshes);
+	offt += sizeof(ResourceId) * num_sounds;
+	bw.write(offt);
+
+	bw.write(num_units);
+	offt += sizeof(ResourceId) * num_meshes;
+	bw.write(offt);
+
+	bw.write(num_sprites);
+	offt += sizeof(ResourceId) * num_units;
+	bw.write(offt);
+
+	bw.write(num_physics);
+	offt += sizeof(ResourceId) * num_sprites;
+	bw.write(offt);
+
+	bw.write(num_materials);
+	offt += sizeof(ResourceId) * num_physics;
+	bw.write(offt);
+
+	bw.write(num_fonts);
+	offt += sizeof(ResourceId) * num_materials;
+	bw.write(offt);
+
+	bw.write(num_levels);
+	offt += sizeof(ResourceId) * num_fonts;
+	bw.write(offt);
+
+	// Write resource ids
+	for (uint32_t i = 0; i < num_textures; i++)
+		bw.write(root.key("texture")[i].to_resource_id("texture"));
+
+	for (uint32_t i = 0; i < num_scripts; i++)
+		bw.write(root.key("lua")[i].to_resource_id("lua"));
+
+	for (uint32_t i = 0; i < num_sounds; i++)
+		bw.write(root.key("sound")[i].to_resource_id("sound"));
+
+	for (uint32_t i = 0; i < num_meshes; i++)
+		bw.write(root.key("mesh")[i].to_resource_id("mesh"));
+
+	for (uint32_t i = 0; i < num_units; i++)
+		bw.write(root.key("unit")[i].to_resource_id("unit"));
+
+	for (uint32_t i = 0; i < num_sprites; i++)
+		bw.write(root.key("sprite")[i].to_resource_id("sprite"));
+
+	for (uint32_t i = 0; i < num_physics; i++)
+		bw.write(root.key("physics")[i].to_resource_id("physics"));
+
+	for (uint32_t i = 0; i < num_materials; i++)
+		bw.write(root.key("material")[i].to_resource_id("material"));
+
+	for (uint32_t i = 0; i < num_fonts; i++)
+		bw.write(root.key("font")[i].to_resource_id("font"));
 
-	Array<ResourceId> textures(default_allocator());
-	Array<ResourceId> scripts(default_allocator());
-	Array<ResourceId> sounds(default_allocator());
-	Array<ResourceId> meshes(default_allocator());
-	Array<ResourceId> units(default_allocator());
-	Array<ResourceId> sprites(default_allocator());
-	Array<ResourceId> physics(default_allocator());
-	Array<ResourceId> materials(default_allocator());
-	Array<ResourceId> guis(default_allocator());
-	Array<ResourceId> fonts(default_allocator());
-	Array<ResourceId> levels(default_allocator());
-
-	if (root.has_key("texture"))
-		parse_resources(root.key("texture"), "texture", textures);
-
-	if (root.has_key("lua"))
-		parse_resources(root.key("lua"), "lua", scripts);
-
-	if (root.has_key("sound"))
-		parse_resources(root.key("sound"), "sound", sounds);
-
-	if (root.has_key("mesh"))
-		parse_resources(root.key("mesh"), "mesh", meshes);
-
-	if (root.has_key("unit"))
-		parse_resources(root.key("unit"), "unit", units);
-
-	if (root.has_key("sprite"))
-		parse_resources(root.key("sprite"), "sprite", sprites);
-
-	if (root.has_key("physics"))
-		parse_resources(root.key("physics"), "physics", physics);
-
-	if (root.has_key("material"))
-		parse_resources(root.key("material"), "material", materials);
-
-	if (root.has_key("gui"))
-		parse_resources(root.key("gui"), "gui", guis);
-
-	if (root.has_key("font"))
-		parse_resources(root.key("font"), "font", fonts);
-
-	if (root.has_key("level"))
-		parse_resources(root.key("level"), "level", levels);
-
-	PackageHeader header;
-	header.num_textures = array::size(textures);
-	header.num_scripts = array::size(scripts);
-	header.num_sounds = array::size(sounds);
-	header.num_meshes = array::size(meshes);
-	header.num_units = array::size(units);
-	header.num_sprites = array::size(sprites);
-	header.num_physics = array::size(physics);
-	header.num_materials = array::size(materials);
-	header.num_guis = array::size(guis);
-	header.num_fonts = array::size(fonts);
-	header.num_levels = array::size(levels);
-
-	header.textures_offset = sizeof(PackageHeader);
-	header.scripts_offset  = header.textures_offset + sizeof(ResourceId) * header.num_textures;
-	header.sounds_offset = header.scripts_offset + sizeof(ResourceId) * header.num_scripts;
-	header.meshes_offset = header.sounds_offset + sizeof(ResourceId) * header.num_sounds;
-	header.units_offset = header.meshes_offset + sizeof(ResourceId) * header.num_meshes;
-	header.sprites_offset = header.units_offset + sizeof(ResourceId) * header.num_units;
-	header.physics_offset = header.sprites_offset + sizeof(ResourceId) * header.num_sprites;
-	header.materials_offset = header.physics_offset + sizeof(ResourceId) * header.num_physics;
-	header.guis_offset = header.materials_offset + sizeof(ResourceId) * header.num_materials;
-	header.fonts_offset = header.guis_offset + sizeof(ResourceId) * header.num_guis;
-	header.levels_offset = header.fonts_offset + sizeof(ResourceId) * header.num_fonts;
-
-	out_file->write((char*) &header, sizeof(PackageHeader));
-
-	if (array::size(textures) > 0)
-	{
-		out_file->write((char*) array::begin(textures), sizeof(ResourceId) * header.num_textures);		
-	}
-	if (array::size(scripts) > 0)
-	{
-		out_file->write((char*) array::begin(scripts), sizeof(ResourceId) * header.num_scripts);
-	}
-	if (array::size(sounds) > 0)
-	{
-		out_file->write((char*) array::begin(sounds), sizeof(ResourceId) * header.num_sounds);
-	}
-	if (array::size(meshes) > 0)
-	{
-		out_file->write((char*) array::begin(meshes), sizeof(ResourceId) * header.num_meshes);
-	}
-	if (array::size(units) > 0)
-	{
-		out_file->write((char*) array::begin(units), sizeof(ResourceId) * header.num_units);	
-	}
-	if (array::size(sprites) > 0)
-	{
-		out_file->write((char*) array::begin(sprites), sizeof(ResourceId) * header.num_sprites);
-	}
-	if (array::size(physics) > 0)
-	{
-		out_file->write((char*) array::begin(physics), sizeof(ResourceId) * header.num_physics);
-	}
-	if (array::size(materials) > 0)
-	{
-		out_file->write((char*) array::begin(materials), sizeof(ResourceId) * header.num_materials);
-	}
-	if (array::size(guis) > 0)
-	{
-		out_file->write((char*) array::begin(guis), sizeof(ResourceId) * header.num_guis);
-	}
-	if (array::size(fonts) > 0)
-	{
-		out_file->write((char*) array::begin(fonts), sizeof(ResourceId) * header.num_fonts);
-	}
-	if (array::size(levels) > 0)
-	{
-		out_file->write((char*) array::begin(levels), sizeof(ResourceId) * header.num_levels);
-	}
+	for (uint32_t i = 0; i < num_levels; i++)
+		bw.write(root.key("level")[i].to_resource_id("level"));
 }
 
 } // namespace package_resource

engine/resource/PackageResource.h

@@ -54,8 +54,6 @@ struct PackageHeader
 	uint32_t physics_offset;
 	uint32_t num_materials;
 	uint32_t materials_offset;
-	uint32_t num_guis;
-	uint32_t guis_offset;
 	uint32_t num_fonts;
 	uint32_t fonts_offset;
 	uint32_t num_levels;
@@ -143,12 +141,6 @@ struct PackageResource
 		return ((PackageHeader*) this)->num_materials;
 	}
 
-	//-----------------------------------------------------------------------------
-	uint32_t num_guis() const
-	{
-		return ((PackageHeader*) this)->num_guis;
-	}
-
 	//-----------------------------------------------------------------------------
 	uint32_t num_fonts() const
 	{
@@ -233,15 +225,6 @@ struct PackageResource
 		return begin[i];
 	}
 
-	//-----------------------------------------------------------------------------
-	ResourceId get_gui_id(uint32_t i) const
-	{
-		CE_ASSERT(i < num_guis(), "Index out of bounds");
-
-		ResourceId* begin = (ResourceId*) ((char*) this + ((PackageHeader*) this)->guis_offset);
-		return begin[i];
-	}
-
 	//-----------------------------------------------------------------------------
 	ResourceId get_font_id(uint32_t i) const
 	{