izzy/Torch
0
0
Fork 0
mirror of https://github.com/izzy2lost/Torch.git synced 2026-07-06 00:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed animation factory

Browse Source
This commit is contained in:
KiritoDv
2024-06-01 20:33:00 -06:00
parent 7e4c4bca08
commit 3b64734201
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/factories/sm64/AnimationFactory.cpp
+7 -7
View File
@@ -3,7 +3,7 @@
#include "utils/Decompressor.h"
#define ANIMINDEX_COUNT(boneCount) (sizeof(boneCount) + 1) * 6 * sizeof(uint16_t)
#define ANIMINDEX_COUNT(boneCount) (boneCount + 1) * 6 * sizeof(uint16_t)
ExportResult SM64::AnimationBinaryExporter::Export(std::ostream &write, std::shared_ptr<IParsedData> raw, std::string& entryName, YAML::Node &node, std::string* replacement ) {
auto writer = LUS::BinaryWriter();
@@ -53,17 +53,17 @@ std::optional<std::shared_ptr<IParsedData>> SM64::AnimationFactory::parse(std::v
LUS::BinaryReader indices = LUS::BinaryReader(data.data + indexAddr, indexLength * sizeof(uint16_t));
indices.SetEndianness(Torch::Endianness::Big);
std::vector<int16_t> indicesData;
std::vector<uint16_t> indicesData;
for (size_t i = 0; i < indexLength; i++) {
indicesData.push_back(indices.ReadInt16());
indicesData.push_back(indices.ReadUInt16());
}
size_t valuesSize = length * sizeof(uint16_t);
size_t valuesSize = length * sizeof(int16_t);
LUS::BinaryReader values = LUS::BinaryReader(data.data + valuesAddr, valuesSize);
values.SetEndianness(Torch::Endianness::Big);
std::vector<uint16_t> valuesData;
for (size_t i = 0; i < valuesSize / sizeof(uint16_t); i++) {
valuesData.push_back(values.ReadUInt16());
std::vector<int16_t> valuesData;
for (size_t i = 0; i < valuesSize / sizeof(int16_t); i++) {
valuesData.push_back(values.ReadInt16());
}
SPDLOG_INFO("Flags: {}", flags);
src/factories/sm64/AnimationFactory.h
+3 -3
View File
@@ -12,10 +12,10 @@ public:
int16_t mLoopEnd;
int16_t mUnusedBoneCount;
int16_t mLength;
std::vector<int16_t> mIndices;
std::vector<uint16_t> mEntries;
std::vector<uint16_t> mIndices;
std::vector<int16_t> mEntries;
AnimationData(int16_t flags, int16_t animYTransDivisor, int16_t startFrame, int16_t loopStart, int16_t loopEnd, int16_t unusedBoneCount, int16_t length, std::vector<int16_t> indices, std::vector<uint16_t> entries) : mFlags(flags), mAnimYTransDivisor(animYTransDivisor), mStartFrame(startFrame), mLoopStart(loopStart), mLoopEnd(loopEnd), mUnusedBoneCount(unusedBoneCount), mLength(length), mIndices(std::move(indices)), mEntries(std::move(entries)) {}
AnimationData(int16_t flags, int16_t animYTransDivisor, int16_t startFrame, int16_t loopStart, int16_t loopEnd, int16_t unusedBoneCount, int16_t length, std::vector<uint16_t> indices, std::vector<int16_t> entries) : mFlags(flags), mAnimYTransDivisor(animYTransDivisor), mStartFrame(startFrame), mLoopStart(loopStart), mLoopEnd(loopEnd), mUnusedBoneCount(unusedBoneCount), mLength(length), mIndices(std::move(indices)), mEntries(std::move(entries)) {}
};
class AnimationBinaryExporter : public BaseExporter {