From caca3dd4891b3f91647b62017983215e62bf78d0 Mon Sep 17 00:00:00 2001 From: Nicholas Johnson Date: Wed, 3 Sep 2025 13:00:41 -0400 Subject: [PATCH] Update animation-related files --- libs/xassets/xanimdeltapart.cpp | 6 ----- libs/xassets/xanimdeltapart.h | 6 ----- libs/xassets/xanimdeltapartquatdataframes.cpp | 27 ++++++++----------- libs/xassets/xanimdeltapartquatdataframes.h | 16 +++-------- libs/xassets/xanimparts.cpp | 2 -- libs/xassets/xanimparts.h | 9 ------- 6 files changed, 14 insertions(+), 52 deletions(-) diff --git a/libs/xassets/xanimdeltapart.cpp b/libs/xassets/xanimdeltapart.cpp index 1590305..7696d55 100644 --- a/libs/xassets/xanimdeltapart.cpp +++ b/libs/xassets/xanimdeltapart.cpp @@ -1,9 +1,3 @@ - - - - - - #include "xanimdeltapart.h" XAnimDeltaPart::XAnimDeltaPart() diff --git a/libs/xassets/xanimdeltapart.h b/libs/xassets/xanimdeltapart.h index d351c84..1aa1186 100644 --- a/libs/xassets/xanimdeltapart.h +++ b/libs/xassets/xanimdeltapart.h @@ -1,9 +1,3 @@ - - - - - - #ifndef XANIMDELTAPART_H #define XANIMDELTAPART_H diff --git a/libs/xassets/xanimdeltapartquatdataframes.cpp b/libs/xassets/xanimdeltapartquatdataframes.cpp index 069d85d..cc9e6cc 100644 --- a/libs/xassets/xanimdeltapartquatdataframes.cpp +++ b/libs/xassets/xanimdeltapartquatdataframes.cpp @@ -1,25 +1,9 @@ - - - - - - #include "xanimdeltapartquatdataframes.h" XAnimDeltaPartQuatDataFrames::XAnimDeltaPartQuatDataFrames() : XAsset() { } -void XAnimDeltaPartQuatDataFrames::ParseData(QDataStream *aStream) { - if (GetPtr() == -1) { - aStream->read((char*)&mFramesPtr, sizeof(quint32)); - aStream->read((char*)mFrames, 2 * sizeof(qint16)); - - // Parse indices - mIndices.ParseData(aStream); - } -} - quint32 XAnimDeltaPartQuatDataFrames::GetFramesPtr() const { return mFramesPtr; } @@ -50,6 +34,17 @@ void XAnimDeltaPartQuatDataFrames::SetIndices(const XAnimDynamicIndices& indices mIndices = indices; } +void XAnimDeltaPartQuatDataFrames::ParseData(QDataStream *aStream) { + if (GetPtr() == -1) { + aStream->read((char*)&mFramesPtr, sizeof(quint32)); + aStream->read((char*)mFrames, 2 * sizeof(qint16)); + // Parse indices + mIndices.ParseData(aStream); + } +} +void XAnimDeltaPartQuatDataFrames::Clear() +{ +} diff --git a/libs/xassets/xanimdeltapartquatdataframes.h b/libs/xassets/xanimdeltapartquatdataframes.h index 1922fe1..8120225 100644 --- a/libs/xassets/xanimdeltapartquatdataframes.h +++ b/libs/xassets/xanimdeltapartquatdataframes.h @@ -1,9 +1,3 @@ - - - - - - #ifndef XANIMDELTAPARTQUATDATAFRAMES_H #define XANIMDELTAPARTQUATDATAFRAMES_H @@ -15,8 +9,6 @@ class XAnimDeltaPartQuatDataFrames : public XAsset public: explicit XAnimDeltaPartQuatDataFrames(); - void ParseData(QDataStream *aStream) override; - quint32 GetFramesPtr() const; void SetFramesPtr(quint32 ptr); @@ -27,6 +19,9 @@ public: const XAnimDynamicIndices& GetIndices() const; void SetIndices(const XAnimDynamicIndices& indices); + void ParseData(QDataStream *aStream) override; + void Clear() override; + private: quint32 mFramesPtr = 0; qint16 mFrames[2] = {0}; @@ -34,8 +29,3 @@ private: }; #endif // XANIMDELTAPARTQUATDATAFRAMES_H - - - - - diff --git a/libs/xassets/xanimparts.cpp b/libs/xassets/xanimparts.cpp index 38bf28c..aa55d5e 100644 --- a/libs/xassets/xanimparts.cpp +++ b/libs/xassets/xanimparts.cpp @@ -1,5 +1,3 @@ - - #include "xanimparts.h" XAnimParts::XAnimParts() diff --git a/libs/xassets/xanimparts.h b/libs/xassets/xanimparts.h index b790a23..cf27beb 100644 --- a/libs/xassets/xanimparts.h +++ b/libs/xassets/xanimparts.h @@ -1,12 +1,3 @@ - - - - - - - - - #ifndef XANIMPARTS_H #define XANIMPARTS_H