njohnson/XPlor
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Updated xmaterialconstantdef

Browse Source
This commit is contained in:
njohnson 2025-09-07 23:16:03 -04:00
parent d81513a95f
commit 59d5b12e80
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/xassets/xmaterialconstantdef.cpp
View File

@ -3,7 +3,7 @@
XMaterialConstantDef::XMaterialConstantDef() XMaterialConstantDef::XMaterialConstantDef()
: XAsset() : XAsset()
, mNameHash(0) , mNameHash(0)
, mName("") , mName()
, mLiteral() , mLiteral()
{ {
@ -16,12 +16,26 @@ XMaterialConstantDef::~XMaterialConstantDef()
void XMaterialConstantDef::ParseData(QDataStream *aStream) void XMaterialConstantDef::ParseData(QDataStream *aStream)
{ {
if (GetPtr() == -1)
{
*aStream >> mNameHash;
QByteArray rawName(12, Qt::Uninitialized);
aStream->readRawData(rawName.data(), 12);
mName.SetString(QString::fromUtf8(rawName));
*aStream
>> mLiteral[0]
>> mLiteral[1]
>> mLiteral[2]
>> mLiteral[3];
}
} }
void XMaterialConstantDef::Clear() void XMaterialConstantDef::Clear()
{ {
mNameHash = 0; mNameHash = 0;
mName = ""; mName.Clear();
mLiteral.clear(); mLiteral.clear();
} }

5
libs/xassets/xmaterialconstantdef.h
View File

@ -2,13 +2,14 @@
#define XMATERIALCONSTANTDEF_H #define XMATERIALCONSTANTDEF_H
#include "xasset.h" #include "xasset.h"
#include "xstring.h"
#include <QVector> #include <QVector>
class XMaterialConstantDef : public XAsset class XMaterialConstantDef : public XAsset
{ {
public: public:
XMaterialConstantDef(); explicit XMaterialConstantDef();
~XMaterialConstantDef(); ~XMaterialConstantDef();
virtual void ParseData(QDataStream* aStream) override; virtual void ParseData(QDataStream* aStream) override;
@ -16,7 +17,7 @@ public:
private: private:
quint32 mNameHash; quint32 mNameHash;
QString mName; XString mName;
QVector<float> mLiteral; QVector<float> mLiteral;
}; };