isledecomp/SIEdit
1
0
Fork 0
mirror of https://github.com/isledecomp/SIEdit.git synced 2024-11-27 01:25:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: cleanup and add find helper functions

Browse source
This commit is contained in:
itsmattkc 2022-07-03 22:45:05 -05:00
parent 7db9fb91b4
commit ded9fbf676
2 changed files with 65 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
lib/chunk.cpp
View file

@ -54,33 +54,15 @@ bool Chunk::Read(std::ifstream &f, u32 &version, u32 &alignment)
// Read custom data from this chunk
Clear();
switch (type()) {
case TYPE_RIFF:
RIFF().Read(f, data_, version, size);
break;
case TYPE_MxHd:
MxHd().Read(f, data_, version, size);
version = data_["Version"];
alignment = data_["BufferSize"];
break;
case TYPE_LIST:
LIST().Read(f, data_, version, size);
break;
case TYPE_MxSt:
MxSt().Read(f, data_, version, size);
break;
case TYPE_MxCh:
MxCh().Read(f, data_, version, size);
break;
case TYPE_MxOf:
MxOf().Read(f, data_, version, size);
break;
case TYPE_pad_:
pad_().Read(f, data_, version, size);
break;
case TYPE_MxOb:
MxOb().Read(f, data_, version, size);
break;
if (RIFF *reader = GetReaderFromType(type())) {
reader->Read(f, data_, version, size);
if (type() == TYPE_MxHd) {
version = data_["Version"];
alignment = data_["BufferSize"];
}
delete reader;
}
// Assume any remaining data is this chunk's children
@ -109,6 +91,30 @@ bool Chunk::Read(std::ifstream &f, u32 &version, u32 &alignment)
return true;
}
RIFF *Chunk::GetReaderFromType(Type type)
{
switch (type) {
case TYPE_RIFF:
return new RIFF();
case TYPE_MxHd:
return new MxHd();
case TYPE_LIST:
return new LIST();
case TYPE_MxSt:
return new MxSt();
case TYPE_MxCh:
return new MxCh();
case TYPE_MxOf:
return new MxOf();
case TYPE_pad_:
return new pad_();
case TYPE_MxOb:
return new MxOb();
}
return NULL;
}
void Chunk::Clear()
{
// Delete data
@ -192,4 +198,30 @@ const char *Chunk::GetTypeDescription(Type type)
return "Unknown";
}
Chunk *Chunk::FindChildWithType(Type type) const
{
for (Chunk *child : children_) {
if (child->type() == type) {
return child;
} else if (Chunk *grandchild = child->FindChildWithType(type)) {
return grandchild;
}
}
return NULL;
}
Chunk *Chunk::FindChildWithOffset(u32 offset) const
{
for (Chunk *child : children_) {
if (child->offset() == offset) {
return child;
} else if (Chunk *grandchild = child->FindChildWithOffset(offset)) {
return grandchild;
}
}
return NULL;
}
}

6
lib/chunk.h
View file

@ -6,6 +6,7 @@
#include <memory>
#include "common.h"
#include "sitypes.h"
#include "types.h"
namespace si {
@ -57,6 +58,9 @@ public:
return GetTypeDescription(type());
}
LIBWEAVER_EXPORT Chunk *FindChildWithType(Type type) const;
LIBWEAVER_EXPORT Chunk *FindChildWithOffset(u32 offset) const;
private:
// Disable copy
Chunk(const Chunk& other);
@ -64,6 +68,8 @@ private:
bool Read(std::ifstream &f, u32 &version, u32 &alignment);
static RIFF *GetReaderFromType(Type type);
u32 id_;
u32 offset_;
std::map<std::string, Data> data_;