diff options
Diffstat (limited to 'src/uipparser/Qt3DSUIPParserImpl.h')
| -rw-r--r-- | src/uipparser/Qt3DSUIPParserImpl.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/uipparser/Qt3DSUIPParserImpl.h b/src/uipparser/Qt3DSUIPParserImpl.h index f89227b..aef3d10 100644 --- a/src/uipparser/Qt3DSUIPParserImpl.h +++ b/src/uipparser/Qt3DSUIPParserImpl.h @@ -430,6 +430,11 @@ protected: TStringVector m_SourcePathList; TStringSet m_iblSources; QVector<QString> m_slideSourcePaths; + QVector<QString> m_materialContainerIds; + QHash<QString, QVector<QString>> m_imagesByMaterial; + QHash<QString, QVector<QString>> m_sourcePathsById; + QVector<QString> m_currentSlideReferencedMaterials; + QVector<QPair<qt3ds::runtime::SSlideKey, QVector<QString>>> m_referencedMaterialsBySlide; struct SElementRefCache { @@ -522,7 +527,8 @@ protected: //============================================================================== public: // Construction CUIPParserImpl(const QString &inFileName, IRuntimeMetaData &inMetaData, - IInputStreamFactory &inFactory, qt3ds::foundation::IStringTable &inStringTable); + IInputStreamFactory &inFactory, qt3ds::foundation::IStringTable &inStringTable, + int &uipVersion); virtual ~CUIPParserImpl(); public: // Parse UIP file @@ -554,7 +560,7 @@ protected: // Operation bool initInRenderThread); BOOL LoadSceneGraph(IPresentation &inPresentation, qt3dsdm::IDOMReader &inReader, qt3ds::runtime::element::SElement *inNewStyleParent, - bool initInRenderThread); + bool initInRenderThread, bool isInsideLayer = false); BOOL LoadLogic(IPresentation &inPresentation, qt3dsdm::IDOMReader &inReader); BOOL LoadStateGraph(IPresentation &inPresentation, qt3dsdm::IDOMReader &inReader); @@ -656,7 +662,8 @@ protected: ERuntimeAdditionalMetaDataType inAdditionalType, CRegisteredString *inAttStrNames, qt3dsdm::SFloat4 &inValue); void AddStringAttribute(IPresentation &inPresentation, TPropertyDescAndValueList &outDescList, - CRegisteredString inAttStrName, const char *inValue); + CRegisteredString inAttStrName, const char *inValue, + bool addSourceAsString = false); void AddElementRefAttribute(TPropertyDescAndValueList &outDescList, CRegisteredString inAttStrName, SElement *inElement); |