resource refactory

[briaguya-ai]

SoH: HarbourMasters/Shipwright#3926
Exporter: HarbourMasters/OTRExporter#15

changes:

RegisterResourceFactory now takes in the factory, file format (currently binary or xml), resource type (name as string and and int for enum), and a version

libultraship/src/resource/ResourceLoader.h

Lines 36 to 37 in 4621d4c

	bool RegisterResourceFactory(std::shared_ptr<ResourceFactory> factory, uint32_t format, std::string typeName,
	uint32_t type, uint32_t version);

ResourceFactory has been simplified

libultraship/src/resource/ResourceFactory.h

Lines 8 to 14 in 4621d4c

	class ResourceFactory {
	public:
	virtual std::shared_ptr<IResource> ReadResource(std::shared_ptr<File> file) = 0;
	protected:
	virtual bool FileHasValidFormatAndReader(std::shared_ptr<File> file) = 0;
	};

example

BlobFactory demonstrates this quite well

before

libultraship/src/resource/factory/BlobFactory.h

Lines 7 to 16 in 825bd12

	class BlobFactory : public ResourceFactory {
	public:
	std::shared_ptr<IResource> ReadResource(std::shared_ptr<ResourceInitData> initData,
	std::shared_ptr<BinaryReader> reader) override;
	};
	class BlobFactoryV0 : public ResourceVersionFactory {
	public:
	void ParseFileBinary(std::shared_ptr<BinaryReader> reader, std::shared_ptr<IResource> resource) override;
	};

libultraship/src/resource/factory/BlobFactory.cpp

Lines 6 to 38 in 825bd12

	std::shared_ptr<IResource> BlobFactory::ReadResource(std::shared_ptr<ResourceInitData> initData,
	std::shared_ptr<BinaryReader> reader) {
	auto resource = std::make_shared<Blob>(initData);
	std::shared_ptr<ResourceVersionFactory> factory = nullptr;
	switch (resource->GetInitData()->ResourceVersion) {
	case 0:
	factory = std::make_shared<BlobFactoryV0>();
	break;
	}
	if (factory == nullptr) {
	SPDLOG_ERROR("Failed to load Blob with version {}", resource->GetInitData()->ResourceVersion);
	return nullptr;
	}
	factory->ParseFileBinary(reader, resource);
	return resource;
	}
	void BlobFactoryV0::ParseFileBinary(std::shared_ptr<BinaryReader> reader, std::shared_ptr<IResource> resource) {
	std::shared_ptr<Blob> blob = std::static_pointer_cast<Blob>(resource);
	ResourceVersionFactory::ParseFileBinary(reader, blob);
	uint32_t dataSize = reader->ReadUInt32();
	blob->Data.reserve(dataSize);
	for (uint32_t i = 0; i < dataSize; i++) {
	blob->Data.push_back(reader->ReadUByte());
	}
	}

after

libultraship/src/resource/factory/BlobFactory.h

Lines 7 to 10 in 4621d4c

	class ResourceFactoryBinaryBlobV0 : public ResourceFactoryBinary {
	public:
	std::shared_ptr<IResource> ReadResource(std::shared_ptr<File> file) override;
	};

libultraship/src/resource/factory/BlobFactory.cpp

Lines 6 to 22 in 4621d4c

	std::shared_ptr<IResource> ResourceFactoryBinaryBlobV0::ReadResource(std::shared_ptr<File> file) {
	if (!FileHasValidFormatAndReader(file)) {
	return nullptr;
	}
	auto blob = std::make_shared<Blob>(file->InitData);
	uint32_t dataSize = file->Reader->ReadUInt32();
	blob->Data.reserve(dataSize);
	for (uint32_t i = 0; i < dataSize; i++) {
	blob->Data.push_back(file->Reader->ReadUByte());
	}
	return blob;
	}