Skip to content

Commit a5d269d

Browse files
committed
move some stuff out
1 parent 5987d3b commit a5d269d

File tree

2 files changed

+0
-47
lines changed

2 files changed

+0
-47
lines changed

src/resource/ResourceLoader.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ ResourceLoader::~ResourceLoader() {
2323
}
2424

2525
void ResourceLoader::RegisterGlobalResourceFactories() {
26-
// include strings so we register types for mResourceTypes
2726
RegisterResourceFactory(std::make_shared<ResourceFactoryBinaryTextureV0>(), RESOURCE_FORMAT_BINARY, "Texture", static_cast<uint32_t>(ResourceType::Texture), 0);
2827
RegisterResourceFactory(std::make_shared<ResourceFactoryBinaryTextureV1>(), RESOURCE_FORMAT_BINARY, "Texture", static_cast<uint32_t>(ResourceType::Texture), 1);
2928
RegisterResourceFactory(std::make_shared<ResourceFactoryBinaryVertexV0>(), RESOURCE_FORMAT_BINARY, "Vertex", static_cast<uint32_t>(ResourceType::Vertex), 0);

src/resource/ResourceType.h

-46
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
#pragma once
22

3-
#include <unordered_map>
4-
#include <string>
5-
63
namespace LUS {
74

85
enum class ResourceType {
@@ -17,48 +14,5 @@ enum class ResourceType {
1714
Array = 0x4F415252, // OARR
1815
Blob = 0x4F424C42, // OBLB
1916
Texture = 0x4F544558, // OTEX
20-
21-
// LUS of Harkinian
22-
SOH_Animation = 0x4F414E4D, // OANM
23-
SOH_PlayerAnimation = 0x4F50414D, // OPAM
24-
SOH_Room = 0x4F524F4D, // OROM
25-
SOH_CollisionHeader = 0x4F434F4C, // OCOL
26-
SOH_Skeleton = 0x4F534B4C, // OSKL
27-
SOH_SkeletonLimb = 0x4F534C42, // OSLB
28-
SOH_Path = 0x4F505448, // OPTH
29-
SOH_Cutscene = 0x4F435654, // OCUT
30-
SOH_Text = 0x4F545854, // OTXT
31-
SOH_Audio = 0x4F415544, // OAUD
32-
SOH_AudioSample = 0x4F534D50, // OSMP
33-
SOH_AudioSoundFont = 0x4F534654, // OSFT
34-
SOH_AudioSequence = 0x4F534551, // OSEQ
35-
SOH_Background = 0x4F424749, // OBGI
36-
SOH_SceneCommand = 0x4F52434D, // ORCM
37-
};
38-
39-
inline std::unordered_map<std::string, uint32_t> mResourceTypes {
40-
{ "None", static_cast<uint32_t>(ResourceType::None) },
41-
{ "Archive", static_cast<uint32_t>(ResourceType::Archive) },
42-
{ "DisplayList", static_cast<uint32_t>(ResourceType::DisplayList) },
43-
{ "Vertex", static_cast<uint32_t>(ResourceType::Vertex) },
44-
{ "Matrix", static_cast<uint32_t>(ResourceType::Matrix) },
45-
{ "Array", static_cast<uint32_t>(ResourceType::Array) },
46-
{ "Blob", static_cast<uint32_t>(ResourceType::Blob) },
47-
{ "Texture", static_cast<uint32_t>(ResourceType::Texture) },
48-
{ "SOH_Animation", static_cast<uint32_t>(ResourceType::SOH_Animation) },
49-
{ "SOH_PlayerAnimation", static_cast<uint32_t>(ResourceType::SOH_PlayerAnimation) },
50-
{ "SOH_Room", static_cast<uint32_t>(ResourceType::SOH_Room) },
51-
{ "SOH_CollisionHeader", static_cast<uint32_t>(ResourceType::SOH_CollisionHeader) },
52-
{ "SOH_Skeleton", static_cast<uint32_t>(ResourceType::SOH_Skeleton) },
53-
{ "SOH_SkeletonLimb", static_cast<uint32_t>(ResourceType::SOH_SkeletonLimb) },
54-
{ "SOH_Path", static_cast<uint32_t>(ResourceType::SOH_Path) },
55-
{ "SOH_Cutscene", static_cast<uint32_t>(ResourceType::SOH_Cutscene) },
56-
{ "SOH_Text", static_cast<uint32_t>(ResourceType::SOH_Text) },
57-
{ "SOH_Audio", static_cast<uint32_t>(ResourceType::SOH_Audio) },
58-
{ "SOH_AudioSample", static_cast<uint32_t>(ResourceType::SOH_AudioSample) },
59-
{ "SOH_AudioSoundFont", static_cast<uint32_t>(ResourceType::SOH_AudioSoundFont) },
60-
{ "SOH_AudioSequence", static_cast<uint32_t>(ResourceType::SOH_AudioSequence) },
61-
{ "SOH_Background", static_cast<uint32_t>(ResourceType::SOH_Background) },
62-
{ "SOH_SceneCommand", static_cast<uint32_t>(ResourceType::SOH_SceneCommand) },
6317
};
6418
} // namespace LUS

0 commit comments

Comments
 (0)