From 3a84ccd30fbaa804dd94d8d3aa97dd197e7668f7 Mon Sep 17 00:00:00 2001 From: njohnson Date: Sun, 7 Sep 2025 23:16:05 -0400 Subject: [PATCH] Updated xmaterialtechniqueset --- libs/xassets/xmaterialtechniqueset.cpp | 58 ++++++++++++++------------ 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/libs/xassets/xmaterialtechniqueset.cpp b/libs/xassets/xmaterialtechniqueset.cpp index 82eaf9e..f3d758e 100644 --- a/libs/xassets/xmaterialtechniqueset.cpp +++ b/libs/xassets/xmaterialtechniqueset.cpp @@ -18,40 +18,44 @@ XMaterialTechniqueSet::~XMaterialTechniqueSet() void XMaterialTechniqueSet::ParseData(QDataStream *aStream) { - if (IsDebug()) + if (GetPtr() == -1) { - qDebug() << QString("[%1] Parsing data for %2").arg(aStream->device()->pos(), 10, 10, QChar('0')).arg(GetName()); - } - mName.ParsePtr(aStream, false); + if (IsDebug()) + { + qDebug() << QString("[%1] Parsing data for %2").arg(aStream->device()->pos(), 10, 10, QChar('0')).arg(GetName()); + } + mName.ParsePtr(aStream, false); - *aStream >> mWorldVertFormat; - if (IsDebug()) - { - qDebug() << QString("[%1] mWorldVertFormat = %2").arg(aStream->device()->pos(), 10, 10, QChar('0')).arg(mWorldVertFormat); - } + *aStream >> mWorldVertFormat; + if (IsDebug()) + { + qDebug() << QString("[%1] mWorldVertFormat = %2").arg(aStream->device()->pos(), 10, 10, QChar('0')).arg(mWorldVertFormat); + } - aStream->skipRawData(3); + aStream->skipRawData(3); - qint32 remappedPtr; - *aStream >> remappedPtr; - if (IsDebug()) - { - qDebug() << QString("[%1] remappedPtr = %2").arg(aStream->device()->pos(), 10, 10, QChar('0')).arg(remappedPtr); + qint32 remappedPtr; + *aStream >> remappedPtr; + if (IsDebug()) + { + qDebug() << QString("[%1] remappedPtr = %2").arg(aStream->device()->pos(), 10, 10, QChar('0')).arg(remappedPtr); - qDebug() << QString("Parsing techniques."); - } - for (int i = 0; i < 26; i++) - { - XMaterialTechnique newTechnique; - newTechnique.ParsePtr(aStream, false); - mTechniques.append(newTechnique); - } + qDebug() << QString("Parsing techniques."); + } + for (int i = 0; i < 26; i++) + { + XMaterialTechnique newTechnique; + newTechnique.ParsePtr(aStream, false); + mTechniques.append(newTechnique); + } - mName.ParseData(aStream, ","); + mName.SetRemoveString(","); + mName.ParseData(aStream); - for (int i = 0; i < 26; i++) - { - mTechniques[i].ParseData(aStream); + for (int i = 0; i < 26; i++) + { + mTechniques[i].ParseData(aStream); + } } }