Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Handle nullptr for texture anim color change params #162

Merged
merged 3 commits into from
Mar 27, 2024
Merged

Fix: Handle nullptr for texture anim color change params #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2dd55e
handle nullptr for texture anim color change params
Archez Mar 17, 2024
e84b8a5
bump otrexporter
Archez Mar 27, 2024
7e92956
oops
Archez Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OTRExporter
Open in desktop
Submodule OTRExporter updated 3 files
+21 −5 OTRExporter/DisplayListExporter.cpp
+7 −3 OTRExporter/SkeletonLimbExporter.cpp
+31 −16 OTRExporter/TextureAnimationExporter.cpp
50 changes: 31 additions & 19 deletions mm/2s2h/resource/importer/TextureAnimationFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,43 @@ std::shared_ptr<LUS::IResource> ResourceFactoryBinaryTextureAnimationV0::ReadRes
e->keyFrameLength = reader->ReadUInt16();
e->keyFrameCount = reader->ReadUInt16();

size_t frames = reader->ReadUInt32();

e->keyFrames = new uint16_t[frames];
for (size_t i = 0; i < frames; i++) {
e->keyFrames[i] = reader->ReadUInt16();
size_t keyFrameSize = reader->ReadUInt16();
if (keyFrameSize != 0) {
e->keyFrames = new uint16_t[keyFrameSize];
for (size_t i = 0; i < keyFrameSize; i++) {
e->keyFrames[i] = reader->ReadUInt16();
}
} else {
e->keyFrames = nullptr;
}
size_t primColorSize = reader->ReadUInt32();
e->primColors = new F3DPrimColor[primColorSize];

for (size_t i = 0; i < primColorSize; i++) {
e->primColors[i].r = reader->ReadUByte();
e->primColors[i].g = reader->ReadUByte();
e->primColors[i].b = reader->ReadUByte();
e->primColors[i].a = reader->ReadUByte();
e->primColors[i].lodFrac = reader->ReadUByte();
size_t primColorSize = reader->ReadUInt16();
if (primColorSize != 0) {
e->primColors = new F3DPrimColor[primColorSize];
for (size_t i = 0; i < primColorSize; i++) {
e->primColors[i].r = reader->ReadUByte();
e->primColors[i].g = reader->ReadUByte();
e->primColors[i].b = reader->ReadUByte();
e->primColors[i].a = reader->ReadUByte();
e->primColors[i].lodFrac = reader->ReadUByte();
}
} else {
e->primColors = nullptr;
}

size_t envColorSize = reader->ReadUInt16();
e->envColors = new F3DEnvColor[envColorSize];
for (size_t i = 0; i < envColorSize; i++) {
e->envColors[i].r = reader->ReadUByte();
e->envColors[i].g = reader->ReadUByte();
e->envColors[i].b = reader->ReadUByte();
e->envColors[i].a = reader->ReadUByte();
if (envColorSize != 0) {
e->envColors = new F3DEnvColor[envColorSize];
for (size_t i = 0; i < envColorSize; i++) {
e->envColors[i].r = reader->ReadUByte();
e->envColors[i].g = reader->ReadUByte();
e->envColors[i].b = reader->ReadUByte();
e->envColors[i].a = reader->ReadUByte();
}
} else {
e->envColors = nullptr;
}

anim.params = e;
break;
}
Expand Down
Loading