diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2017-10-13 11:42:45 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-10-24 13:23:14 +0000 |
| commit | a0ee8e091ee53ec1c52ab71fbf7334657182a336 (patch) | |
| tree | a911b9af3118632735e18f448d5d28290ba37ce0 | |
| parent | 544204f17381e6e6ae025388ed4ee2d0cfd22b06 (diff) | |
Replace uic namespace with qt3ds namespace
Task-number: QT3DS-18
Change-Id: I3a39265bb47930e4f4924aab4b098a40f15c5b0a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
327 files changed, 1246 insertions, 1246 deletions
diff --git a/src/Authoring/Client/Code/Core/Core/Core.cpp b/src/Authoring/Client/Code/Core/Core/Core.cpp index 40577422..556c70d0 100644 --- a/src/Authoring/Client/Code/Core/Core/Core.cpp +++ b/src/Authoring/Client/Code/Core/Core/Core.cpp @@ -253,7 +253,7 @@ void CCore::OnNewDocument(const CUICFile &inDocument, bool inCreateDirectory) #ifdef DRIVE_DESIGN_STUDIO // Update the uia file if possible. - uic::state::IApplication::EnsureApplicationFile(theDocument.GetCharStar(), QStringList()); + qt3ds::state::IApplication::EnsureApplicationFile(theDocument.GetCharStar(), QStringList()); #endif } diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.cpp b/src/Authoring/Client/Code/Core/Doc/Doc.cpp index 9b3ab1f4..e69b7830 100644 --- a/src/Authoring/Client/Code/Core/Doc/Doc.cpp +++ b/src/Authoring/Client/Code/Core/Doc/Doc.cpp @@ -965,9 +965,9 @@ void CDoc::GetProjectFonts( std::vector<std::pair<Q3DStudio::CString, Q3DStudio::CString>> &outFontNameFileList) { outFontNameFileList.clear(); - uic::render::ITextRenderer *theRenderer = m_SceneGraph->GetTextRenderer(); + qt3ds::render::ITextRenderer *theRenderer = m_SceneGraph->GetTextRenderer(); if (theRenderer) { - qt3ds::render::NVConstDataRef<uic::render::SRendererFontEntry> theProjectFonts = + qt3ds::render::NVConstDataRef<qt3ds::render::SRendererFontEntry> theProjectFonts = theRenderer->GetProjectFontList(); for (uint32_t idx = 0, end = theProjectFonts.size(); idx < end; ++idx) outFontNameFileList.push_back( @@ -979,9 +979,9 @@ void CDoc::GetProjectFonts( void CDoc::GetProjectFonts(std::vector<Q3DStudio::CString> &outFonts) { outFonts.clear(); - uic::render::ITextRenderer *theRenderer = m_SceneGraph->GetTextRenderer(); + qt3ds::render::ITextRenderer *theRenderer = m_SceneGraph->GetTextRenderer(); if (theRenderer) { - qt3ds::render::NVConstDataRef<uic::render::SRendererFontEntry> theProjectFonts = + qt3ds::render::NVConstDataRef<qt3ds::render::SRendererFontEntry> theProjectFonts = theRenderer->GetProjectFontList(); for (uint32_t idx = 0, end = theProjectFonts.size(); idx < end; ++idx) outFonts.push_back(ConvertToWide(theProjectFonts[idx].m_FontName)); @@ -990,10 +990,10 @@ void CDoc::GetProjectFonts(std::vector<Q3DStudio::CString> &outFonts) Q3DStudio::CString CDoc::GetProjectFontName(const Q3DStudio::CFilePath &inFullPathToFontFile) { - uic::render::ITextRenderer *theRenderer = m_SceneGraph->GetTextRenderer(); + qt3ds::render::ITextRenderer *theRenderer = m_SceneGraph->GetTextRenderer(); Q3DStudio::CString theFont; if (theRenderer) { - qt3ds::render::NVConstDataRef<uic::render::SRendererFontEntry> theProjectFonts = + qt3ds::render::NVConstDataRef<qt3ds::render::SRendererFontEntry> theProjectFonts = theRenderer->GetProjectFontList(); qCInfo(qt3ds::TRACE_INFO) << "Attempting to find font: " << inFullPathToFontFile.GetCharStar(); @@ -2317,7 +2317,7 @@ std::shared_ptr<UICDM::IDOMReader> CDoc::CreateDOMReader(CBufferedInputStream &i } using std::pair; using std::make_pair; -using uic::render::SImageTextureData; +using qt3ds::render::SImageTextureData; static bool SourcePathImageBufferLessThan(const pair<Q3DStudio::CString, SImageTextureData> &lhs, const pair<Q3DStudio::CString, SImageTextureData> &rhs) diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp index 9a490a9b..b900cdf0 100644 --- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp +++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp @@ -149,7 +149,7 @@ struct ScopedBoolean ~ScopedBoolean() { m_Value = !m_Value; } }; -typedef qt3ds::foundation::NVScopedRefCounted<uic::render::IInputStreamFactory> TStreamFactoryPtr; +typedef qt3ds::foundation::NVScopedRefCounted<qt3ds::render::IInputStreamFactory> TStreamFactoryPtr; struct SImportXmlErrorHandler : public CXmlErrorHandler { @@ -220,7 +220,7 @@ public: , m_IgnoreDirChange(false) , m_StringTable(m_DataCore.GetStringTable()) , m_Foundation(Q3DStudio::Foundation::SStudioFoundation::Create()) - , m_InputStreamFactory(uic::render::IInputStreamFactory::Create(*m_Foundation.m_Foundation)) + , m_InputStreamFactory(qt3ds::render::IInputStreamFactory::Create(*m_Foundation.m_Foundation)) , m_LuaState(NULL) { @@ -3094,7 +3094,7 @@ public: ParseInstanceDefinition(const CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory) = 0; + qt3ds::render::IInputStreamFactory &inInputStreamFactory) = 0; }; virtual TInstanceHandle LoadDynamicInstance(const Q3DStudio::CString &inFullPathToDocument, @@ -3184,7 +3184,7 @@ public: ParseInstanceDefinition(const CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory) override + qt3ds::render::IInputStreamFactory &inInputStreamFactory) override { return IDocumentEditor::ParseLuaFile(inFullPathToDocument, inStringTable, inHandler, inInputStreamFactory); @@ -3213,7 +3213,7 @@ public: ParseInstanceDefinition(const CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory) override + qt3ds::render::IInputStreamFactory &inInputStreamFactory) override { return IDocumentEditor::ParseScriptFile(inFullPathToDocument, inStringTable, inHandler, inInputStreamFactory); @@ -3259,7 +3259,7 @@ public: ParseInstanceDefinition(const CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory) override + qt3ds::render::IInputStreamFactory &inInputStreamFactory) override { return IDocumentEditor::ParsePluginFile(inFullPathToDocument, inStringTable, inHandler, inInputStreamFactory); @@ -3380,7 +3380,7 @@ public: std::vector<SMetaDataLoadWarning> theWarnings; QString shaderFile = QString::fromWCharArray(theShaderFile); - NVScopedRefCounted<uic::render::IRefCountedInputStream> theStream( + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream( m_InputStreamFactory->GetStreamForFile(shaderFile)); (m_MetaData.*inLoader)(m_StringTable.GetNarrowStr(theRelativePath), theParentInstance, @@ -4231,7 +4231,7 @@ public: theLoadedBuffer->Free(m_Foundation.m_Foundation->getAllocator()); } - void ReplaceTextFontNameWithTextFileStem(uic::render::ITextRenderer &inRenderer) override + void ReplaceTextFontNameWithTextFileStem(qt3ds::render::ITextRenderer &inRenderer) override { TInstanceHandleList theTextInstances; m_DataCore.GetInstancesDerivedFrom(theTextInstances, m_Bridge.GetText().m_Instance); @@ -4567,7 +4567,7 @@ public: && theInstances.empty() == false) { CString theNameStr = GetName(theInstances[0].second); std::vector<SMetaDataLoadWarning> theWarnings; - NVScopedRefCounted<uic::render::IRefCountedInputStream> theStream( + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream( m_InputStreamFactory->GetStreamForFile( QString::fromWCharArray(theRecord.m_File))); if (theStream) { @@ -4720,7 +4720,7 @@ std::shared_ptr<IDOMReader> IDocumentEditor::ParseLuaFile(const CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory) + qt3ds::render::IInputStreamFactory &inInputStreamFactory) { using namespace LuaParser; std::shared_ptr<UICDM::IStringTable> theStringTable(inStringTable); @@ -4744,7 +4744,7 @@ std::shared_ptr<IDOMReader> IDocumentEditor::ParseScriptFile(const CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory) + qt3ds::render::IInputStreamFactory &inInputStreamFactory) { using namespace ScriptParser; std::shared_ptr<UICDM::IStringTable> theStringTable(inStringTable); @@ -4770,7 +4770,7 @@ std::shared_ptr<IDOMReader> IDocumentEditor::ParsePluginFile(const Q3DStudio::CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory) + qt3ds::render::IInputStreamFactory &inInputStreamFactory) { std::shared_ptr<UICDM::IStringTable> theStringTable(inStringTable); std::shared_ptr<IDOMFactory> theFactory(IDOMFactory::CreateDOMFactory(theStringTable)); @@ -4794,7 +4794,7 @@ std::shared_ptr<IDOMReader> IDocumentEditor::ParseCustomMaterialFile(const Q3DStudio::CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory) + qt3ds::render::IInputStreamFactory &inInputStreamFactory) { std::shared_ptr<UICDM::IStringTable> theStringTable(inStringTable); std::shared_ptr<IDOMFactory> theFactory(IDOMFactory::CreateDOMFactory(theStringTable)); diff --git a/src/Authoring/Client/Code/Core/Doc/DynamicLua.cpp b/src/Authoring/Client/Code/Core/Doc/DynamicLua.cpp index d35467a8..ca7f26da 100644 --- a/src/Authoring/Client/Code/Core/Doc/DynamicLua.cpp +++ b/src/Authoring/Client/Code/Core/Doc/DynamicLua.cpp @@ -124,7 +124,7 @@ struct DynLua : public IDynamicLua #undef HANDLE_LUA_FUNCTION NVFoundationBase &m_Foundation; - uic::render::CLoadedDynamicLibrary *m_LuaLibrary; + qt3ds::render::CLoadedDynamicLibrary *m_LuaLibrary; lua_State *m_LuaState; eastl::string m_TempStr; @@ -160,7 +160,7 @@ struct DynLua : public IDynamicLua DynLua(NVFoundationBase &fnd, const char8_t *pathToLuaDll) : m_Foundation(fnd) - , m_LuaLibrary(uic::render::CLoadedDynamicLibrary::Create(pathToLuaDll, fnd)) + , m_LuaLibrary(qt3ds::render::CLoadedDynamicLibrary::Create(pathToLuaDll, fnd)) , m_LuaState(NULL) { if (m_LuaLibrary) { diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp index 5e8e96ea..78294b60 100644 --- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp +++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp @@ -112,7 +112,7 @@ struct WStrOps<GuideDirections::Enum> namespace { -typedef qt3ds::foundation::NVScopedRefCounted<uic::render::IInputStreamFactory> TStreamFactoryPtr; +typedef qt3ds::foundation::NVScopedRefCounted<qt3ds::render::IInputStreamFactory> TStreamFactoryPtr; using std::hash; @@ -319,7 +319,7 @@ struct SComposerSerializerImpl : public IComposerSerializer SComposerObjectDefinitions &m_ObjectDefinitions; UICDM::IStringTable &m_StringTable; std::shared_ptr<Q3DStudio::IImportFailedHandler> m_ImportFailedHandler; - uic::render::IPathManager &m_PathManager; + qt3ds::render::IPathManager &m_PathManager; // The instances we have discovered when we are writing THandleToIdMap m_HandleToIdMap; @@ -369,7 +369,7 @@ struct SComposerSerializerImpl : public IComposerSerializer IActionSystem &inActionSystem, ISlideGraphCore &inSlideGraphCore, SComposerObjectDefinitions &inObjectDefinitions, std::shared_ptr<Q3DStudio::IImportFailedHandler> inFailedHandler, - IGuideSystem &inGuideSystem, uic::render::IPathManager &inPathManager) + IGuideSystem &inGuideSystem, qt3ds::render::IPathManager &inPathManager) : m_DataCore(inDataCore) , m_MetaData(inMetaData) , m_SlideCore(inSlideCore) @@ -385,7 +385,7 @@ struct SComposerSerializerImpl : public IComposerSerializer , m_ImportFailedHandler(inFailedHandler) , m_PathManager(inPathManager) , m_Foundation(Q3DStudio::Foundation::SStudioFoundation::Create()) - , m_InputStreamFactory(uic::render::IInputStreamFactory::Create(*m_Foundation.m_Foundation)) + , m_InputStreamFactory(qt3ds::render::IInputStreamFactory::Create(*m_Foundation.m_Foundation)) , m_PreserveFileIds(true) { } @@ -2543,7 +2543,7 @@ struct SComposerSerializerImpl : public IComposerSerializer if (theFullPath.Exists()) { std::vector<SMetaDataLoadWarning> warnings; // Now the magic section - NVScopedRefCounted<uic::render::IRefCountedInputStream> + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream = m_InputStreamFactory->GetStreamForFile( QString::fromWCharArray(theFullPath)); if (theStream) { @@ -2574,7 +2574,7 @@ struct SComposerSerializerImpl : public IComposerSerializer L"material", CString::ENDOFSTRING, false)) { if (theFullPath.Exists()) { std::vector<SMetaDataLoadWarning> warnings; - NVScopedRefCounted<uic::render::IRefCountedInputStream> + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream = m_InputStreamFactory->GetStreamForFile( QString::fromWCharArray(theFullPath)); if (theStream) { @@ -2855,7 +2855,7 @@ std::shared_ptr<IComposerSerializer> IComposerSerializer::CreateGraphSlideSerial ISlideSystem &inSlideSystem, IActionSystem &inActionSystem, ISlideGraphCore &inSlideGraphCore, SComposerObjectDefinitions &inObjectDefinitions, std::shared_ptr<Q3DStudio::IImportFailedHandler> inFailedHandler, IGuideSystem &inGuideSystem, - uic::render::IPathManager &inPathManager) + qt3ds::render::IPathManager &inPathManager) { return std::shared_ptr<SComposerSerializerImpl>(new SComposerSerializerImpl( inDataCore, inMetaData, inSlideCore, inAnimationCore, inActionCore, inAssetGraph, diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h index 901aa51b..b222605a 100644 --- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h +++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h @@ -30,7 +30,7 @@ #ifndef COMPOSERSERIALIZERH #define COMPOSERSERIALIZERH #include "UICDMHandles.h" -namespace uic { +namespace qt3ds { namespace render { class IPathManager; } @@ -108,7 +108,7 @@ public: UICDM::IActionSystem &inActionSystem, UICDM::ISlideGraphCore &inSlideGraphCore, UICDM::SComposerObjectDefinitions &inObjectDefinitions, std::shared_ptr<Q3DStudio::IImportFailedHandler> inFailedHandler, - UICDM::IGuideSystem &inGuideSystem, uic::render::IPathManager &inPathManager); + UICDM::IGuideSystem &inGuideSystem, qt3ds::render::IPathManager &inPathManager); }; } diff --git a/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h b/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h index 6183db8a..e91f8b40 100644 --- a/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h +++ b/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h @@ -41,10 +41,10 @@ namespace foundation { #pragma once namespace Q3DStudio { using qt3ds::QT3DSVec3; -using uic::render::IBufferManager; -using uic::render::ITextRenderer; -using uic::render::SGraphObject; -using uic::render::IPathManager; +using qt3ds::render::IBufferManager; +using qt3ds::render::ITextRenderer; +using qt3ds::render::SGraphObject; +using qt3ds::render::IPathManager; class IDocSceneGraph { diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentBufferCache.h b/src/Authoring/Client/Code/Core/Doc/IDocumentBufferCache.h index 312808cf..e098531e 100644 --- a/src/Authoring/Client/Code/Core/Doc/IDocumentBufferCache.h +++ b/src/Authoring/Client/Code/Core/Doc/IDocumentBufferCache.h @@ -37,7 +37,7 @@ #include "UICRender.h" #include "UICRenderImageTextureData.h" -namespace uic { +namespace qt3ds { namespace render { struct SRenderMesh; struct SImageTextureData; @@ -49,12 +49,12 @@ class CDoc; namespace Q3DStudio { class CFilePath; class CString; -using uic::render::SRenderMesh; -using uic::render::SImageTextureData; +using qt3ds::render::SRenderMesh; +using qt3ds::render::SImageTextureData; struct SModelBufferAndPath { - uic::render::SRenderMesh *m_ModelBuffer; + qt3ds::render::SRenderMesh *m_ModelBuffer; Q3DStudio::CFilePath m_FilePath; SModelBufferAndPath(SRenderMesh *inBuffer, const Q3DStudio::CFilePath &inPath) diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h index d0258ab4..0257143d 100644 --- a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h +++ b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h @@ -61,7 +61,7 @@ namespace UICIMP { struct STranslationLog; } -namespace uic { +namespace qt3ds { namespace render { class IInputStreamFactory; class ITextRenderer; @@ -389,7 +389,7 @@ public: // Absolute path to the file. virtual void RefreshImport(const CFilePath &inOldFile, const CFilePath &inNewFile) = 0; - virtual void ReplaceTextFontNameWithTextFileStem(uic::render::ITextRenderer &inRenderer) = 0; + virtual void ReplaceTextFontNameWithTextFileStem(qt3ds::render::ITextRenderer &inRenderer) = 0; virtual void ExternalizePath(TInstanceHandle path) = 0; virtual void InternalizePath(TInstanceHandle path) = 0; @@ -398,25 +398,25 @@ public: ParseLuaFile(const Q3DStudio::CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory); + qt3ds::render::IInputStreamFactory &inInputStreamFactory); static std::shared_ptr<IDOMReader> ParseScriptFile(const Q3DStudio::CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory); + qt3ds::render::IInputStreamFactory &inInputStreamFactory); static std::shared_ptr<IDOMReader> ParsePluginFile(const Q3DStudio::CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory); + qt3ds::render::IInputStreamFactory &inInputStreamFactory); static std::shared_ptr<IDOMReader> ParseCustomMaterialFile(const Q3DStudio::CFilePath &inFullPathToDocument, std::shared_ptr<UICDM::IStringTable> inStringTable, std::shared_ptr<IImportFailedHandler> inHandler, - uic::render::IInputStreamFactory &inInputStreamFactory); + qt3ds::render::IInputStreamFactory &inInputStreamFactory); static void DisplayImportErrors(const QString &inImportSource, UICIMP::ImportErrorCodes::Enum inImportError, diff --git a/src/Authoring/Studio/Render/PathWidget.cpp b/src/Authoring/Studio/Render/PathWidget.cpp index 49fea1ef..8d2728cc 100644 --- a/src/Authoring/Studio/Render/PathWidget.cpp +++ b/src/Authoring/Studio/Render/PathWidget.cpp @@ -39,7 +39,7 @@ #include "UICRenderContext.h" #include "UICRenderShaderCodeGeneratorV2.h" -using namespace uic::widgets; +using namespace qt3ds::widgets; namespace { @@ -68,7 +68,7 @@ struct SPointEntry struct SPathWidget : public IPathWidget { - typedef nvvector<eastl::pair<QT3DSU32, uic::studio::SPathPick::EAnchorProperty>> + typedef nvvector<eastl::pair<QT3DSU32, qt3ds::studio::SPathPick::EAnchorProperty>> TReverseAnchorBuffer; NVAllocatorCallback &m_Allocator; @@ -326,7 +326,7 @@ struct SPathWidget : public IPathWidget } void PushPoint(const SPointEntry &inEntry, QT3DSU32 inAnchorIndex, - uic::studio::SPathPick::EAnchorProperty inProperty) + qt3ds::studio::SPathPick::EAnchorProperty inProperty) { QT3DSU32 anchorIndex = (QT3DSU32)m_PointBuffer.size(); m_PointBuffer.push_back(inEntry); @@ -350,30 +350,30 @@ struct SPathWidget : public IPathWidget for (SPathSubPath *theSubPath = thePath.m_FirstSubPath; theSubPath; theSubPath = theSubPath->m_NextSubPath) { - NVDataRef<uic::render::SPathAnchorPoint> thePathBuffer( + NVDataRef<qt3ds::render::SPathAnchorPoint> thePathBuffer( theManager.GetPathSubPathBuffer(*theSubPath)); if (thePathBuffer.size() == 0) return; QT3DSU32 numAnchors = thePathBuffer.size(); for (QT3DSU32 idx = 0, end = numAnchors; idx < end; ++idx) { - const uic::render::SPathAnchorPoint &theAnchorPoint(thePathBuffer[idx]); + const qt3ds::render::SPathAnchorPoint &theAnchorPoint(thePathBuffer[idx]); if (idx > 0) { - QT3DSVec2 incoming(uic::render::IPathManagerCore::GetControlPointFromAngleDistance( + QT3DSVec2 incoming(qt3ds::render::IPathManagerCore::GetControlPointFromAngleDistance( theAnchorPoint.m_Position, theAnchorPoint.m_IncomingAngle, theAnchorPoint.m_IncomingDistance)); PushPoint(SPointEntry(incoming, controlColor, m_PointBuffer.size()), - anchorIndex, uic::studio::SPathPick::IncomingControl); + anchorIndex, qt3ds::studio::SPathPick::IncomingControl); m_LineBuffer.push_back(eastl::make_pair(theAnchorPoint.m_Position, incoming)); } PushPoint(SPointEntry(theAnchorPoint.m_Position, anchorColor, m_PointBuffer.size()), - anchorIndex, uic::studio::SPathPick::Anchor); + anchorIndex, qt3ds::studio::SPathPick::Anchor); if (idx < (numAnchors - 1)) { - QT3DSVec2 outgoing(uic::render::IPathManagerCore::GetControlPointFromAngleDistance( + QT3DSVec2 outgoing(qt3ds::render::IPathManagerCore::GetControlPointFromAngleDistance( theAnchorPoint.m_Position, theAnchorPoint.m_OutgoingAngle, theAnchorPoint.m_OutgoingDistance)); PushPoint(SPointEntry(outgoing, controlColor, m_PointBuffer.size()), - anchorIndex, uic::studio::SPathPick::OutgoingControl); + anchorIndex, qt3ds::studio::SPathPick::OutgoingControl); m_LineBuffer.push_back(eastl::make_pair(theAnchorPoint.m_Position, outgoing)); } ++anchorIndex; @@ -381,7 +381,7 @@ struct SPathWidget : public IPathWidget } m_RenderSetup = SWidgetRenderSetupResult(inWidgetContext, *m_Node, - uic::render::RenderWidgetModes::Local); + qt3ds::render::RenderWidgetModes::Local); m_PointMVP = m_RenderSetup.m_WidgetInfo.m_LayerProjection * m_RenderSetup.m_WidgetInfo.m_CameraGlobalInverse * m_Node->m_GlobalTransform; @@ -477,7 +477,7 @@ struct SPathWidget : public IPathWidget } void RenderPick(const QT3DSMat44 &inProjPreMult, NVRenderContext &inRenderContext, - uic::render::SWindowDimensions inWinDimensions) override + qt3ds::render::SWindowDimensions inWinDimensions) override { if (m_PointAssembler == nullptr || m_PointPickShader == nullptr) return; @@ -491,16 +491,16 @@ struct SPathWidget : public IPathWidget RenderPointBuffer(*m_PointPickShader, theMVP, inRenderContext); } - uic::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) override + qt3ds::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) override { inPickIndex -= 1; if (inPickIndex < m_AnchorIndexBuffer.size()) - return uic::studio::SPathPick(m_AnchorIndexBuffer[inPickIndex].first, + return qt3ds::studio::SPathPick(m_AnchorIndexBuffer[inPickIndex].first, m_AnchorIndexBuffer[inPickIndex].second); else { QT3DS_ASSERT(false); - return uic::studio::SPathPick(); + return qt3ds::studio::SPathPick(); } } }; diff --git a/src/Authoring/Studio/Render/PathWidget.h b/src/Authoring/Studio/Render/PathWidget.h index cde1a84a..44942e51 100644 --- a/src/Authoring/Studio/Render/PathWidget.h +++ b/src/Authoring/Studio/Render/PathWidget.h @@ -33,13 +33,13 @@ #include "UICDMHandles.h" #include "StudioPickValues.h" -namespace uic { +namespace qt3ds { namespace widgets { class IPathWidget : public IStudioWidgetBase { public: - uic::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) override = 0; + qt3ds::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) override = 0; static IPathWidget &CreatePathWidget(NVAllocatorCallback &inAlloc, IUICRenderContext &inRenderContext); }; diff --git a/src/Authoring/Studio/Render/StudioPickValues.h b/src/Authoring/Studio/Render/StudioPickValues.h index cc811073..a86d070f 100644 --- a/src/Authoring/Studio/Render/StudioPickValues.h +++ b/src/Authoring/Studio/Render/StudioPickValues.h @@ -34,7 +34,7 @@ #include "UICDMHandles.h" #include "StaticMaxSize.h" -namespace uic { +namespace qt3ds { namespace studio { using UICDM::CUICDMInstanceHandle; using UICDM::CUICDMGuideHandle; diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp index 960cc1b6..a87918f1 100644 --- a/src/Authoring/Studio/Render/StudioRenderer.cpp +++ b/src/Authoring/Studio/Render/StudioRenderer.cpp @@ -38,7 +38,7 @@ #ifdef _WIN32 #pragma warning(disable : 4201) // nonstandard extension used : nameless struct/union #endif -using namespace uic::studio; +using namespace qt3ds::studio; namespace { @@ -173,14 +173,14 @@ struct SRendererImpl : public IStudioRenderer, m_RenderContext = std::make_shared<CWGLRenderContext>(inWindow); Q3DStudio::CString theResourcePath = Q3DStudio::CString::fromQString(resourcePath()); - NVScopedRefCounted<uic::render::IUICRenderContextCore> theCore = - uic::render::IUICRenderContextCore::Create( + NVScopedRefCounted<qt3ds::render::IUICRenderContextCore> theCore = + qt3ds::render::IUICRenderContextCore::Create( m_RenderContext->GetRenderContext().GetFoundation(), m_RenderContext->GetRenderContext().GetStringTable()); // Create text renderer - uic::render::ITextRendererCore &theTextRenderer( - uic::render::ITextRendererCore::CreateQtTextRenderer( + qt3ds::render::ITextRendererCore &theTextRenderer( + qt3ds::render::ITextRendererCore::CreateQtTextRenderer( m_RenderContext->GetRenderContext().GetFoundation(), m_RenderContext->GetRenderContext().GetStringTable())); theCore->SetTextRendererCore(theTextRenderer); diff --git a/src/Authoring/Studio/Render/StudioRendererImpl.h b/src/Authoring/Studio/Render/StudioRendererImpl.h index 86ce4f0b..1dcaa640 100644 --- a/src/Authoring/Studio/Render/StudioRendererImpl.h +++ b/src/Authoring/Studio/Render/StudioRendererImpl.h @@ -72,7 +72,7 @@ #include "UICRenderPath.h" #include "UICRenderPathSubPath.h" -namespace uic { +namespace qt3ds { namespace studio { using Q3DStudio::IDocumentReader; using Q3DStudio::CUpdateableDocumentEditor; @@ -97,31 +97,31 @@ namespace studio { using qt3ds::foundation::rotationArc; using qt3ds::foundation::Option; using qt3ds::foundation::Empty; - using uic::render::IUICRenderContext; - using uic::render::SScene; - using uic::render::SLayer; - using uic::render::SNode; - using uic::render::SGraphObject; - using uic::render::SLight; - using uic::render::SCamera; - using uic::render::SDefaultMaterial; - using uic::render::SImage; - using uic::render::SModel; - using uic::render::SText; - using uic::render::GraphObjectTypes; - using uic::render::SRay; - using uic::render::ITextRenderer; - using uic::render::SEffect; - using uic::render::IEffectSystem; - using uic::render::SDynamicObject; - using uic::render::SCustomMaterial; - using uic::render::IDynamicObjectSystem; - using uic::render::ICustomMaterialSystem; - using uic::render::IBufferManager; - using uic::render::IPathManager; - using uic::render::SPath; - using uic::render::SPathSubPath; - using uic::render::SReferencedMaterial; + using qt3ds::render::IUICRenderContext; + using qt3ds::render::SScene; + using qt3ds::render::SLayer; + using qt3ds::render::SNode; + using qt3ds::render::SGraphObject; + using qt3ds::render::SLight; + using qt3ds::render::SCamera; + using qt3ds::render::SDefaultMaterial; + using qt3ds::render::SImage; + using qt3ds::render::SModel; + using qt3ds::render::SText; + using qt3ds::render::GraphObjectTypes; + using qt3ds::render::SRay; + using qt3ds::render::ITextRenderer; + using qt3ds::render::SEffect; + using qt3ds::render::IEffectSystem; + using qt3ds::render::SDynamicObject; + using qt3ds::render::SCustomMaterial; + using qt3ds::render::IDynamicObjectSystem; + using qt3ds::render::ICustomMaterialSystem; + using qt3ds::render::IBufferManager; + using qt3ds::render::IPathManager; + using qt3ds::render::SPath; + using qt3ds::render::SPathSubPath; + using qt3ds::render::SReferencedMaterial; using qt3ds::render::CRegisteredString; using qt3ds::render::IStringTable; using UICDM::SFloat3; diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp index 6f19eb3f..b2bf34fd 100644 --- a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp +++ b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp @@ -62,12 +62,12 @@ #pragma warning(disable : 4100) // unreferenced formal parameter -using namespace uic::studio; -QT3DSU32 uic::studio::g_GraphObjectTranslatorTag; -using uic::render::SPGGraphObject; -using uic::render::SPGRect; -using uic::render::SPGVertLine; -using uic::render::SPGHorzLine; +using namespace qt3ds::studio; +QT3DSU32 qt3ds::studio::g_GraphObjectTranslatorTag; +using qt3ds::render::SPGGraphObject; +using qt3ds::render::SPGRect; +using qt3ds::render::SPGVertLine; +using qt3ds::render::SPGHorzLine; using qt3ds::render::NVRenderRectF; using qt3ds::render::NVRenderRect; @@ -154,12 +154,12 @@ struct STranslatorUICDMParser { qt3ds::render::CRegisteredString temp; if (ParseProperty(inProperty, temp)) { - outValue = uic::render::MapRotationOrder(temp); + outValue = qt3ds::render::MapRotationOrder(temp); return true; } return false; } - bool ParseOrientation(CUICDMPropertyHandle inProperty, uic::render::NodeFlags &outValue) + bool ParseOrientation(CUICDMPropertyHandle inProperty, qt3ds::render::NodeFlags &outValue) { qt3ds::render::CRegisteredString temp; if (ParseProperty(inProperty, temp)) { @@ -229,8 +229,8 @@ struct STranslatorUICDMParser { qt3ds::render::CRegisteredString temp; if (ParseProperty(inProperty, temp)) { - uic::render::SEnumNameMap *theNameMap(uic::render::SEnumParseMap<TEnumType>::GetMap()); - for (uic::render::SEnumNameMap *theIter = theNameMap; + qt3ds::render::SEnumNameMap *theNameMap(qt3ds::render::SEnumParseMap<TEnumType>::GetMap()); + for (qt3ds::render::SEnumNameMap *theIter = theNameMap; theIter->m_Name && *theIter->m_Name; ++theIter) { // hack to match advanced overlay types, whose name start with a '*' const char8_t *p = temp; @@ -246,8 +246,8 @@ struct STranslatorUICDMParser } bool ParseNodeFlagsProperty(UICDM::CUICDMPropertyHandle inProperty, - uic::render::NodeFlags &outValue, - uic::render::NodeFlagValues::Enum theFlag) + qt3ds::render::NodeFlags &outValue, + qt3ds::render::NodeFlagValues::Enum theFlag) { bool temp = false; if (ParseProperty(inProperty, temp)) { @@ -257,8 +257,8 @@ struct STranslatorUICDMParser return false; } bool ParseNodeFlagsInverseProperty(UICDM::CUICDMPropertyHandle inProperty, - uic::render::NodeFlags &outValue, - uic::render::NodeFlagValues::Enum theFlag) + qt3ds::render::NodeFlags &outValue, + qt3ds::render::NodeFlagValues::Enum theFlag) { bool temp = false; if (ParseProperty(inProperty, temp)) { @@ -267,7 +267,7 @@ struct STranslatorUICDMParser } return false; } - bool ParseProperty(CUICDMPropertyHandle inProperty, uic::render::SImage *&ioImage) + bool ParseProperty(CUICDMPropertyHandle inProperty, qt3ds::render::SImage *&ioImage) { Option<SLong4> theData = GetPropertyValue<SLong4>(inProperty); if (theData.hasValue()) { @@ -276,7 +276,7 @@ struct STranslatorUICDMParser SGraphObjectTranslator *imageTranslator = m_Context.GetOrCreateTranslator(theInstance); if (imageTranslator && imageTranslator->GetGraphObject().m_Type - == uic::render::GraphObjectTypes::Image) { + == qt3ds::render::GraphObjectTypes::Image) { SImage *theNewImage = static_cast<SImage *>(&imageTranslator->GetGraphObject()); ioImage = theNewImage; } else @@ -286,7 +286,7 @@ struct STranslatorUICDMParser return false; } - bool ParseProperty(CUICDMPropertyHandle inProperty, uic::render::SGraphObject *&ioObjRef) + bool ParseProperty(CUICDMPropertyHandle inProperty, qt3ds::render::SGraphObject *&ioObjRef) { Option<SObjectRefType> theData = GetPropertyValue<SObjectRefType>(inProperty); if (theData.hasValue()) { @@ -300,7 +300,7 @@ struct STranslatorUICDMParser return true; } - bool ParseProperty(CUICDMPropertyHandle inProperty, uic::render::SNode *&ioNodePtr) + bool ParseProperty(CUICDMPropertyHandle inProperty, qt3ds::render::SNode *&ioNodePtr) { Option<SObjectRefType> theData = GetPropertyValue<SObjectRefType>(inProperty); SNode *theNewNodePtr = nullptr; @@ -497,10 +497,10 @@ struct STranslatorUICDMParser theItem.m_##name = !theItem.m_##name; #define HANDLE_UIC_NODE_FLAGS_PROPERTY(type, name, dirty) \ theParser.ParseNodeFlagsProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_Flags, \ - uic::render::NodeFlagValues::name); + qt3ds::render::NodeFlagValues::name); #define HANDLE_UIC_NODE_FLAGS_INVERSE_PROPERTY(type, name, dirty) \ theParser.ParseNodeFlagsInverseProperty(inContext.m_ObjectDefinitions.type##_##name, \ - theItem.m_Flags, uic::render::NodeFlagValues::name); + theItem.m_Flags, qt3ds::render::NodeFlagValues::name); #define HANDLE_UIC_RENDER_ENUM_PROPERTY(type, name, dirty) \ theParser.ParseEnumProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name); #define HANDLE_UIC_RENDER_SOURCEPATH_PROPERTY(type, name, dirty) \ @@ -539,7 +539,7 @@ struct SSceneTranslator : public SGraphObjectTranslator inContext.m_AssetGraph.GetChild(GetInstanceHandle(), idx); SGraphObjectTranslator *theTranslator = inContext.GetOrCreateTranslator(theLayer); if (theTranslator - && theTranslator->GetGraphObject().m_Type == uic::render::GraphObjectTypes::Layer) { + && theTranslator->GetGraphObject().m_Type == qt3ds::render::GraphObjectTypes::Layer) { SLayer *theLayerObj = static_cast<SLayer *>(&theTranslator->GetGraphObject()); theLayerObj->m_NextSibling = nullptr; if (theItem.m_FirstChild == nullptr) @@ -597,9 +597,9 @@ struct SNodeTranslator : public SGraphObjectTranslator // Ensure the global transform is valid because we use this before we render sometimes. theNode.m_GlobalTransform = QT3DSMat44::createIdentity(); } - static inline bool IsNodeType(uic::render::GraphObjectTypes::Enum inType) + static inline bool IsNodeType(qt3ds::render::GraphObjectTypes::Enum inType) { - return uic::render::GraphObjectTypes::IsNodeType(inType); + return qt3ds::render::GraphObjectTypes::IsNodeType(inType); } void PushTranslation(STranslation &inContext) override { @@ -624,8 +624,8 @@ struct SNodeTranslator : public SGraphObjectTranslator SNode &theItem = static_cast<SNode &>(GetGraphObject()); SNode &theChild = static_cast<SNode &>(inChild); theItem.AddChild(theChild); - theItem.MarkDirty(uic::render::NodeTransformDirtyFlag::TransformIsDirty); - theChild.MarkDirty(uic::render::NodeTransformDirtyFlag::TransformIsDirty); + theItem.MarkDirty(qt3ds::render::NodeTransformDirtyFlag::TransformIsDirty); + theChild.MarkDirty(qt3ds::render::NodeTransformDirtyFlag::TransformIsDirty); } void ClearChildren() override { @@ -645,7 +645,7 @@ struct SNodeTranslator : public SGraphObjectTranslator SNode &theNode = static_cast<SNode &>(GetGraphObject()); if (inActive != theNode.m_Flags.IsActive()) { theNode.m_Flags.SetActive(inActive); - theNode.MarkDirty(uic::render::NodeTransformDirtyFlag::TransformIsDirty); + theNode.MarkDirty(qt3ds::render::NodeTransformDirtyFlag::TransformIsDirty); } } }; @@ -674,7 +674,7 @@ struct SLayerTranslator : public SNodeTranslator theItem.AddEffect(static_cast<SEffect &>(inChild)); } else if (inChild.m_Type == GraphObjectTypes::RenderPlugin) { SLayer &theItem = static_cast<SLayer &>(GetGraphObject()); - theItem.m_RenderPlugin = &static_cast<uic::render::SRenderPlugin &>(inChild); + theItem.m_RenderPlugin = &static_cast<qt3ds::render::SRenderPlugin &>(inChild); } } void ClearChildren() override @@ -774,9 +774,9 @@ struct SModelTranslator : public SNodeTranslator SGraphObject *theLastMaterial = nullptr; for (SGraphObject *theMaterial = theItem.m_FirstMaterial; theMaterial; - theMaterial = uic::render::GetNextMaterialSibling(theMaterial)) { + theMaterial = qt3ds::render::GetNextMaterialSibling(theMaterial)) { if (theLastMaterial) - uic::render::SetNextMaterialSibling(*theLastMaterial, nullptr); + qt3ds::render::SetNextMaterialSibling(*theLastMaterial, nullptr); theLastMaterial = theMaterial; } theItem.m_FirstMaterial = nullptr; @@ -799,7 +799,7 @@ static float ToFloat(const Option<SValue> &inValue) struct SPathSubPathTranslator : public SGraphObjectTranslator { - eastl::vector<uic::render::SPathAnchorPoint> m_PathBuffer; + eastl::vector<qt3ds::render::SPathAnchorPoint> m_PathBuffer; SPathSubPathTranslator(UICDM::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc) : SGraphObjectTranslator(inInstance, *QT3DS_NEW(inAlloc, SPathSubPath)()) { @@ -838,7 +838,7 @@ struct SPathSubPathTranslator : public SGraphObjectTranslator float theOutgoingDistance = ToFloat(theReader.GetInstancePropertyValue( theAnchor, inContext.m_ObjectDefinitions.m_PathAnchorPoint.m_OutgoingDistance.m_Property)); - uic::render::SPathAnchorPoint thePoint(QT3DSVec2(theAnchorPos[0], theAnchorPos[1]), + qt3ds::render::SPathAnchorPoint thePoint(QT3DSVec2(theAnchorPos[0], theAnchorPos[1]), theIncomingAngle, theIncomingAngle + 180.0f, theIncomingDistance, theOutgoingDistance); m_PathBuffer.push_back(thePoint); @@ -947,7 +947,7 @@ struct SImageTranslator : public SGraphObjectTranslator { SImage &theItem = static_cast<SImage &>(GetGraphObject()); if (child.m_Type == GraphObjectTypes::RenderPlugin) - theItem.m_RenderPlugin = &static_cast<uic::render::SRenderPlugin &>(child); + theItem.m_RenderPlugin = &static_cast<qt3ds::render::SRenderPlugin &>(child); } void ClearChildren() override { @@ -1000,7 +1000,7 @@ struct SDynamicObjectTranslator : public SGraphObjectTranslator { SDynamicObject &theItem = static_cast<SDynamicObject &>(GetGraphObject()); IDynamicObjectSystem &theSystem = inContext.m_UICContext.GetDynamicObjectSystem(); - using namespace uic::render::dynamic; + using namespace qt3ds::render::dynamic; using qt3ds::foundation::NVConstDataRef; NVConstDataRef<SPropertyDefinition> theProperties = theSystem.GetProperties(theItem.m_ClassName); @@ -1209,10 +1209,10 @@ struct SReferencedMaterialTranslator : public SGraphObjectTranslator void SetActive(bool /*inActive*/) override {} }; -using uic::render::SRenderPlugin; -using uic::render::SRenderPropertyValueUpdate; -using uic::render::IRenderPluginClass; -using uic::render::SRenderPluginPropertyDeclaration; +using qt3ds::render::SRenderPlugin; +using qt3ds::render::SRenderPropertyValueUpdate; +using qt3ds::render::IRenderPluginClass; +using qt3ds::render::SRenderPluginPropertyDeclaration; struct SRenderPluginPropertyUpdateFactory { static void Add(eastl::vector<SRenderPropertyValueUpdate> &ioUpdates, float value, @@ -1293,7 +1293,7 @@ struct SRenderPluginTranslator : public SGraphObjectTranslator Q3DStudio::CFilePath theFullPath = inContext.m_Doc.GetResolvedPathToDoc(theData->GetData()); qt3ds::foundation::IStringTable &theStrTable = inContext.m_UICContext.GetStringTable(); theItem.m_PluginPath = theStrTable.RegisterStr(theFullPath); - uic::render::IRenderPluginInstance *theInstance = + qt3ds::render::IRenderPluginInstance *theInstance = inContext.m_UICContext.GetRenderPluginManager().GetOrCreateRenderPluginInstance( theItem.m_PluginPath, &theItem); @@ -1313,8 +1313,8 @@ struct SRenderPluginTranslator : public SGraphObjectTranslator eastl::string propStem; eastl::string propname; m_PropertyUpdates.clear(); - uic::render::IRenderPluginClass &theClass = theInstance->GetPluginClass(); - using uic::render::SRenderPluginPropertyDeclaration; + qt3ds::render::IRenderPluginClass &theClass = theInstance->GetPluginClass(); + using qt3ds::render::SRenderPluginPropertyDeclaration; if (theClass.GetRegisteredProperties().size() == 0) { for (size_t idx = 0, end = theSpecificProperties.size(); idx < end; ++idx) { SUICDMPropertyDefinition theProperty = @@ -1326,33 +1326,33 @@ struct SRenderPluginTranslator : public SGraphObjectTranslator switch (theProperty.m_Type) { case DataModelDataType::Float: theClass.RegisterProperty(SRenderPluginPropertyDeclaration( - thePropName, uic::render::SRenderPluginPropertyTypes::Float)); + thePropName, qt3ds::render::SRenderPluginPropertyTypes::Float)); break; case DataModelDataType::Float2: theClass.RegisterProperty(SRenderPluginPropertyDeclaration( - thePropName, uic::render::SRenderPluginPropertyTypes::Vector2)); + thePropName, qt3ds::render::SRenderPluginPropertyTypes::Vector2)); break; case DataModelDataType::Float3: if (theMetaType != AdditionalMetaDataType::Color) { theClass.RegisterProperty(SRenderPluginPropertyDeclaration( - thePropName, uic::render::SRenderPluginPropertyTypes::Vector3)); + thePropName, qt3ds::render::SRenderPluginPropertyTypes::Vector3)); } else { theClass.RegisterProperty(SRenderPluginPropertyDeclaration( - thePropName, uic::render::SRenderPluginPropertyTypes::Color)); + thePropName, qt3ds::render::SRenderPluginPropertyTypes::Color)); } break; case DataModelDataType::Long: theClass.RegisterProperty(SRenderPluginPropertyDeclaration( - thePropName, uic::render::SRenderPluginPropertyTypes::Long)); + thePropName, qt3ds::render::SRenderPluginPropertyTypes::Long)); break; case DataModelDataType::String: case DataModelDataType::StringRef: theClass.RegisterProperty(SRenderPluginPropertyDeclaration( - thePropName, uic::render::SRenderPluginPropertyTypes::String)); + thePropName, qt3ds::render::SRenderPluginPropertyTypes::String)); break; case DataModelDataType::Bool: theClass.RegisterProperty(SRenderPluginPropertyDeclaration( - thePropName, uic::render::SRenderPluginPropertyTypes::Boolean)); + thePropName, qt3ds::render::SRenderPluginPropertyTypes::Boolean)); break; default: // Unsupported plugin property. @@ -1636,7 +1636,7 @@ SGraphObjectTranslator *STranslation::CreateTranslator(UICDM::CUICDMInstanceHand theMetaData.GetEffectBySourcePath( m_UICContext.GetStringTable().GetNarrowStr(theInstancePath)); if (theMetaEffect.hasValue()) { - uic::render::IUIPLoader::CreateEffectClassFromMetaEffect( + qt3ds::render::IUIPLoader::CreateEffectClassFromMetaEffect( theNameStr, m_UICContext.GetFoundation(), theSystem, theMetaEffect, m_UICContext.GetStringTable()); theSystem.SetEffectRequiresCompilation(theNameStr, true); @@ -1664,7 +1664,7 @@ SGraphObjectTranslator *STranslation::CreateTranslator(UICDM::CUICDMInstanceHand theMetaData.GetMaterialBySourcePath( m_UICContext.GetStringTable().GetNarrowStr(theInstancePath)); if (theMaterialData.hasValue()) { - uic::render::IUIPLoader::CreateMaterialClassFromMetaMaterial( + qt3ds::render::IUIPLoader::CreateMaterialClassFromMetaMaterial( theNameStr, m_UICContext.GetFoundation(), theSystem, theMaterialData, m_UICContext.GetStringTable()); } @@ -1780,7 +1780,7 @@ UICDM::CUICDMInstanceHandle STranslation::GetAnchorPoint(SPathPick &inPick) return GetAnchorPoint(inPick.m_AnchorIndex); } -namespace uic { +namespace qt3ds { namespace studio { struct SEditCameraLayerTranslator : public SLayerTranslator { @@ -2025,13 +2025,13 @@ void STranslation::PreRender() TIdentifier theRoot = m_AssetGraph.GetRoot(0); ClearDirtySet(); BuildRenderGraph(theRoot); - m_UICContext.SetScaleMode(uic::render::ScaleModes::ExactSize); + m_UICContext.SetScaleMode(qt3ds::render::ScaleModes::ExactSize); m_UICContext.SetMatteColor(QT3DSVec4(.13f, .13f, .13f, 1.0f)); QT3DSVec2 theViewportDims(GetViewportDimensions()); // Ensure the camera points where it should if (m_EditCameraEnabled) { m_EditCameraInfo.ApplyToCamera(m_EditCamera, GetViewportDimensions()); - m_EditLight.MarkDirty(uic::render::NodeTransformDirtyFlag::TransformIsDirty); + m_EditLight.MarkDirty(qt3ds::render::NodeTransformDirtyFlag::TransformIsDirty); } if (m_Scene) { @@ -2044,9 +2044,9 @@ void STranslation::PreRender() QT3DSVec2((QT3DSF32)thePresSize.x, (QT3DSF32)thePresSize.y); QT3DSVec2 theViewportDims(GetViewportDimensions()); m_UICContext.SetWindowDimensions( - uic::render::SWindowDimensions((QT3DSU32)theViewportDims.x, (QT3DSU32)theViewportDims.y)); + qt3ds::render::SWindowDimensions((QT3DSU32)theViewportDims.x, (QT3DSU32)theViewportDims.y)); m_UICContext.SetPresentationDimensions( - uic::render::SWindowDimensions((QT3DSU32)m_Presentation.m_PresentationDimensions.x, + qt3ds::render::SWindowDimensions((QT3DSU32)m_Presentation.m_PresentationDimensions.x, (QT3DSU32)m_Presentation.m_PresentationDimensions.y)); // set if we draw geometry in wireframe mode @@ -2055,7 +2055,7 @@ void STranslation::PreRender() if (m_EditCameraEnabled) { m_Presentation.m_PresentationDimensions = theViewportDims; m_UICContext.SetPresentationDimensions( - uic::render::SWindowDimensions((QT3DSU32)theViewportDims.x, (QT3DSU32)theViewportDims.y)); + qt3ds::render::SWindowDimensions((QT3DSU32)theViewportDims.x, (QT3DSU32)theViewportDims.y)); ::CColor theEditCameraBackground = CStudioPreferences::GetEditViewBackgroundColor(); m_UICContext.SetSceneColor(QT3DSVec4(theEditCameraBackground.GetRed() / 255.0f, theEditCameraBackground.GetGreen() / 255.0f, @@ -2076,7 +2076,7 @@ void STranslation::PreRender() if (m_EditCameraEnabled == false && g_StudioApp.IsAuthorZoom()) { if (m_Presentation.m_PresentationDimensions.x > theViewportDims.x || m_Presentation.m_PresentationDimensions.y > theViewportDims.y) { - m_UICContext.SetScaleMode(uic::render::ScaleModes::FitSelected); + m_UICContext.SetScaleMode(qt3ds::render::ScaleModes::FitSelected); } } } @@ -2349,7 +2349,7 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides) if (theType == GraphObjectTypes::Path && selectedPath == false) { selectedPath = true; if (!m_PathWidget) - m_PathWidget = uic::widgets::IPathWidget::CreatePathWidget( + m_PathWidget = qt3ds::widgets::IPathWidget::CreatePathWidget( m_UICContext.GetAllocator(), m_UICContext); m_PathWidget->SetNode( static_cast<SNode &>(theTranslator->GetGraphObject())); @@ -2362,12 +2362,12 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides) if (theHandles.size() > 1) theTranslator = nullptr; - uic::widgets::IStudioWidget *theNextWidget(nullptr); + qt3ds::widgets::IStudioWidget *theNextWidget(nullptr); if (theTranslator && GraphObjectTypes::IsNodeType(theTranslator->GetGraphObject().m_Type) && theTranslator->GetGraphObject().m_Type != GraphObjectTypes::Layer) { - uic::render::SNode &theNode( - static_cast<uic::render::SNode &>(theTranslator->GetGraphObject())); + qt3ds::render::SNode &theNode( + static_cast<qt3ds::render::SNode &>(theTranslator->GetGraphObject())); SCamera *theRenderCamera = m_UICContext.GetRenderer().GetCameraForNode(theNode); bool isActiveCamera = theRenderCamera == (static_cast<SCamera *>(&theNode)); if (shouldDisplayWidget && isActiveCamera == false) { @@ -2378,20 +2378,20 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides) case STUDIO_TOOLMODE_MOVE: // Render translation widget if (!m_TranslationWidget) - m_TranslationWidget = uic::widgets::IStudioWidget::CreateTranslationWidget( + m_TranslationWidget = qt3ds::widgets::IStudioWidget::CreateTranslationWidget( m_UICContext.GetAllocator()); theNextWidget = m_TranslationWidget.mPtr; break; case STUDIO_TOOLMODE_ROTATE: if (!m_RotationWidget) - m_RotationWidget = uic::widgets::IStudioWidget::CreateRotationWidget( + m_RotationWidget = qt3ds::widgets::IStudioWidget::CreateRotationWidget( m_UICContext.GetAllocator()); theNextWidget = m_RotationWidget.mPtr; break; case STUDIO_TOOLMODE_SCALE: if (!m_ScaleWidget) - m_ScaleWidget = uic::widgets::IStudioWidget::CreateScaleWidget( + m_ScaleWidget = qt3ds::widgets::IStudioWidget::CreateScaleWidget( m_UICContext.GetAllocator()); theNextWidget = m_ScaleWidget.mPtr; break; @@ -2410,10 +2410,10 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides) m_LastRenderedWidget->SetSubComponentId(inWidgetId); switch (g_StudioApp.GetMinpulationMode()) { case StudioManipulationModes::Local: - m_LastRenderedWidget->SetRenderWidgetMode(uic::render::RenderWidgetModes::Local); + m_LastRenderedWidget->SetRenderWidgetMode(qt3ds::render::RenderWidgetModes::Local); break; case StudioManipulationModes::Global: - m_LastRenderedWidget->SetRenderWidgetMode(uic::render::RenderWidgetModes::Global); + m_LastRenderedWidget->SetRenderWidgetMode(qt3ds::render::RenderWidgetModes::Global); break; default: QT3DS_ASSERT(false); @@ -2516,8 +2516,8 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides) qt3ds::render::STextureDetails thePickDetails = m_PickBuffer->GetTextureDetails(); theRenderContext.SetViewport( qt3ds::render::NVRenderRect( 0, 0, thePickDetails.m_Width, thePickDetails.m_Height ) ); - uic::render::SCamera theCamera; - theCamera.MarkDirty( uic::render::NodeTransformDirtyFlag::TransformIsDirty ); + qt3ds::render::SCamera theCamera; + theCamera.MarkDirty( qt3ds::render::NodeTransformDirtyFlag::TransformIsDirty ); theCamera.m_Flags.SetOrthographic( true ); QT3DSVec2 theDimensions( (QT3DSF32)thePickDetails.m_Width, (QT3DSF32)thePickDetails.m_Height ); theCamera.CalculateGlobalVariables( render::NVRenderRectF( 0, 0, theDimensions.x, @@ -2583,7 +2583,7 @@ bool STranslation::IsPathWidgetActive() return false; } -inline uic::render::SLayer *GetLayerForNode(const uic::render::SNode &inNode) +inline qt3ds::render::SLayer *GetLayerForNode(const qt3ds::render::SNode &inNode) { SNode *theNode; // empty loop intentional @@ -2600,10 +2600,10 @@ void STranslation::RenderZoomRender(SZoomRender &inRender) SLayer *theLayer(inRender.m_Layer); CPt thePoint(inRender.m_Point); if (theLayer) { - uic::render::IUICRenderer &theRenderer(m_UICContext.GetRenderer()); - Option<uic::render::SLayerPickSetup> thePickSetup( + qt3ds::render::IUICRenderer &theRenderer(m_UICContext.GetRenderer()); + Option<qt3ds::render::SLayerPickSetup> thePickSetup( theRenderer.GetLayerPickSetup(*theLayer, QT3DSVec2((QT3DSF32)thePoint.x, (QT3DSF32)thePoint.y), - uic::render::SWindowDimensions(16, 16))); + qt3ds::render::SWindowDimensions(16, 16))); if (thePickSetup.hasValue()) { qt3ds::render::NVRenderContext &theRenderContext(m_UICContext.GetRenderContext()); theRenderContext.SetViewport(qt3ds::render::NVRenderRect(0, 0, 100, 100)); @@ -2623,7 +2623,7 @@ void STranslation::DrawBoundingBox(SNode &inNode, QT3DSVec3 inColor) { qt3ds::NVBounds3 theBounds = inNode.GetBounds(m_UICContext.GetBufferManager(), m_UICContext.GetPathManager(), true, this); - uic::render::IRenderWidget &theBBoxWidget = uic::render::IRenderWidget::CreateBoundingBoxWidget( + qt3ds::render::IRenderWidget &theBBoxWidget = qt3ds::render::IRenderWidget::CreateBoundingBoxWidget( inNode, theBounds, inColor, m_UICContext.GetRenderer().GetPerFrameAllocator()); m_UICContext.GetRenderer().AddRenderWidget(theBBoxWidget); } @@ -2631,14 +2631,14 @@ void STranslation::DrawBoundingBox(SNode &inNode, QT3DSVec3 inColor) void STranslation::DrawLightBoundingBox(SNode &inNode, QT3DSVec3 inColor) { SLight *theLight = reinterpret_cast<SLight *>(&inNode); - if (theLight->m_LightType != uic::render::RenderLightTypes::Area) { + if (theLight->m_LightType != qt3ds::render::RenderLightTypes::Area) { return; } qt3ds::NVBounds3 theBounds( qt3ds::QT3DSVec3(-theLight->m_AreaWidth * 0.5f, -theLight->m_AreaHeight * 0.5f, 0.0f), qt3ds::QT3DSVec3(theLight->m_AreaWidth * 0.5f, theLight->m_AreaHeight * 0.5f, 0.0f)); - uic::render::IRenderWidget &theBBoxWidget = uic::render::IRenderWidget::CreateBoundingBoxWidget( + qt3ds::render::IRenderWidget &theBBoxWidget = qt3ds::render::IRenderWidget::CreateBoundingBoxWidget( inNode, theBounds, inColor, m_UICContext.GetRenderer().GetPerFrameAllocator()); m_UICContext.GetRenderer().AddRenderWidget(theBBoxWidget); } @@ -2646,7 +2646,7 @@ void STranslation::DrawLightBoundingBox(SNode &inNode, QT3DSVec3 inColor) void STranslation::DrawAxis(SGraphObjectTranslator &inTranslator) { if (GraphObjectTypes::IsNodeType(inTranslator.GetGraphObject().m_Type)) { - uic::render::IRenderWidget &theAxisWidget = uic::render::IRenderWidget::CreateAxisWidget( + qt3ds::render::IRenderWidget &theAxisWidget = qt3ds::render::IRenderWidget::CreateAxisWidget( static_cast<SNode &>(inTranslator.GetGraphObject()), m_UICContext.GetRenderer().GetPerFrameAllocator()); m_UICContext.GetRenderer().AddRenderWidget(theAxisWidget); @@ -2656,17 +2656,17 @@ void STranslation::DrawAxis(SGraphObjectTranslator &inTranslator) } Option<QT3DSU32> STranslation::PickWidget(CPt inMouseCoords, TranslationSelectMode::Enum, - uic::widgets::IStudioWidgetBase &inWidget) + qt3ds::widgets::IStudioWidgetBase &inWidget) { SNode &theNode = inWidget.GetNode(); SGraphObjectTranslator *theWidgetTranslator = theNode.m_UserData.DynamicCast<SGraphObjectTranslator>(); SLayer *theLayer = GetLayerForNode(theNode); if (theLayer && theWidgetTranslator) { - Option<uic::render::SLayerPickSetup> thePickSetup( + Option<qt3ds::render::SLayerPickSetup> thePickSetup( m_UICContext.GetRenderer().GetLayerPickSetup( *theLayer, QT3DSVec2((QT3DSF32)inMouseCoords.x, (QT3DSF32)inMouseCoords.y), - uic::render::SWindowDimensions(4, 4))); + qt3ds::render::SWindowDimensions(4, 4))); if (thePickSetup.hasValue()) { qt3ds::render::NVRenderContext &theContext(m_UICContext.GetRenderContext()); qt3ds::render::NVRenderContextScopedProperty<qt3ds::render::NVRenderFrameBuffer *> @@ -2698,7 +2698,7 @@ Option<QT3DSU32> STranslation::PickWidget(CPt inMouseCoords, TranslationSelectMo theContext.Clear(qt3ds::render::NVRenderClearFlags( qt3ds::render::NVRenderClearValues::Color | qt3ds::render::NVRenderClearValues::Depth)); inWidget.RenderPick(thePickSetup->m_ProjectionPreMultiply, theContext, - uic::render::SWindowDimensions(4, 4)); + qt3ds::render::SWindowDimensions(4, 4)); // Now read the pixels back. m_PixelBuffer.resize(fboDims * fboDims * 3); theContext.ReadPixels(theViewport, qt3ds::render::NVRenderReadPixelFormats::RGB8, @@ -2779,7 +2779,7 @@ SStudioPickValue STranslation::Pick(CPt inMouseCoords, TranslationSelectMode::En } } if (m_Scene && m_Scene->m_FirstChild) { - uic::render::SUICRenderPickResult thePickResult = + qt3ds::render::SUICRenderPickResult thePickResult = m_UICContext.GetRenderer().Pick(*m_Scene->m_FirstChild, GetViewportDimensions(), QT3DSVec2((QT3DSF32)inMouseCoords.x, (QT3DSF32)inMouseCoords.y)); if (thePickResult.m_HitObject) { @@ -2967,7 +2967,7 @@ void STranslation::TranslateSelectedInstance(CPt inOriginalCoords, CPt inMouseCo SNode *theNode = GetSelectedNode(); if (theNode == nullptr) return; - uic::render::IUICRenderer &theRenderer(m_UICContext.GetRenderer()); + qt3ds::render::IUICRenderer &theRenderer(m_UICContext.GetRenderer()); QT3DSF32 theXDistance = QT3DSF32(inMouseCoords.x - inOriginalCoords.x); QT3DSF32 theYDistance = QT3DSF32(inMouseCoords.y - inOriginalCoords.y); @@ -3059,7 +3059,7 @@ void STranslation::ApplyRotationToSelectedInstance(const QT3DSQuat &inFinalRotat QT3DSMat33 theFinalGlobal = theRotationMatrix * m_MouseDownGlobalRotation.getValue(); QT3DSMat33 theLocalGlobal = m_MouseDownParentRotationInverse.getValue() * theFinalGlobal; QT3DSVec3 theRotations = inNode.GetRotationVectorFromRotationMatrix(theLocalGlobal); - theRotations = uic::render::SRotationHelper::ToNearestAngle(inNode.m_Rotation, theRotations, + theRotations = qt3ds::render::SRotationHelper::ToNearestAngle(inNode.m_Rotation, theRotations, inNode.m_RotationOrder); SetRotation(theRotations, inEditor); // Trackball rotation is relative to the previous mouse position. @@ -3210,26 +3210,26 @@ static inline QT3DSF32 MakeNiceRotation(QT3DSF32 inAngle) static inline QT3DSF32 ShortestAngleDifference(QT3DSF32 inCumulative, QT3DSF32 inNewTotal) { - QT3DSF32 diff = uic::render::SRotationHelper::ToMinimalAngle(inNewTotal - inCumulative); + QT3DSF32 diff = qt3ds::render::SRotationHelper::ToMinimalAngle(inNewTotal - inCumulative); return inCumulative + diff; } Option<SDragPreparationResult> -STranslation::PrepareWidgetDrag(uic::widgets::StudioWidgetComponentIds::Enum inComponentId, - uic::widgets::StudioWidgetTypes::Enum inWidgetId, - uic::render::RenderWidgetModes::Enum inWidgetMode, SNode &inNode, +STranslation::PrepareWidgetDrag(qt3ds::widgets::StudioWidgetComponentIds::Enum inComponentId, + qt3ds::widgets::StudioWidgetTypes::Enum inWidgetId, + qt3ds::render::RenderWidgetModes::Enum inWidgetMode, SNode &inNode, CPt inOriginalCoords, CPt inPreviousMouseCoords, CPt inMouseCoords) { SDragPreparationResult retval; retval.m_ComponentId = inComponentId; retval.m_WidgetType = inWidgetId; retval.m_WidgetMode = inWidgetMode; - uic::render::IUICRenderer &theRenderer(m_UICContext.GetRenderer()); + qt3ds::render::IUICRenderer &theRenderer(m_UICContext.GetRenderer()); retval.m_Renderer = &theRenderer; retval.m_Node = &inNode; retval.m_Layer = GetLayerForNode(inNode); retval.m_Camera = theRenderer.GetCameraForNode(inNode); - uic::render::SWindowDimensions theUnsignedDimensions(m_UICContext.GetWindowDimensions()); + qt3ds::render::SWindowDimensions theUnsignedDimensions(m_UICContext.GetWindowDimensions()); QT3DSVec2 theWindowDimensions((QT3DSF32)theUnsignedDimensions.m_Width, (QT3DSF32)theUnsignedDimensions.m_Height); if (retval.m_Camera == nullptr || retval.m_Layer == nullptr) @@ -3249,7 +3249,7 @@ STranslation::PrepareWidgetDrag(uic::widgets::StudioWidgetComponentIds::Enum inC *retval.m_Layer, QT3DSVec2((QT3DSF32)inPreviousMouseCoords.x, (QT3DSF32)inPreviousMouseCoords.y), theWindowDimensions, true); QT3DSMat44 theGlobalTransform(QT3DSMat44::createIdentity()); - if (inWidgetMode == uic::render::RenderWidgetModes::Local) { + if (inWidgetMode == qt3ds::render::RenderWidgetModes::Local) { theGlobalTransform = m_MouseDownNode.m_GlobalTransform; } retval.m_GlobalTransform = theGlobalTransform; @@ -3288,43 +3288,43 @@ STranslation::PrepareWidgetDrag(uic::widgets::StudioWidgetComponentIds::Enum inC default: QT3DS_ASSERT(false); break; - case uic::widgets::StudioWidgetComponentIds::XAxis: + case qt3ds::widgets::StudioWidgetComponentIds::XAxis: theAxis = QT3DSVec3(1, 0, 0); break; - case uic::widgets::StudioWidgetComponentIds::YAxis: + case qt3ds::widgets::StudioWidgetComponentIds::YAxis: theAxis = QT3DSVec3(0, 1, 0); retval.m_AxisIndex = 1; break; - case uic::widgets::StudioWidgetComponentIds::ZAxis: + case qt3ds::widgets::StudioWidgetComponentIds::ZAxis: theAxis = QT3DSVec3(0, 0, -1); retval.m_AxisIndex = 2; break; - case uic::widgets::StudioWidgetComponentIds::XPlane: + case qt3ds::widgets::StudioWidgetComponentIds::XPlane: thePlaneNormal = QT3DSVec3(1, 0, 0); isPlane = true; break; - case uic::widgets::StudioWidgetComponentIds::YPlane: + case qt3ds::widgets::StudioWidgetComponentIds::YPlane: thePlaneNormal = QT3DSVec3(0, 1, 0); isPlane = true; break; - case uic::widgets::StudioWidgetComponentIds::ZPlane: + case qt3ds::widgets::StudioWidgetComponentIds::ZPlane: thePlaneNormal = QT3DSVec3(0, 0, -1); isPlane = true; break; - case uic::widgets::StudioWidgetComponentIds::CameraPlane: { + case qt3ds::widgets::StudioWidgetComponentIds::CameraPlane: { isPlane = true; thePlaneNormal = theCamDirection; } break; } retval.m_IsPlane = isPlane; - if (inWidgetId == uic::widgets::StudioWidgetTypes::Rotation) { + if (inWidgetId == qt3ds::widgets::StudioWidgetTypes::Rotation) { if (isPlane == false) { theAxis = theNormalMat.transform(theAxis); theAxis.normalize(); thePlaneNormal = theAxis; retval.m_Plane = qt3ds::NVPlane(thePlaneNormal, -1.0f * thePlaneNormal.dot(globalPos)); } else { - if (inComponentId != uic::widgets::StudioWidgetComponentIds::CameraPlane) { + if (inComponentId != qt3ds::widgets::StudioWidgetComponentIds::CameraPlane) { thePlaneNormal = theNormalMat.transform(thePlaneNormal); } thePlaneNormal.normalize(); @@ -3374,7 +3374,7 @@ void STranslation::PerformWidgetDrag(int inWidgetSubComponent, CPt inOriginalCoo return; } Option<SDragPreparationResult> thePrepResult(PrepareWidgetDrag( - static_cast<uic::widgets::StudioWidgetComponentIds::Enum>(inWidgetSubComponent), + static_cast<qt3ds::widgets::StudioWidgetComponentIds::Enum>(inWidgetSubComponent), m_LastRenderedWidget->GetWidgetType(), m_LastRenderedWidget->GetRenderWidgetMode(), m_LastRenderedWidget->GetNode(), inOriginalCoords, inPreviousMouseCoords, inMouseCoords)); if (!thePrepResult.hasValue()) @@ -3398,7 +3398,7 @@ void STranslation::PerformWidgetDrag(int inWidgetSubComponent, CPt inOriginalCoo default: QT3DS_ASSERT(false); return; - case uic::widgets::StudioWidgetTypes::Scale: { + case qt3ds::widgets::StudioWidgetTypes::Scale: { if (theOriginalPlaneCoords.hasValue() && theCurrentPlaneCoords.hasValue()) { QT3DSVec3 objToOriginal = globalPos - *theOriginalPlaneCoords; QT3DSVec3 objToCurrent = globalPos - *theCurrentPlaneCoords; @@ -3444,7 +3444,7 @@ void STranslation::PerformWidgetDrag(int inWidgetSubComponent, CPt inOriginalCoo SetScale(theScale, inEditor); } } break; - case uic::widgets::StudioWidgetTypes::Rotation: { + case qt3ds::widgets::StudioWidgetTypes::Rotation: { QT3DSF32 theIntersectionCosine = theOriginalRay.m_Direction.dot(thePlaneNormal); QT3DSVec3 objToPrevious; QT3DSVec3 objToCurrent; @@ -3512,7 +3512,7 @@ void STranslation::PerformWidgetDrag(int inWidgetSubComponent, CPt inOriginalCoo ApplyRotationToSelectedInstance(theRotation, *theNode, inEditor, false); } } break; - case uic::widgets::StudioWidgetTypes::Translation: { + case qt3ds::widgets::StudioWidgetTypes::Translation: { if (theOriginalPlaneCoords.hasValue() && theCurrentPlaneCoords.hasValue()) { QT3DSVec3 theDiff = *theCurrentPlaneCoords - *theOriginalPlaneCoords; if (isPlane) { @@ -3594,13 +3594,13 @@ QT3DSF32 radToDeg(const QT3DSF32 a) } } -void STranslation::PerformPathDrag(uic::studio::SPathPick &inPathPick, CPt inOriginalCoords, +void STranslation::PerformPathDrag(qt3ds::studio::SPathPick &inPathPick, CPt inOriginalCoords, CPt inPreviousMouseCoords, CPt inMouseCoords, CUpdateableDocumentEditor &inEditor) { Option<SDragPreparationResult> thePrepResult(PrepareWidgetDrag( - uic::widgets::StudioWidgetComponentIds::ZPlane, - uic::widgets::StudioWidgetTypes::Translation, uic::render::RenderWidgetModes::Local, + qt3ds::widgets::StudioWidgetComponentIds::ZPlane, + qt3ds::widgets::StudioWidgetTypes::Translation, qt3ds::render::RenderWidgetModes::Local, m_PathWidget->GetNode(), inOriginalCoords, inPreviousMouseCoords, inMouseCoords)); if (!thePrepResult.hasValue()) return; @@ -3652,11 +3652,11 @@ void STranslation::PerformPathDrag(uic::studio::SPathPick &inPathPick, CPt inOri theCurrentValue = lastValue.m_Position; break; case SPathPick::IncomingControl: - theCurrentValue = uic::render::IPathManagerCore::GetControlPointFromAngleDistance( + theCurrentValue = qt3ds::render::IPathManagerCore::GetControlPointFromAngleDistance( lastValue.m_Position, lastValue.m_IncomingAngle, lastValue.m_IncomingDistance); break; case SPathPick::OutgoingControl: - theCurrentValue = uic::render::IPathManagerCore::GetControlPointFromAngleDistance( + theCurrentValue = qt3ds::render::IPathManagerCore::GetControlPointFromAngleDistance( lastValue.m_Position, lastValue.m_IncomingAngle + 180.0f, lastValue.m_OutgoingDistance); break; @@ -3675,11 +3675,11 @@ void STranslation::PerformPathDrag(uic::studio::SPathPick &inPathPick, CPt inOri break; case SPathPick::IncomingControl: { QT3DSVec2 angleDistance = - uic::render::IPathManagerCore::GetAngleDistanceFromControlPoint( + qt3ds::render::IPathManagerCore::GetAngleDistanceFromControlPoint( anchorPosVec, theCurrentValue); float angleDiff = angleDistance.x - lastValue.m_IncomingAngle; float minimalDiff = - radToDeg(uic::render::SRotationHelper::ToMinimalAngle(degToRad(angleDiff))); + radToDeg(qt3ds::render::SRotationHelper::ToMinimalAngle(degToRad(angleDiff))); float newAngle = lastValue.m_IncomingAngle + minimalDiff; theEditor.SetInstancePropertyValue(theAnchorHandle, theAngleProperty, newAngle); theEditor.SetInstancePropertyValue(theAnchorHandle, theIncomingDistanceProperty, @@ -3687,12 +3687,12 @@ void STranslation::PerformPathDrag(uic::studio::SPathPick &inPathPick, CPt inOri } break; case SPathPick::OutgoingControl: { QT3DSVec2 angleDistance = - uic::render::IPathManagerCore::GetAngleDistanceFromControlPoint( + qt3ds::render::IPathManagerCore::GetAngleDistanceFromControlPoint( anchorPosVec, theCurrentValue); angleDistance.x += 180.0f; float angleDiff = angleDistance.x - lastValue.m_IncomingAngle; float minimalDiff = - radToDeg(uic::render::SRotationHelper::ToMinimalAngle(degToRad(angleDiff))); + radToDeg(qt3ds::render::SRotationHelper::ToMinimalAngle(degToRad(angleDiff))); float newAngle = lastValue.m_IncomingAngle + minimalDiff; theEditor.SetInstancePropertyValue(theAnchorHandle, theAngleProperty, newAngle); theEditor.SetInstancePropertyValue(theAnchorHandle, theOutgoingDistanceProperty, diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.h b/src/Authoring/Studio/Render/StudioRendererTranslation.h index 7698d8ec..f9adac50 100644 --- a/src/Authoring/Studio/Render/StudioRendererTranslation.h +++ b/src/Authoring/Studio/Render/StudioRendererTranslation.h @@ -41,24 +41,24 @@ #include "PathWidget.h" #include "StudioPreferences.h" -namespace uic { +namespace qt3ds { namespace studio { struct SGraphObjectTranslator; extern QT3DSU32 g_GraphObjectTranslatorTag; inline void InitializePointerTags(IStringTable &) { g_GraphObjectTranslatorTag = 0x0088BEEF; } } } -namespace uic { +namespace qt3ds { namespace render { template <> - struct SPointerTag<uic::studio::SGraphObjectTranslator> + struct SPointerTag<qt3ds::studio::SGraphObjectTranslator> { - static QT3DSU32 GetTag() { return uic::studio::g_GraphObjectTranslatorTag; } + static QT3DSU32 GetTag() { return qt3ds::studio::g_GraphObjectTranslatorTag; } }; } } -namespace uic { +namespace qt3ds { namespace studio { typedef std::shared_ptr<UICDM::ISignalConnection> TSignalConnection; @@ -81,7 +81,7 @@ namespace studio { , m_GraphObject(&inObj) , m_DirtyIndex(QT3DS_MAX_U32) { - m_GraphObject->m_UserData = uic::render::STaggedPointer(this); + m_GraphObject->m_UserData = qt3ds::render::STaggedPointer(this); } // The destructors will not be called at this time for most of the objects // but they will be released. @@ -217,7 +217,7 @@ namespace studio { // This works because the camera has no hierarchy. inCamera.m_LocalTransform = theGlobalTransform; inCamera.m_Flags.SetTransformDirty(false); - inCamera.MarkDirty(uic::render::NodeTransformDirtyFlag::TransformNotDirty); + inCamera.MarkDirty(qt3ds::render::NodeTransformDirtyFlag::TransformNotDirty); } bool IsOrthographic() const { return m_CameraType != EditCameraTypes::Perspective; } @@ -241,8 +241,8 @@ namespace studio { struct SZoomRender { CPt m_Point; - uic::render::SLayer *m_Layer; - SZoomRender(CPt inPoint, uic::render::SLayer *inLayer) + qt3ds::render::SLayer *m_Layer; + SZoomRender(CPt inPoint, qt3ds::render::SLayer *inLayer) : m_Point(inPoint) , m_Layer(inLayer) { @@ -289,7 +289,7 @@ namespace studio { struct SDragPreparationResult { - uic::render::IUICRenderer *m_Renderer; + qt3ds::render::IUICRenderer *m_Renderer; SNode *m_Node; SLayer *m_Layer; SCamera *m_Camera; @@ -301,9 +301,9 @@ namespace studio { QT3DSMat44 m_GlobalTransform; QT3DSMat33 m_NormalMatrix; QT3DSU32 m_AxisIndex; - uic::widgets::StudioWidgetComponentIds::Enum m_ComponentId; - uic::widgets::StudioWidgetTypes::Enum m_WidgetType; - uic::render::RenderWidgetModes::Enum m_WidgetMode; + qt3ds::widgets::StudioWidgetComponentIds::Enum m_ComponentId; + qt3ds::widgets::StudioWidgetTypes::Enum m_WidgetType; + qt3ds::render::RenderWidgetModes::Enum m_WidgetMode; SRay m_OriginalRay; SRay m_CurrentRay; SRay m_PreviousRay; @@ -323,7 +323,7 @@ namespace studio { SPathAnchorDragInitialValue() {} }; - struct STranslation : public uic::render::IUICRenderNodeFilter + struct STranslation : public qt3ds::render::IUICRenderNodeFilter { typedef eastl::pair<UICDM::CUICDMInstanceHandle, SGraphObjectTranslator *> THandleTranslatorPair; @@ -347,8 +347,8 @@ namespace studio { // All translator related containers must come after the allocator TInstanceToTranslatorMap m_TranslatorMap; TTranslatorDirtySet m_DirtySet; - uic::render::SPresentation m_Presentation; - uic::render::SScene *m_Scene; + qt3ds::render::SPresentation m_Presentation; + qt3ds::render::SScene *m_Scene; Q3DStudio::CGraphIterator m_GraphIterator; nvvector<TSignalConnection> m_SignalConnections; QT3DSI32 m_ComponentSecondsDepth; @@ -366,16 +366,16 @@ namespace studio { QT3DSVec2 m_Viewport; SEditCameraLayerTranslator *m_EditCameraLayerTranslator; Option<SZoomRender> m_ZoomRender; - NVScopedRefCounted<uic::widgets::IStudioWidget> m_TranslationWidget; - NVScopedRefCounted<uic::widgets::IStudioWidget> m_RotationWidget; - NVScopedRefCounted<uic::widgets::IStudioWidget> m_ScaleWidget; - NVScopedRefCounted<uic::widgets::IStudioWidget> m_LastRenderedWidget; - NVScopedRefCounted<uic::widgets::IPathWidget> m_PathWidget; + NVScopedRefCounted<qt3ds::widgets::IStudioWidget> m_TranslationWidget; + NVScopedRefCounted<qt3ds::widgets::IStudioWidget> m_RotationWidget; + NVScopedRefCounted<qt3ds::widgets::IStudioWidget> m_ScaleWidget; + NVScopedRefCounted<qt3ds::widgets::IStudioWidget> m_LastRenderedWidget; + NVScopedRefCounted<qt3ds::widgets::IPathWidget> m_PathWidget; NVScopedRefCounted<qt3ds::render::NVRenderTexture2D> m_PickBuffer; Option<SPathAnchorDragInitialValue> m_LastPathDragValue; nvvector<qt3ds::QT3DSU8> m_PixelBuffer; QT3DSF32 m_CumulativeRotation; - eastl::vector<uic::render::SPGGraphObject *> m_GuideContainer; + eastl::vector<qt3ds::render::SPGGraphObject *> m_GuideContainer; qt3ds::foundation::SFastAllocator<> m_GuideAllocator; // The rects are maintained from last render because the render context // doesn't guarantee the rects it returns are valid outside of begin/end render calls. @@ -508,7 +508,7 @@ namespace studio { SStudioPickValue Pick(CPt inMouseCoords, TranslationSelectMode::Enum inSelectMode); Option<QT3DSU32> PickWidget(CPt inMouseCoords, TranslationSelectMode::Enum inSelectMode, - uic::widgets::IStudioWidgetBase &inWidget); + qt3ds::widgets::IStudioWidgetBase &inWidget); qt3ds::foundation::Option<UICDM::SGuideInfo> PickRulers(CPt inMouseCoords); @@ -594,9 +594,9 @@ namespace studio { bool inLockToAxis); Option<SDragPreparationResult> - PrepareWidgetDrag(uic::widgets::StudioWidgetComponentIds::Enum inComponentId, - uic::widgets::StudioWidgetTypes::Enum inWidgetId, - uic::render::RenderWidgetModes::Enum inWidgetMode, SNode &inNode, + PrepareWidgetDrag(qt3ds::widgets::StudioWidgetComponentIds::Enum inComponentId, + qt3ds::widgets::StudioWidgetTypes::Enum inWidgetId, + qt3ds::render::RenderWidgetModes::Enum inWidgetMode, SNode &inNode, CPt inOriginalCoords, CPt inPreviousMouseCoords, CPt inMouseCoords); void PerformWidgetDrag(int inWidgetSubComponent, CPt inOriginalCoords, @@ -608,7 +608,7 @@ namespace studio { void CheckGuideInPresentationRect(CUICDMGuideHandle inGuide, CUpdateableDocumentEditor &inEditor); - void PerformPathDrag(uic::studio::SPathPick &inPathPick, CPt inOriginalCoords, + void PerformPathDrag(qt3ds::studio::SPathPick &inPathPick, CPt inOriginalCoords, CPt inPreviousMouseCoords, CPt inMouseCoords, CUpdateableDocumentEditor &inEditor); diff --git a/src/Authoring/Studio/Render/StudioRotationWidget.cpp b/src/Authoring/Studio/Render/StudioRotationWidget.cpp index 813cf7ac..e68ce7ee 100644 --- a/src/Authoring/Studio/Render/StudioRotationWidget.cpp +++ b/src/Authoring/Studio/Render/StudioRotationWidget.cpp @@ -38,7 +38,7 @@ #include "render/Qt3DSRenderShaderProgram.h" #include "StudioUtils.h" -using namespace uic::widgets; +using namespace qt3ds::widgets; namespace { @@ -206,12 +206,12 @@ struct SRotationWidget : public SStudioWidgetImpl<StudioWidgetTypes::Rotation> return retval; } - uic::render::IShaderProgramGenerator &theGenerator(inWidgetContext.GetProgramGenerator()); + qt3ds::render::IShaderProgramGenerator &theGenerator(inWidgetContext.GetProgramGenerator()); theGenerator.BeginProgram(); - uic::render::IShaderStageGenerator &theVertexGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Vertex)); - uic::render::IShaderStageGenerator &theFragmentGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Fragment)); + qt3ds::render::IShaderStageGenerator &theVertexGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Vertex)); + qt3ds::render::IShaderStageGenerator &theFragmentGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Fragment)); theVertexGenerator.AddIncoming("attr_pos", "vec3"); theVertexGenerator.AddUniform("model_view_projection", "mat4"); theVertexGenerator.Append("void main() {"); @@ -399,7 +399,7 @@ struct SRotationWidget : public SStudioWidgetImpl<StudioWidgetTypes::Rotation> } void RenderPick(const QT3DSMat44 &inProjPremult, NVRenderContext &inRenderContext, - uic::render::SWindowDimensions /*inWinDimensions*/) override + qt3ds::render::SWindowDimensions /*inWinDimensions*/) override { if (m_XAxis && m_PickShader) { QT3DSMat44 theCameraMVP = diff --git a/src/Authoring/Studio/Render/StudioScaleWidget.cpp b/src/Authoring/Studio/Render/StudioScaleWidget.cpp index 56b8bb33..7ae9ade4 100644 --- a/src/Authoring/Studio/Render/StudioScaleWidget.cpp +++ b/src/Authoring/Studio/Render/StudioScaleWidget.cpp @@ -37,7 +37,7 @@ #include "render/Qt3DSRenderShaderProgram.h" #include "StudioUtils.h" -using namespace uic::widgets; +using namespace qt3ds::widgets; namespace { @@ -227,7 +227,7 @@ struct SScaleWidget : public SStudioWidgetImpl<StudioWidgetTypes::Scale> } void RenderPick(const QT3DSMat44 &inProjPremult, NVRenderContext &inRenderContext, - uic::render::SWindowDimensions /*inWinDimensions*/) override + qt3ds::render::SWindowDimensions /*inWinDimensions*/) override { if (m_XAxis && m_PickShader) { inRenderContext.SetDepthWriteEnabled(true); diff --git a/src/Authoring/Studio/Render/StudioTranslationWidget.cpp b/src/Authoring/Studio/Render/StudioTranslationWidget.cpp index d75e8567..59d1b6d2 100644 --- a/src/Authoring/Studio/Render/StudioTranslationWidget.cpp +++ b/src/Authoring/Studio/Render/StudioTranslationWidget.cpp @@ -35,7 +35,7 @@ #include "render/Qt3DSRenderShaderProgram.h" #include "StudioUtils.h" -using namespace uic::widgets; +using namespace qt3ds::widgets; namespace { @@ -138,7 +138,7 @@ struct STranslationWidget : public SStudioWidgetImpl<StudioWidgetTypes::Translat } void RenderPick(const QT3DSMat44 &inProjPremult, NVRenderContext &inRenderContext, - uic::render::SWindowDimensions /*inWinDimensions*/) override + qt3ds::render::SWindowDimensions /*inWinDimensions*/) override { if (m_XAxis && m_PickShader) { inRenderContext.SetDepthWriteEnabled(true); diff --git a/src/Authoring/Studio/Render/StudioWidget.cpp b/src/Authoring/Studio/Render/StudioWidget.cpp index d37341da..01331b3e 100644 --- a/src/Authoring/Studio/Render/StudioWidget.cpp +++ b/src/Authoring/Studio/Render/StudioWidget.cpp @@ -34,7 +34,7 @@ #include "foundation/Qt3DSContainers.h" #include "UICRenderShaderCodeGeneratorV2.h" -using namespace uic::widgets; +using namespace qt3ds::widgets; void IStudioWidget::CreateRect(QT3DSVec3 rectStart, QT3DSVec3 rectEnd, QT3DSVec3 orth1, QT3DSF32 axisHalfWidth, QT3DSF32 inColorIndex, TResultVecType &outResult) @@ -241,12 +241,12 @@ NVRenderShaderProgram *IStudioWidget::CreateWidgetShader(IRenderWidgetContext &i NVRenderShaderProgram *retval = inWidgetContext.GetShader(theSharedName); if (retval) return retval; - uic::render::IShaderProgramGenerator &theGenerator(inWidgetContext.GetProgramGenerator()); + qt3ds::render::IShaderProgramGenerator &theGenerator(inWidgetContext.GetProgramGenerator()); theGenerator.BeginProgram(); - uic::render::IShaderStageGenerator &theVertexGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Vertex)); - uic::render::IShaderStageGenerator &theFragmentGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Fragment)); + qt3ds::render::IShaderStageGenerator &theVertexGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Vertex)); + qt3ds::render::IShaderStageGenerator &theFragmentGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Fragment)); theVertexGenerator.AddIncoming("attr_pos", "vec3"); theVertexGenerator.AddIncoming("attr_color_index", "float"); theVertexGenerator.AddOutgoing("output_color_index", "float"); @@ -278,12 +278,12 @@ NVRenderShaderProgram *IStudioWidget::CreateWidgetPickShader(IRenderWidgetContex NVRenderShaderProgram *retval = inWidgetContext.GetShader(theSharedName); if (retval) return retval; - uic::render::IShaderProgramGenerator &theGenerator(inWidgetContext.GetProgramGenerator()); + qt3ds::render::IShaderProgramGenerator &theGenerator(inWidgetContext.GetProgramGenerator()); theGenerator.BeginProgram(); - uic::render::IShaderStageGenerator &theVertexGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Vertex)); - uic::render::IShaderStageGenerator &theFragmentGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Fragment)); + qt3ds::render::IShaderStageGenerator &theVertexGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Vertex)); + qt3ds::render::IShaderStageGenerator &theFragmentGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Fragment)); theVertexGenerator.AddIncoming("attr_pos", "vec3"); theVertexGenerator.AddUniform("model_view_projection", "mat4"); theVertexGenerator.Append("void main() {"); diff --git a/src/Authoring/Studio/Render/StudioWidget.h b/src/Authoring/Studio/Render/StudioWidget.h index 030e6836..fb477d84 100644 --- a/src/Authoring/Studio/Render/StudioWidget.h +++ b/src/Authoring/Studio/Render/StudioWidget.h @@ -34,9 +34,9 @@ #include "foundation/Qt3DSRefCounted.h" #include "StudioPickValues.h" -namespace uic { +namespace qt3ds { namespace widgets { - using namespace uic::render; + using namespace qt3ds::render; struct StudioWidgetTypes { @@ -70,8 +70,8 @@ namespace widgets { public: virtual void SetNode(SNode &inNode) = 0; virtual void RenderPick(const QT3DSMat44 &inProjPreMult, NVRenderContext &inRenderContext, - uic::render::SWindowDimensions inWinDimensions) = 0; - virtual uic::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) = 0; + qt3ds::render::SWindowDimensions inWinDimensions) = 0; + virtual qt3ds::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) = 0; }; typedef nvvector<QT3DSVec4> TResultVecType; diff --git a/src/Authoring/Studio/Render/StudioWidgetImpl.h b/src/Authoring/Studio/Render/StudioWidgetImpl.h index a00f4fcd..15b8ae14 100644 --- a/src/Authoring/Studio/Render/StudioWidgetImpl.h +++ b/src/Authoring/Studio/Render/StudioWidgetImpl.h @@ -37,7 +37,7 @@ #include "UICRenderNode.h" #include "UICRenderShaderCodeGeneratorV2.h" -namespace uic { +namespace qt3ds { namespace widgets { typedef nvvector<QT3DSVec4> TResultVecType; @@ -116,9 +116,9 @@ namespace widgets { } StudioWidgetTypes::Enum GetWidgetType() const override { return TWidgetType; } - uic::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) override + qt3ds::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) override { - return uic::studio::SWidgetPick((QT3DSI32)inPickIndex); + return qt3ds::studio::SWidgetPick((QT3DSI32)inPickIndex); } void SetupRender(IRenderWidgetContext &inWidgetContext, NVRenderContext &inRenderContext) @@ -264,13 +264,13 @@ namespace widgets { m_ImmediateShader = inWidgetContext.GetShader(theShaderName); if (m_ImmediateShader == nullptr) { - uic::render::IShaderProgramGenerator &theGenerator( + qt3ds::render::IShaderProgramGenerator &theGenerator( inWidgetContext.GetProgramGenerator()); theGenerator.BeginProgram(); - uic::render::IShaderStageGenerator &theVertexGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Vertex)); - uic::render::IShaderStageGenerator &theFragmentGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Fragment)); + qt3ds::render::IShaderStageGenerator &theVertexGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Vertex)); + qt3ds::render::IShaderStageGenerator &theFragmentGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Fragment)); theVertexGenerator.AddIncoming("attr_pos", "vec3"); theVertexGenerator.AddIncoming("attr_color", "vec4"); theVertexGenerator.AddUniform("model_view_projection", "mat4"); diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.cpp b/src/Authoring/Studio/_Win/Application/StudioApp.cpp index 0cf9c00c..6fa78a4a 100644 --- a/src/Authoring/Studio/_Win/Application/StudioApp.cpp +++ b/src/Authoring/Studio/_Win/Application/StudioApp.cpp @@ -1577,7 +1577,7 @@ void CStudioApp::SaveUIAFile() list.append(r.m_argsOrSrc); } Q3DStudio::CFilePath doc(GetCore()->GetDoc()->GetDocumentPath().GetAbsolutePath()); - uic::state::IApplication::EnsureApplicationFile(doc.GetCharStar(), list); + qt3ds::state::IApplication::EnsureApplicationFile(doc.GetCharStar(), list); } //============================================================================= diff --git a/src/Authoring/UICDM/Systems/UICDMMetaData.cpp b/src/Authoring/UICDM/Systems/UICDMMetaData.cpp index 132419aa..a35a171f 100644 --- a/src/Authoring/UICDM/Systems/UICDMMetaData.cpp +++ b/src/Authoring/UICDM/Systems/UICDMMetaData.cpp @@ -426,7 +426,7 @@ public: TCharStr m_Name; TCharStr m_SourcePath; eastl::vector<SMetaDataShader> m_Shaders; - eastl::vector<uic::render::dynamic::SPropertyDefinition> m_Properties; + eastl::vector<qt3ds::render::dynamic::SPropertyDefinition> m_Properties; eastl::vector<eastl::vector<qt3ds::foundation::CRegisteredString> *> m_EnumValueNames; ~SMetaDataDynamicObjectImpl() { ClearEnumValueNames(); } @@ -444,7 +444,7 @@ private: SMetaDataEffectImpl &operator=(const SMetaDataEffectImpl &inOther); public: - eastl::vector<uic::render::dynamic::SCommand *> m_EffectCommands; + eastl::vector<qt3ds::render::dynamic::SCommand *> m_EffectCommands; void ClearEffectCommands() { @@ -465,7 +465,7 @@ private: SMetaDataCustomMaterialImpl &operator=(const SMetaDataCustomMaterialImpl &); public: - eastl::vector<uic::render::dynamic::SCommand *> + eastl::vector<qt3ds::render::dynamic::SCommand *> m_CustomerMaterialCommands; ///< our command stream used for rendering bool m_HasTransparency; ///< this material is transparent bool m_HasRefraction; ///< this material is refractive (e.g glass) @@ -3072,7 +3072,7 @@ struct SNewMetaDataImpl : public IMetaData std::vector<SMetaDataLoadWarning> &outWarnings, eastl::string &shaderPrefix) { - using namespace uic::render::dynamic; + using namespace qt3ds::render::dynamic; ioObject.m_Properties.clear(); ioObject.ClearEnumValueNames(); IDOMReader::Scope __readerScope(inStream); @@ -3333,11 +3333,11 @@ struct SNewMetaDataImpl : public IMetaData return inValue; } - static uic::render::dynamic::SDepthStencilFlags ParseDepthStencilFlags(const char8_t *inFlags) + static qt3ds::render::dynamic::SDepthStencilFlags ParseDepthStencilFlags(const char8_t *inFlags) { eastl::string parseStr(inFlags); eastl::string tokenStr; - uic::render::dynamic::SDepthStencilFlags retval; + qt3ds::render::dynamic::SDepthStencilFlags retval; for (uint32_t pos = parseStr.find('|'); parseStr.empty() == false; pos = parseStr.find('|')) { if (pos != eastl::string::npos) { @@ -3348,9 +3348,9 @@ struct SNewMetaDataImpl : public IMetaData parseStr.clear(); } if (AreEqual(tokenStr.c_str(), "clear-stencil")) - retval |= uic::render::dynamic::DepthStencilFlagValues::ClearStencil; + retval |= qt3ds::render::dynamic::DepthStencilFlagValues::ClearStencil; if (AreEqual(tokenStr.c_str(), "clear-depth")) - retval |= uic::render::dynamic::DepthStencilFlagValues::ClearDepth; + retval |= qt3ds::render::dynamic::DepthStencilFlagValues::ClearDepth; } return retval; } @@ -3408,7 +3408,7 @@ struct SNewMetaDataImpl : public IMetaData std::vector<SMetaDataLoadWarning> &outWarnings, const TCharStr &inSourcePath) override { - using namespace uic::render::dynamic; + using namespace qt3ds::render::dynamic; std::pair<TEffectMap::iterator, bool> theInserter = m_EffectMap.insert(std::make_pair(Intern(inObjectName), SMetaDataEffectImpl())); /*if ( inStream.MoveToFirstChild( "Effect" ) == false ) @@ -3532,7 +3532,7 @@ struct SNewMetaDataImpl : public IMetaData // find the param and the type. qt3ds::foundation::CRegisteredString propName = m_StringTable.GetRenderStringTable().RegisterStr(name); - uic::render::dynamic::SPropertyDefinition *theDefinition = NULL; + qt3ds::render::dynamic::SPropertyDefinition *theDefinition = NULL; for (uint32_t propIdx = 0, propEnd = theEffect.m_Properties.size(); propIdx < propEnd && theDefinition == NULL; ++propIdx) { if (theEffect.m_Properties[propIdx].m_Name == propName) @@ -3627,7 +3627,7 @@ struct SNewMetaDataImpl : public IMetaData if (inStream.Att("stencil-function", temp)) stencilFunction = ParseBoolOp(temp); - uic::render::dynamic::SDepthStencilFlags flagValues = + qt3ds::render::dynamic::SDepthStencilFlags flagValues = ParseDepthStencilFlags(flags); theEffect.m_EffectCommands.push_back(new SDepthStencil( m_StringTable.GetRenderStringTable().RegisterStr(bufferName), @@ -3796,7 +3796,7 @@ struct SNewMetaDataImpl : public IMetaData std::vector<SMetaDataLoadWarning> &outWarnings, const TCharStr &inSourcePath) override { - using namespace uic::render::dynamic; + using namespace qt3ds::render::dynamic; std::pair<TCustomMaterialMap::iterator, bool> theInserter = m_CustomMaterials.insert( std::make_pair(Intern(inObjectName), SMetaDataCustomMaterialImpl())); diff --git a/src/Authoring/UICDM/Systems/UICDMMetaDataTypes.h b/src/Authoring/UICDM/Systems/UICDMMetaDataTypes.h index c42df6f8..9b2d6bab 100644 --- a/src/Authoring/UICDM/Systems/UICDMMetaDataTypes.h +++ b/src/Authoring/UICDM/Systems/UICDMMetaDataTypes.h @@ -29,7 +29,7 @@ #pragma once #include "UICDMMetaDataValue.h" -namespace uic { +namespace qt3ds { namespace render { namespace dynamic { struct SCommand; @@ -294,11 +294,11 @@ struct SMetaDataDynamicObject { TCharStr m_Name; qt3ds::foundation::NVConstDataRef<SMetaDataShader> m_Shaders; - qt3ds::foundation::NVConstDataRef<uic::render::dynamic::SPropertyDefinition> m_Properties; + qt3ds::foundation::NVConstDataRef<qt3ds::render::dynamic::SPropertyDefinition> m_Properties; SMetaDataDynamicObject() {} SMetaDataDynamicObject( const TCharStr &inName, qt3ds::foundation::NVConstDataRef<SMetaDataShader> inShaders, - qt3ds::foundation::NVConstDataRef<uic::render::dynamic::SPropertyDefinition> inProperties) + qt3ds::foundation::NVConstDataRef<qt3ds::render::dynamic::SPropertyDefinition> inProperties) : m_Name(inName) , m_Shaders(inShaders) , m_Properties(inProperties) @@ -308,12 +308,12 @@ struct SMetaDataDynamicObject struct SMetaDataEffect : public SMetaDataDynamicObject { - qt3ds::foundation::NVConstDataRef<uic::render::dynamic::SCommand *> m_EffectCommands; + qt3ds::foundation::NVConstDataRef<qt3ds::render::dynamic::SCommand *> m_EffectCommands; SMetaDataEffect() {} SMetaDataEffect( const TCharStr &inName, qt3ds::foundation::NVConstDataRef<SMetaDataShader> inShaders, - qt3ds::foundation::NVConstDataRef<uic::render::dynamic::SPropertyDefinition> inProperties, - qt3ds::foundation::NVConstDataRef<uic::render::dynamic::SCommand *> inEffectCommands) + qt3ds::foundation::NVConstDataRef<qt3ds::render::dynamic::SPropertyDefinition> inProperties, + qt3ds::foundation::NVConstDataRef<qt3ds::render::dynamic::SCommand *> inEffectCommands) : SMetaDataDynamicObject(inName, inShaders, inProperties) , m_EffectCommands(inEffectCommands) { @@ -322,7 +322,7 @@ struct SMetaDataEffect : public SMetaDataDynamicObject struct SMetaDataCustomMaterial : public SMetaDataDynamicObject { - qt3ds::foundation::NVConstDataRef<uic::render::dynamic::SCommand *> m_CustomMaterialCommands; + qt3ds::foundation::NVConstDataRef<qt3ds::render::dynamic::SCommand *> m_CustomMaterialCommands; bool m_HasTransparency; bool m_HasRefraction; bool m_AlwaysDirty; @@ -331,8 +331,8 @@ struct SMetaDataCustomMaterial : public SMetaDataDynamicObject SMetaDataCustomMaterial() {} SMetaDataCustomMaterial( const TCharStr &inName, qt3ds::foundation::NVConstDataRef<SMetaDataShader> inShaders, - qt3ds::foundation::NVConstDataRef<uic::render::dynamic::SPropertyDefinition> inProperties, - qt3ds::foundation::NVConstDataRef<uic::render::dynamic::SCommand *> inCustomMaterialCommands, + qt3ds::foundation::NVConstDataRef<qt3ds::render::dynamic::SPropertyDefinition> inProperties, + qt3ds::foundation::NVConstDataRef<qt3ds::render::dynamic::SCommand *> inCustomMaterialCommands, bool inHasTransparency, bool inHasRefraction, bool inIsAlwaysDirty, unsigned int inShaderKey, unsigned int inLayerCount) : SMetaDataDynamicObject(inName, inShaders, inProperties) diff --git a/src/Runtime/Source/Engine/Include/UICRenderRuntimeBinding.h b/src/Runtime/Source/Engine/Include/UICRenderRuntimeBinding.h index e38c78fa..4b004ed4 100644 --- a/src/Runtime/Source/Engine/Include/UICRenderRuntimeBinding.h +++ b/src/Runtime/Source/Engine/Include/UICRenderRuntimeBinding.h @@ -44,7 +44,7 @@ class ITimeProvider; class IWindowSystem; } -namespace uic { +namespace qt3ds { namespace render { class ITextRenderer; diff --git a/src/Runtime/Source/Engine/Include/UICRenderRuntimeBindingImpl.h b/src/Runtime/Source/Engine/Include/UICRenderRuntimeBindingImpl.h index 7d0e512b..ea4e5078 100644 --- a/src/Runtime/Source/Engine/Include/UICRenderRuntimeBindingImpl.h +++ b/src/Runtime/Source/Engine/Include/UICRenderRuntimeBindingImpl.h @@ -74,11 +74,11 @@ #define stricmp strcasecmp #endif -using namespace uic::render; +using namespace qt3ds::render; using eastl::make_pair; using eastl::pair; -namespace uic { +namespace qt3ds { namespace render { extern qt3ds::foundation::MallocAllocator g_BaseAllocator; @@ -131,7 +131,7 @@ namespace render { m_FlowData = NULL; } - void CreateRenderContext(uic::render::IRuntimeFactoryRenderFactory &inContextFactory) + void CreateRenderContext(qt3ds::render::IRuntimeFactoryRenderFactory &inContextFactory) { m_RenderContext = inContextFactory.CreateRenderContext(*m_Foundation, *m_StringTable); if (m_RenderContext) diff --git a/src/Runtime/Source/Engine/Include/UICTegraApplication.h b/src/Runtime/Source/Engine/Include/UICTegraApplication.h index 0f9fea4a..45676ce1 100644 --- a/src/Runtime/Source/Engine/Include/UICTegraApplication.h +++ b/src/Runtime/Source/Engine/Include/UICTegraApplication.h @@ -59,7 +59,7 @@ Q_SIGNALS: void SigSlideExited(const QString &elementPath, unsigned int index, const QString &name); }; -namespace uic { +namespace qt3ds { class UICAssetVisitor; } @@ -202,7 +202,7 @@ public: virtual bool AddGlobalFunction(const CHAR *inFunctionName, lua_CFunction inFunction) = 0; virtual qt3ds::foundation::Option<SPresentationSize> GetPresentationSize() = 0; - virtual void setAssetVisitor(uic::UICAssetVisitor *) = 0; + virtual void setAssetVisitor(qt3ds::UICAssetVisitor *) = 0; public: static INDDView &Create(ITimeProvider &inProvider, IWindowSystem &inWindowSystem, diff --git a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBinding.cpp b/src/Runtime/Source/Engine/Source/UICRenderRuntimeBinding.cpp index 7dccf48c..971577ea 100644 --- a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBinding.cpp +++ b/src/Runtime/Source/Engine/Source/UICRenderRuntimeBinding.cpp @@ -83,15 +83,15 @@ #pragma warning(disable : 4355) #endif -using namespace uic::render; +using namespace qt3ds::render; using eastl::make_pair; using eastl::pair; -using uic::runtime::IApplication; +using qt3ds::runtime::IApplication; #ifndef _WIN32 #define stricmp strcasecmp #endif -namespace uic { +namespace qt3ds { namespace render { qt3ds::foundation::MallocAllocator g_BaseAllocator; } @@ -322,16 +322,16 @@ struct SUICRenderScene : public Q3DStudio::IScene theMapperObjects[idx] = theMapperObject; } } - uic::render::SBasisPlanes::Enum thePlane(uic::render::SBasisPlanes::XY); + qt3ds::render::SBasisPlanes::Enum thePlane(qt3ds::render::SBasisPlanes::XY); switch (inPlane) { case Q3DStudio::FacePositionPlanes::XY: - thePlane = uic::render::SBasisPlanes::XY; + thePlane = qt3ds::render::SBasisPlanes::XY; break; case Q3DStudio::FacePositionPlanes::YZ: - thePlane = uic::render::SBasisPlanes::YZ; + thePlane = qt3ds::render::SBasisPlanes::YZ; break; case Q3DStudio::FacePositionPlanes::XZ: - thePlane = uic::render::SBasisPlanes::XZ; + thePlane = qt3ds::render::SBasisPlanes::XZ; break; } if (theBounds.isEmpty() == false) @@ -547,10 +547,10 @@ struct SUICRenderScene : public Q3DStudio::IScene { CUICTranslator *theTranslator = reinterpret_cast<CUICTranslator *>(inElem.GetAssociation()); if (theTranslator && theTranslator->m_RenderObject) { - Option<uic::render::SCuboidRect> theRectOpt = + Option<qt3ds::render::SCuboidRect> theRectOpt = m_Context->GetRenderer().GetCameraBounds(*theTranslator->m_RenderObject); if (theRectOpt.hasValue()) { - uic::render::SCuboidRect theRect(*theRectOpt); + qt3ds::render::SCuboidRect theRect(*theRectOpt); return Q3DStudio::SCameraRect(theRect.m_Left, theRect.m_Top, theRect.m_Right, theRect.m_Bottom); } @@ -762,7 +762,7 @@ struct SUICRenderScene : public Q3DStudio::IScene Q3DStudio::INT32 LoadImageBatch(qt3ds::foundation::CRegisteredString *inFullPaths, Q3DStudio::INT32 inNumPaths, qt3ds::foundation::CRegisteredString inDefaultImage, - uic::render::IImageLoadListener *inLoadCallback) override + qt3ds::render::IImageLoadListener *inLoadCallback) override { return static_cast<Q3DStudio::INT32>(m_Context->GetImageBatchLoader().LoadImageBatch( toConstDataRef(inFullPaths, (QT3DSU32)inNumPaths), inDefaultImage, inLoadCallback)); @@ -917,7 +917,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager, } } - struct SResolver : public uic::render::IUIPReferenceResolver + struct SResolver : public qt3ds::render::IUIPReferenceResolver { IStringTable &m_StringTable; Q3DStudio::IUIPParser &m_Parser; @@ -1048,7 +1048,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager, // threadsafe // returns a handle to the loaded object. Return value of zero means error. qt3ds::QT3DSU32 LoadSceneStage1(CRegisteredString inPresentationDirectory, - uic::render::ILoadedBuffer &inData) override + qt3ds::render::ILoadedBuffer &inData) override { SStackPerfTimer __perfTimer(m_Context->m_CoreContext->GetPerfTimer(), "Load Scene Graph Stage 1"); @@ -1195,9 +1195,9 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager, Q3DStudio::CDLLManager &theDLLManager = Q3DStudio::CDLLManager::GetDLLManager(); long theHandle = theDLLManager.LoadLibrary(inPath, EDLLTYPE_RENDERABLE_PLUGIN); if (theHandle >= 0) { - uic::render::IOffscreenRenderer *theOffscreenRenderer = + qt3ds::render::IOffscreenRenderer *theOffscreenRenderer = QT3DS_NEW(m_Context->GetAllocator(), - uic::render::COldNBustedPluginRenderer)(*m_Context->m_UICContext, theHandle); + qt3ds::render::COldNBustedPluginRenderer)(*m_Context->m_UICContext, theHandle); qt3ds::foundation::CRegisteredString theAssetString = m_Context->m_CoreContext->GetStringTable().RegisterStr(inAssetIDString); @@ -1230,7 +1230,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager, void LoadQmlStreamerPlugin(const char *inAssetIDString) override { - uic::render::IOffscreenRenderer *theOffscreenRenderer = + qt3ds::render::IOffscreenRenderer *theOffscreenRenderer = QT3DS_NEW(m_Context->GetAllocator(), Q3DSQmlRender)(*m_Context->m_UICContext, inAssetIDString); if (theOffscreenRenderer) { @@ -1644,8 +1644,8 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager, struct SRenderFactory; -struct SVisualStateHandler : public uic::state::IVisualStateInterpreterFactory, - public uic::state::IVisualStateCommandHandler +struct SVisualStateHandler : public qt3ds::state::IVisualStateInterpreterFactory, + public qt3ds::state::IVisualStateCommandHandler { NVAllocatorCallback &m_Allocator; QT3DSI32 mRefCount; @@ -1660,12 +1660,12 @@ public: } QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE_OVERRIDE(m_Allocator) - uic::state::IStateInterpreter *OnNewStateMachine(const char8_t *inPath, + qt3ds::state::IStateInterpreter *OnNewStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) override; - void Handle(const uic::state::SVisualStateCommand &inCommand, - uic::state::IScriptContext &inScriptContext) override; + void Handle(const qt3ds::state::SVisualStateCommand &inCommand, + qt3ds::state::IScriptContext &inScriptContext) override; }; struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory @@ -1675,10 +1675,10 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory NVScopedRefCounted<Q3DStudio::CLuaEngine> m_ScriptBridge; NVScopedRefCounted<Q3DStudio::CQmlEngine> m_ScriptBridgeQml; NVScopedRefCounted<SUICRenderSceneManager> m_SceneManager; - NVScopedRefCounted<uic::state::IVisualStateContext> m_VisualStateContext; - NVScopedRefCounted<uic::evt::IEventSystem> m_EventSystem; - uic::runtime::IApplicationCore *m_ApplicationCore; - uic::runtime::IApplication *m_Application; + NVScopedRefCounted<qt3ds::state::IVisualStateContext> m_VisualStateContext; + NVScopedRefCounted<qt3ds::evt::IEventSystem> m_EventSystem; + qt3ds::runtime::IApplicationCore *m_ApplicationCore; + qt3ds::runtime::IApplication *m_Application; QT3DSI32 m_RefCount; SRenderFactory(SBindingCore &inCore) @@ -1714,13 +1714,13 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory } } - uic::render::IUICRenderContextCore &GetUICRenderContextCore() override + qt3ds::render::IUICRenderContextCore &GetUICRenderContextCore() override { return *m_Context->m_CoreContext; } - uic::runtime::IApplicationCore *GetApplicationCore() override { return m_ApplicationCore; } - void SetApplicationCore(uic::runtime::IApplicationCore *app) override + qt3ds::runtime::IApplicationCore *GetApplicationCore() override { return m_ApplicationCore; } + void SetApplicationCore(qt3ds::runtime::IApplicationCore *app) override { m_ApplicationCore = app; } @@ -1763,19 +1763,19 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory return *m_ScriptBridgeQml; } - uic::render::IInputStreamFactory &GetInputStreamFactory() override + qt3ds::render::IInputStreamFactory &GetInputStreamFactory() override { return m_Context->m_CoreContext->GetInputStreamFactory(); } - uic::render::IUICRenderContext &GetUICRenderContext() override + qt3ds::render::IUICRenderContext &GetUICRenderContext() override { return *m_Context->m_UICContext; } - uic::state::IVisualStateContext &GetVisualStateContext() override + qt3ds::state::IVisualStateContext &GetVisualStateContext() override { if (!m_VisualStateContext) { - m_VisualStateContext = uic::state::IVisualStateContext::Create( + m_VisualStateContext = qt3ds::state::IVisualStateContext::Create( *m_Context->m_Foundation, m_Context->m_CoreContext->GetStringTable()); SVisualStateHandler *newHandle = QT3DS_NEW(m_Context->m_Foundation->getAllocator(), @@ -1785,10 +1785,10 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory } return *m_VisualStateContext; } - uic::evt::IEventSystem &GetEventSystem() override + qt3ds::evt::IEventSystem &GetEventSystem() override { if (!m_EventSystem) { - m_EventSystem = uic::evt::IEventSystem::Create(*m_Context->m_Foundation); + m_EventSystem = qt3ds::evt::IEventSystem::Create(*m_Context->m_Foundation); } return *m_EventSystem; } @@ -1802,8 +1802,8 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory { return m_Context->m_CoreContext->GetPerfTimer(); } - uic::runtime::IApplication *GetApplication() override { return m_Application; } - void SetApplication(uic::runtime::IApplication *app) override + qt3ds::runtime::IApplication *GetApplication() override { return m_Application; } + void SetApplication(qt3ds::runtime::IApplication *app) override { m_Application = app; if (app) { @@ -1866,7 +1866,7 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory } }; -uic::state::IStateInterpreter * +qt3ds::state::IStateInterpreter * SVisualStateHandler::OnNewStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) { @@ -1876,9 +1876,9 @@ SVisualStateHandler::OnNewStateMachine(const char8_t *inPath, const char8_t *inI return m_Factory.m_ScriptBridge->CreateStateMachine(inPath, inId, inDatamodelFunction); } -Q3DStudio::SScriptEngineGotoSlideArgs ToEngine(const uic::state::SGotoSlideData &inData) +Q3DStudio::SScriptEngineGotoSlideArgs ToEngine(const qt3ds::state::SGotoSlideData &inData) { - using namespace uic::state; + using namespace qt3ds::state; Q3DStudio::SScriptEngineGotoSlideArgs retval; if (inData.m_Mode.hasValue()) { switch (*inData.m_Mode) { @@ -1915,7 +1915,7 @@ class CStateScriptEngineCallFunctionArgRetriever { public: CStateScriptEngineCallFunctionArgRetriever(const char *inArguments, - uic::state::IScriptContext &inScriptContext) + qt3ds::state::IScriptContext &inScriptContext) : CScriptEngineCallFunctionArgRetriever(inArguments) , m_ScriptContext(inScriptContext) { @@ -1927,13 +1927,13 @@ public: } private: - uic::state::IScriptContext &m_ScriptContext; + qt3ds::state::IScriptContext &m_ScriptContext; }; -void SVisualStateHandler::Handle(const uic::state::SVisualStateCommand &inCommand, - uic::state::IScriptContext &inScriptContext) +void SVisualStateHandler::Handle(const qt3ds::state::SVisualStateCommand &inCommand, + qt3ds::state::IScriptContext &inScriptContext) { - using namespace uic::state; + using namespace qt3ds::state; switch (inCommand.getType()) { case VisualStateCommandTypes::GotoSlide: { const SGotoSlide &theInfo(inCommand.getData<SGotoSlide>()); diff --git a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplRenderer.cpp b/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplRenderer.cpp index 232a1395..ed6c1b2b 100644 --- a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplRenderer.cpp +++ b/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplRenderer.cpp @@ -33,7 +33,7 @@ #include "UICWindowSystem.h" #include "UICRenderLoadedTexture.h" -using uic::render::SWindowDimensions; +using qt3ds::render::SWindowDimensions; struct SRenderer; struct SRendererRSM : public Q3DStudio::ITegraRenderStateManager @@ -196,8 +196,8 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine if (inTextureData && inDataSize) { SMemoryInStream theInStream(inTextureData, inTextureData + inDataSize); NVFoundationBase &theFoundation(*m_BindingCore->m_Foundation); - uic::render::SLoadedTexture *theLoadedTexture = - uic::render::SLoadedTexture::LoadDDS(theInStream, true, theFoundation); + qt3ds::render::SLoadedTexture *theLoadedTexture = + qt3ds::render::SLoadedTexture::LoadDDS(theInStream, true, theFoundation); if (theLoadedTexture && theLoadedTexture->dds) { theLoadedTexture->EnsureMultiplerOfFour(theFoundation, "AutoworksWatermark.png"); qt3ds::render::NVRenderContext &theContext = *m_BindingCore->m_RenderContext; diff --git a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplTranslation.cpp b/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplTranslation.cpp index 80c0d16c..8900c505 100644 --- a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplTranslation.cpp +++ b/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplTranslation.cpp @@ -61,7 +61,7 @@ QT3DSU32 g_PresentationTag; // Add specializations for the tagged pointer operations to make casting // a bit safer and more transparent. -namespace uic { +namespace qt3ds { namespace render { template <> struct SPointerTag<CUICTranslator> @@ -974,7 +974,7 @@ struct SPathSubPathTranslator : public CUICTranslator Q3DStudio::IPresentation & /*inStudioPresentation*/) { SPathSubPath &theItem = *static_cast<SPathSubPath *>(m_RenderObject); - uic::render::IPathManager &theManager = inParser.m_RenderContext.GetPathManager(); + qt3ds::render::IPathManager &theManager = inParser.m_RenderContext.GetPathManager(); QT3DSU32 numAnchors = 0; bool updatePath = false; CRegisteredString theAnchorType = @@ -988,7 +988,7 @@ struct SPathSubPathTranslator : public CUICTranslator } } if (updatePath) { - NVDataRef<uic::render::SPathAnchorPoint> thePathBuffer = + NVDataRef<qt3ds::render::SPathAnchorPoint> thePathBuffer = theManager.ResizePathSubPathBuffer(theItem, numAnchors); if (thePathBuffer.size()) { QT3DSU32 anchorIndex = 0; @@ -996,11 +996,11 @@ struct SPathSubPathTranslator : public CUICTranslator theChild = theChild->GetSibling()) { if (theChild->GetType() == theAnchorType) { if (theChild->IsDirty()) { - uic::render::SPathAnchorPoint &thePoint(thePathBuffer[anchorIndex]); + qt3ds::render::SPathAnchorPoint &thePoint(thePathBuffer[anchorIndex]); for (QT3DSI32 idx = 0, end = theChild->GetAttributeCount(); idx < end; ++idx) { - uic::runtime::element::TPropertyDescAndValuePtr thePropInfo = + qt3ds::runtime::element::TPropertyDescAndValuePtr thePropInfo = theChild->GetPropertyByIndex(idx); switch (thePropInfo.first.GetNameHash()) { case Q3DStudio::ATTRIBUTE_POSITION_X: @@ -1189,7 +1189,7 @@ struct SDynamicObjectTranslatorContext : public STranslatorContext { } ~SDynamicObjectTranslatorContext() {} - void AddEffectExtendedProperty(const uic::render::dynamic::SPropertyDefinition &thePropDef, + void AddEffectExtendedProperty(const qt3ds::render::dynamic::SPropertyDefinition &thePropDef, const char *inExtension, Q3DStudio::EAttributeType inType, CRenderString &ioStringBuilder, QT3DSU32 inOffset, QT3DSU32 dataOffset) { @@ -1199,12 +1199,12 @@ struct SDynamicObjectTranslatorContext : public STranslatorContext m_PropertyHashes.insert( eastl::make_pair(theHash, SEffectPropertyEntry(inType, inOffset, dataOffset))); } - void BuildPropertyHashes(NVConstDataRef<uic::render::dynamic::SPropertyDefinition> inProperties) + void BuildPropertyHashes(NVConstDataRef<qt3ds::render::dynamic::SPropertyDefinition> inProperties) { if (m_PropertyHashes.size() == 0) { - uic::render::CRenderString theNameBuilder; + qt3ds::render::CRenderString theNameBuilder; for (QT3DSU32 idx = 0, end = inProperties.size(); idx < end; ++idx) { - const uic::render::dynamic::SPropertyDefinition &thePropDef = inProperties[idx]; + const qt3ds::render::dynamic::SPropertyDefinition &thePropDef = inProperties[idx]; switch (thePropDef.m_DataType) { case qt3ds::render::NVRenderShaderDataTypes::QT3DSF32: m_PropertyHashes.insert(eastl::make_pair( @@ -1278,18 +1278,18 @@ struct SDynamicObjectTranslatorContext : public STranslatorContext IDynamicObjectSystem &inSystem) { if (element.GetActive()) { - NVConstDataRef<uic::render::dynamic::SPropertyDefinition> theProperties = + NVConstDataRef<qt3ds::render::dynamic::SPropertyDefinition> theProperties = inSystem.GetProperties(inObject.m_ClassName); BuildPropertyHashes(theProperties); SDynamicObject &theItem(inObject); for (long idx = 0, end = element.GetAttributeCount(); idx < end; ++idx) { - uic::runtime::element::TPropertyDescAndValuePtr thePropInfo = + qt3ds::runtime::element::TPropertyDescAndValuePtr thePropInfo = *element.GetPropertyByIndex(idx); THashToOffsetMap::iterator theFind = m_PropertyHashes.find(thePropInfo.first.GetNameHash()); if (theFind != m_PropertyHashes.end()) { const SEffectPropertyEntry &theEntry(theFind->second); - const uic::render::dynamic::SPropertyDefinition &theDefinition( + const qt3ds::render::dynamic::SPropertyDefinition &theDefinition( theProperties[theEntry.m_PropertyOffset]); if (theEntry.m_AttributeType == (Q3DStudio::EAttributeType)thePropInfo.first.m_Type) { @@ -1458,7 +1458,7 @@ struct SRenderPluginTranslator : public CUICTranslator } // ok, now we have an efficient mapping from attribute to plugin value name. theTransContext.m_PropertyUpdates.clear(); for (long idx = 0, end = Element().GetAttributeCount(); idx < end; ++idx) { - uic::runtime::element::TPropertyDescAndValuePtr thePropInfo = + qt3ds::runtime::element::TPropertyDescAndValuePtr thePropInfo = *Element().GetPropertyByIndex(idx); nvhash_map<int, CRegisteredString>::iterator theFind = theTransContext.m_AttribHashIndexMap.find(thePropInfo.first.GetNameHash()); @@ -1566,7 +1566,7 @@ struct STranslatorCreator // Don't push properties from inactive elements. for (long idx = 0, end = theTranslator.Element().GetAttributeCount(); idx < end; ++idx) { - uic::runtime::element::TPropertyDescAndValuePtr thePropInfo = + qt3ds::runtime::element::TPropertyDescAndValuePtr thePropInfo = *theTranslator.Element().GetPropertyByIndex(idx); theParser.Setup(thePropInfo.first.GetNameHash(), *thePropInfo.second, (Q3DStudio::EAttributeType)thePropInfo.first.m_Type); @@ -1577,7 +1577,7 @@ struct STranslatorCreator // same for dynamic properties for (long idx = 0, end = theTranslator.Element().GetDynamicAttributeCount(); idx < end; ++idx) { - uic::runtime::element::TPropertyDescAndValuePtr thePropInfo = + qt3ds::runtime::element::TPropertyDescAndValuePtr thePropInfo = *theTranslator.Element().GetDynamicPropertyByIndex(idx); theParser.Setup(thePropInfo.first.GetNameHash(), *thePropInfo.second, (Q3DStudio::EAttributeType)thePropInfo.first.m_Type); diff --git a/src/Runtime/Source/Engine/Source/UICTegraApplication.cpp b/src/Runtime/Source/Engine/Source/UICTegraApplication.cpp index 440ba36c..aa398995 100644 --- a/src/Runtime/Source/Engine/Source/UICTegraApplication.cpp +++ b/src/Runtime/Source/Engine/Source/UICTegraApplication.cpp @@ -75,7 +75,7 @@ //============================================================================== // Namespace //============================================================================== -namespace uic { +namespace qt3ds { namespace render { extern qt3ds::foundation::MallocAllocator g_BaseAllocator; } @@ -146,13 +146,13 @@ private: ITegraApplicationRenderEngine *m_RenderEngine; ///< Handles all rendering functions CTegraInputEngine *m_InputEngine; ///< Handles all user input events // Pre graphics init objects - NVScopedRefCounted<uic::render::IUICRenderFactoryCore> m_RuntimeFactoryCore; - NVScopedRefCounted<uic::runtime::IApplicationCore> + NVScopedRefCounted<qt3ds::render::IUICRenderFactoryCore> m_RuntimeFactoryCore; + NVScopedRefCounted<qt3ds::runtime::IApplicationCore> m_ApplicationCore; ///< Base application before graphis // Post graphics init objects - NVScopedRefCounted<uic::render::IUICRenderFactory> m_RuntimeFactory; - NVScopedRefCounted<uic::runtime::IApplication> m_Application; ///< Application after graphics + NVScopedRefCounted<qt3ds::render::IUICRenderFactory> m_RuntimeFactory; + NVScopedRefCounted<qt3ds::runtime::IApplication> m_Application; ///< Application after graphics CPresentation *m_Presentation; ///< Currently loaded presentation, this should be removed in the future CPausingTimeProvider m_TimeProvider; @@ -161,7 +161,7 @@ private: volatile QT3DSI32 mRefCount; - uic::UICAssetVisitor *m_visitor; + qt3ds::UICAssetVisitor *m_visitor; bool m_showOnScreenStats; public: @@ -169,7 +169,7 @@ public: IAudioPlayer *inAudioPlayer); ~CNDDView(); - QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE_OVERRIDE(uic::render::g_BaseAllocator); + QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE_OVERRIDE(qt3ds::render::g_BaseAllocator); bool BeginLoad(const QString &sourcePath) override; bool HasOfflineLoadingCompleted() override; @@ -186,7 +186,7 @@ public: void Pause() override; void UnPause() override; bool IsPaused() override; - void setAssetVisitor(uic::UICAssetVisitor *) override; + void setAssetVisitor(qt3ds::UICAssetVisitor *) override; INT32 GetFrameCount() override; void showOnScreenStats(bool) override; @@ -654,9 +654,9 @@ void CNDDView::BootupPreGraphicsInitObjects() // Create engines and runtime const eastl::string &theAppDir = QCoreApplication::applicationDirPath().toLatin1().constData(); - m_RuntimeFactoryCore = uic::render::IUICRenderFactoryCore::CreateRenderFactoryCore( + m_RuntimeFactoryCore = qt3ds::render::IUICRenderFactoryCore::CreateRenderFactoryCore( theAppDir.c_str(), m_WindowSystem, m_TimeProvider); - m_ApplicationCore = uic::runtime::IApplicationCore::CreateApplicationCore(*m_RuntimeFactoryCore, + m_ApplicationCore = qt3ds::runtime::IApplicationCore::CreateApplicationCore(*m_RuntimeFactoryCore, theAppDir.c_str()); if (m_ApplicationCore && m_visitor) @@ -668,7 +668,7 @@ void CNDDView::BootupPreGraphicsInitObjects() qCInfo(TRACE_INFO) << "CNDDView::DoInitialize: Successfully initialized!"; } -void CNDDView::setAssetVisitor(uic::UICAssetVisitor *v) +void CNDDView::setAssetVisitor(qt3ds::UICAssetVisitor *v) { m_visitor = v; if (m_ApplicationCore) @@ -678,7 +678,7 @@ void CNDDView::setAssetVisitor(uic::UICAssetVisitor *v) INDDView &INDDView::Create(ITimeProvider &inProvider, IWindowSystem &inWindowSystem, IAudioPlayer *inAudioPlayer) { - return *QT3DS_NEW(uic::render::g_BaseAllocator, CNDDView)(inProvider, inWindowSystem, + return *QT3DS_NEW(qt3ds::render::g_BaseAllocator, CNDDView)(inProvider, inWindowSystem, inAudioPlayer); } diff --git a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateEngine.h b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateEngine.h index 64118554..464fd3a5 100644 --- a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateEngine.h +++ b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateEngine.h @@ -47,7 +47,7 @@ namespace Q3DStudio { class ITimeProvider; } -namespace uic { +namespace qt3ds { namespace state { class IInputStreamFactory; @@ -93,7 +93,7 @@ namespace state { QT3DS_STATE_API static INDDStateEngine * Create(qt3ds::foundation::NVScopedRefCounted<qt3ds::NVFoundation> inFoundation, qt3ds::foundation::NVScopedRefCounted<qt3ds::foundation::IStringTable> inStringTable, - qt3ds::foundation::NVScopedRefCounted<uic::state::IInputStreamFactory> + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IInputStreamFactory> inInputStreamFactory, Q3DStudio::ITimeProvider &inTimeProvider); diff --git a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateInputStreamFactory.h b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateInputStreamFactory.h index 11552f42..a4e387ab 100644 --- a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateInputStreamFactory.h +++ b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateInputStreamFactory.h @@ -36,7 +36,7 @@ #include "Qt3DSStateConfig.h" -namespace uic { +namespace qt3ds { namespace state { class IRefCountedInputStream : public qt3ds::foundation::ISeekableIOStream, diff --git a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h index 06b0e04f..c42bbadb 100644 --- a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h +++ b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h @@ -40,7 +40,7 @@ struct lua_State; //============================================================================== // Namespace //============================================================================== -namespace uic { +namespace qt3ds { namespace state { class INDDStateApplication; @@ -84,7 +84,7 @@ namespace state { virtual void DisableMultithreadedAccess() = 0; public: // Settings - virtual void SetApplication(uic::state::INDDStateApplication &inApplication) = 0; + virtual void SetApplication(qt3ds::state::INDDStateApplication &inApplication) = 0; public: // Binary preloading // Starts preloading scripts offline. This sets m_LuaState to NULL until after diff --git a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h index 4e842921..81228328 100644 --- a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h +++ b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h @@ -33,7 +33,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "UICTypes.h" -namespace uic { +namespace qt3ds { namespace state { class INDDStateApplication : public qt3ds::foundation::NVRefCounted diff --git a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateContext.h b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateContext.h index 3142c119..2a869b07 100644 --- a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateContext.h +++ b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateContext.h @@ -44,7 +44,7 @@ namespace Q3DStudio { class ITimeProvider; } -namespace uic { +namespace qt3ds { namespace state { class INDDStateFactory; @@ -54,7 +54,7 @@ namespace state { qt3ds::foundation::NVScopedRefCounted<qt3ds::NVFoundation> m_Foundation; qt3ds::NVAllocatorCallback &m_Allocator; qt3ds::foundation::NVScopedRefCounted<qt3ds::foundation::IStringTable> m_StringTable; - qt3ds::foundation::NVScopedRefCounted<uic::state::IInputStreamFactory> m_InputStreamFactory; + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IInputStreamFactory> m_InputStreamFactory; Q3DStudio::ITimeProvider &m_TimeProvider; qt3ds::foundation::NVScopedRefCounted<INDDStateFactory> m_Factory; eastl::string m_ProjectDir; @@ -63,7 +63,7 @@ namespace state { SNDDStateContext( qt3ds::foundation::NVScopedRefCounted<qt3ds::NVFoundation> inFoundation, qt3ds::foundation::NVScopedRefCounted<qt3ds::foundation::IStringTable> inStringTable, - qt3ds::foundation::NVScopedRefCounted<uic::state::IInputStreamFactory> + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IInputStreamFactory> inInputStreamFactory, Q3DStudio::ITimeProvider &inTimeProvider, const char *inProjectDir) : m_Foundation(inFoundation) diff --git a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateFactory.h b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateFactory.h index 1482d11d..2d4aee22 100644 --- a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateFactory.h +++ b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateFactory.h @@ -32,13 +32,13 @@ #include "foundation/Qt3DSRefCounted.h" -namespace uic { +namespace qt3ds { namespace state { class IVisualStateContext; } } -namespace uic { +namespace qt3ds { namespace evt { class IEventSystem; } @@ -57,7 +57,7 @@ namespace Q3DStudio { class ITimeProvider; } -namespace uic { +namespace qt3ds { namespace state { struct SNDDStateContext; @@ -77,16 +77,16 @@ namespace state { virtual void OnCreate(const qt3ds::foundation::CRegisteredString &inId, IStateInterpreter &inStateInterpreter) = 0; }; - virtual uic::state::INDDStateScriptBridge &GetScriptEngine() = 0; - virtual uic::state::IVisualStateContext &GetVisualStateContext() = 0; - virtual uic::evt::IEventSystem &GetEventSystem() = 0; + virtual qt3ds::state::INDDStateScriptBridge &GetScriptEngine() = 0; + virtual qt3ds::state::IVisualStateContext &GetVisualStateContext() = 0; + virtual qt3ds::evt::IEventSystem &GetEventSystem() = 0; virtual qt3ds::NVFoundationBase &GetFoundation() = 0; virtual qt3ds::foundation::IStringTable &GetStringTable() = 0; virtual Q3DStudio::ITimeProvider &GetTimeProvider() = 0; - virtual uic::state::IInputStreamFactory &GetInputStreamFactory() = 0; + virtual qt3ds::state::IInputStreamFactory &GetInputStreamFactory() = 0; - virtual uic::state::INDDStateApplication *GetApplication() = 0; - virtual void SetApplication(uic::state::INDDStateApplication *inApplication) = 0; + virtual qt3ds::state::INDDStateApplication *GetApplication() = 0; + virtual void SetApplication(qt3ds::state::INDDStateApplication *inApplication) = 0; virtual void SetStateInterpreterCreateCallback( IStateInterpreterCreateCallback &inStateInterpreterCreateCallback) = 0; diff --git a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateLuaEngine.h b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateLuaEngine.h index f9b324f0..5a3d766b 100644 --- a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateLuaEngine.h +++ b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateLuaEngine.h @@ -55,7 +55,7 @@ namespace Q3DStudio { class ITimeProvider; } -namespace uic { +namespace qt3ds { namespace state { struct SNDDStateContext; @@ -77,7 +77,7 @@ namespace state { virtual ~INDDStateLuaEngine() {} public: // Public functions but not functions on the script bridge - virtual uic::state::IStateInterpreter * + virtual qt3ds::state::IStateInterpreter * CreateStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) = 0; virtual void PreInitialize() = 0; @@ -85,7 +85,7 @@ namespace state { virtual void Shutdown(qt3ds::NVFoundationBase &inFoundation) = 0; public: - static INDDStateLuaEngine *Create(uic::state::SNDDStateContext &inContext); + static INDDStateLuaEngine *Create(qt3ds::state::SNDDStateContext &inContext); }; } } diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp index 566ebffa..5dc6d633 100644 --- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp +++ b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp @@ -58,7 +58,7 @@ namespace { -using namespace uic::state; +using namespace qt3ds::state; using qt3ds::NVFoundationBase; using qt3ds::foundation::NVConstDataRef; using qt3ds::foundation::IDOMReader; @@ -358,7 +358,7 @@ struct SStateCallbackConnection : public INDDStateEngine::IStateEventHandlerConn QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(m_Alloc) }; -struct SStateInterpreterEventHandler : public uic::state::IStateInterpreterEventHandler +struct SStateInterpreterEventHandler : public qt3ds::state::IStateInterpreterEventHandler { public: SStateInterpreterResource &m_StateInterpreterResource; @@ -370,7 +370,7 @@ public: virtual ~SStateInterpreterEventHandler() {} - void OnInterpreterEvent(uic::state::InterpreterEventTypes::Enum inEvent, + void OnInterpreterEvent(qt3ds::state::InterpreterEventTypes::Enum inEvent, qt3ds::foundation::CRegisteredString inEventId) override; }; @@ -388,14 +388,14 @@ struct SStateInterpreterResource : public qt3ds::foundation::NVRefCounted { public: qt3ds::NVAllocatorCallback &m_Allocator; - uic::state::IStateInterpreter *m_StateInterpreter; + qt3ds::state::IStateInterpreter *m_StateInterpreter; private: SStateEventHandlersWithLock m_StateEventHandlersWithLock; public: SStateInterpreterEventHandler *m_StateInterpreterEventHandler; - uic::state::TSignalConnectionPtr m_SignalConnection; + qt3ds::state::TSignalConnectionPtr m_SignalConnection; volatile QT3DSI32 mRefCount; @@ -453,7 +453,7 @@ public: return theResult.second; } - void TriggerCallbackOnEvent(uic::state::InterpreterEventTypes::Enum inEvent, + void TriggerCallbackOnEvent(qt3ds::state::InterpreterEventTypes::Enum inEvent, const qt3ds::foundation::CRegisteredString &inEventId) { qt3ds::foundation::Mutex::ScopedLock theLock(m_StateEventHandlersWithLock.m_HandlersLock); @@ -476,7 +476,7 @@ SStateCallbackConnection::~SStateCallbackConnection() } void SStateInterpreterEventHandler::OnInterpreterEvent( - uic::state::InterpreterEventTypes::Enum inEvent, qt3ds::foundation::CRegisteredString inEventId) + qt3ds::state::InterpreterEventTypes::Enum inEvent, qt3ds::foundation::CRegisteredString inEventId) { qCDebug (qt3ds::TRACE_INFO) << "SStateInterpreterEventHandler: OnInterpreterEvent: event type: " << inEvent << " event ID: " << inEventId.c_str(); @@ -488,7 +488,7 @@ typedef eastl::map<qt3ds::foundation::CRegisteredString, TStateInterpreterResourceMap; struct SStateInterpreterCreateCallback - : public uic::state::INDDStateFactory::IStateInterpreterCreateCallback + : public qt3ds::state::INDDStateFactory::IStateInterpreterCreateCallback { public: TStateInterpreterResourceMap &m_StateInterpreterResourceMap; @@ -498,7 +498,7 @@ public: } virtual ~SStateInterpreterCreateCallback() {} void OnCreate(const qt3ds::foundation::CRegisteredString &inId, - uic::state::IStateInterpreter &inStateInterpreter) override + qt3ds::state::IStateInterpreter &inStateInterpreter) override { TStateInterpreterResourceMap::iterator thePos = m_StateInterpreterResourceMap.find(inId); if (thePos == m_StateInterpreterResourceMap.end()) { @@ -512,7 +512,7 @@ public: } }; -struct SApp : public uic::state::INDDStateApplication +struct SApp : public qt3ds::state::INDDStateApplication { public: typedef nvvector<eastl::pair<CRegisteredString, NVScopedRefCounted<SRefCountedAssetValue>>> @@ -563,7 +563,7 @@ public: bool LoadUIA(IDOMReader &inReader, NVFoundationBase &fnd) { m_IsLoaded = false; - NVConstDataRef<uic::state::SElementReference> theStateReferences; + NVConstDataRef<qt3ds::state::SElementReference> theStateReferences; { IDOMReader::Scope __preparseScope(inReader); theStateReferences = @@ -764,12 +764,12 @@ public: } }; -class CNDDStateEngine : public uic::state::INDDStateEngine +class CNDDStateEngine : public qt3ds::state::INDDStateEngine { public: qt3ds::foundation::NVScopedRefCounted<qt3ds::NVFoundation> m_Foundation; qt3ds::foundation::NVScopedRefCounted<qt3ds::foundation::IStringTable> m_StringTable; - qt3ds::foundation::NVScopedRefCounted<uic::state::IInputStreamFactory> m_InputStreamFactory; + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IInputStreamFactory> m_InputStreamFactory; Q3DStudio::ITimeProvider &m_TimeProvider; qt3ds::foundation::NVScopedRefCounted<SNDDStateContext> m_Context; @@ -784,7 +784,7 @@ public: CNDDStateEngine( qt3ds::foundation::NVScopedRefCounted<qt3ds::NVFoundation> inFoundation, qt3ds::foundation::NVScopedRefCounted<qt3ds::foundation::IStringTable> inStringTable, - qt3ds::foundation::NVScopedRefCounted<uic::state::IInputStreamFactory> inInputStreamFactory, + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IInputStreamFactory> inInputStreamFactory, Q3DStudio::ITimeProvider &inTimeProvider); virtual ~CNDDStateEngine(); @@ -812,7 +812,7 @@ public: CNDDStateEngine::CNDDStateEngine( qt3ds::foundation::NVScopedRefCounted<qt3ds::NVFoundation> inFoundation, qt3ds::foundation::NVScopedRefCounted<qt3ds::foundation::IStringTable> inStringTable, - qt3ds::foundation::NVScopedRefCounted<uic::state::IInputStreamFactory> inInputStreamFactory, + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IInputStreamFactory> inInputStreamFactory, Q3DStudio::ITimeProvider &inTimeProvider) : m_Foundation(inFoundation) , m_StringTable(inStringTable) @@ -984,7 +984,7 @@ void CNDDStateEngine::FireEvent(const char *inEventName, unsigned long long inDe << "CNDDStateEngine::FireEvent: Find null state machine " << inMachineId; return; } - uic::state::IStateInterpreter *theStateInterpreter = + qt3ds::state::IStateInterpreter *theStateInterpreter = theStateInterpreterResource->m_StateInterpreter; if (!theStateInterpreter) { qCCritical (qt3ds::INVALID_OPERATION) @@ -1019,7 +1019,7 @@ void CNDDStateEngine::FireEvent(const char *inEventName, bool inIsExternal, cons << "CNDDStateEngine::FireEvent: Find null state machine " << inMachineId; return; } - uic::state::IStateInterpreter *theStateInterpreter = + qt3ds::state::IStateInterpreter *theStateInterpreter = theStateInterpreterResource->m_StateInterpreter; if (!theStateInterpreter) { qCCritical (qt3ds::INVALID_OPERATION) @@ -1053,7 +1053,7 @@ void CNDDStateEngine::CancelEvent(const char *inCancelId, const char *inMachineI << "CNDDStateEngine::FireEvent: Find null state machine " << inMachineId; return; } - uic::state::IStateInterpreter *theStateInterpreter = + qt3ds::state::IStateInterpreter *theStateInterpreter = theStateInterpreterResource->m_StateInterpreter; if (!theStateInterpreter) { qCCritical (qt3ds::INVALID_OPERATION) @@ -1076,7 +1076,7 @@ class SUICFNDTimer : public Q3DStudio::ITimeProvider qt3ds::foundation::MallocAllocator g_BaseAllocator; -class CNDDStateEngineDefault : public uic::state::INDDStateEngine +class CNDDStateEngineDefault : public qt3ds::state::INDDStateEngine { public: qt3ds::foundation::CAllocator m_Allocator; @@ -1089,7 +1089,7 @@ public: , m_Foundation(NVCreateFoundation(QT3DS_FOUNDATION_VERSION, m_Allocator)) , m_RealEngine(*QT3DS_NEW(m_Foundation->getAllocator(), CNDDStateEngine)( m_Foundation, &qt3ds::foundation::IStringTable::CreateStringTable(m_Allocator), - &uic::state::IInputStreamFactory::Create(*m_Foundation), m_TimeProvider)) + &qt3ds::state::IInputStreamFactory::Create(*m_Foundation), m_TimeProvider)) { } virtual ~CNDDStateEngineDefault() { NVDelete(m_Foundation->getAllocator(), &m_RealEngine); } @@ -1117,13 +1117,13 @@ public: }; } -namespace uic { +namespace qt3ds { namespace state { INDDStateEngine *INDDStateEngine::Create( qt3ds::foundation::NVScopedRefCounted<qt3ds::NVFoundation> inFoundation, qt3ds::foundation::NVScopedRefCounted<qt3ds::foundation::IStringTable> inStringTable, - qt3ds::foundation::NVScopedRefCounted<uic::state::IInputStreamFactory> inInputStreamFactory, + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IInputStreamFactory> inInputStreamFactory, Q3DStudio::ITimeProvider &inTimeProvider) { return QT3DS_NEW(inFoundation->getAllocator(), CNDDStateEngine)( diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateFactory.cpp b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateFactory.cpp index c889c15f..f12a13ce 100644 --- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateFactory.cpp +++ b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateFactory.cpp @@ -53,12 +53,12 @@ namespace { class CNDDStateFactory; -struct SVisualStateHandler : public uic::state::IVisualStateInterpreterFactory, - public uic::state::IVisualStateCommandHandler +struct SVisualStateHandler : public qt3ds::state::IVisualStateInterpreterFactory, + public qt3ds::state::IVisualStateCommandHandler { qt3ds::NVAllocatorCallback &m_Allocator; CNDDStateFactory &m_Factory; - uic::state::INDDStateFactory::IStateInterpreterCreateCallback *m_StateInterpreterCreateCallback; + qt3ds::state::INDDStateFactory::IStateInterpreterCreateCallback *m_StateInterpreterCreateCallback; qt3ds::QT3DSI32 mRefCount; public: @@ -70,7 +70,7 @@ public: { } void - SetStateInterpreterCreateCallback(uic::state::INDDStateFactory::IStateInterpreterCreateCallback + SetStateInterpreterCreateCallback(qt3ds::state::INDDStateFactory::IStateInterpreterCreateCallback &inStateInterpreterCreateCallback) { m_StateInterpreterCreateCallback = &inStateInterpreterCreateCallback; @@ -84,28 +84,28 @@ public: QT3DS_IMPLEMENT_REF_COUNT_RELEASE(m_Allocator); } - uic::state::IStateInterpreter *OnNewStateMachine(const char8_t *inPath, + qt3ds::state::IStateInterpreter *OnNewStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) override; - void Handle(const uic::state::SVisualStateCommand &inCommand, - uic::state::IScriptContext &inScriptContext) override; + void Handle(const qt3ds::state::SVisualStateCommand &inCommand, + qt3ds::state::IScriptContext &inScriptContext) override; }; -class CNDDStateFactory : public uic::state::INDDStateFactory +class CNDDStateFactory : public qt3ds::state::INDDStateFactory { public: - uic::state::SNDDStateContext &m_Context; - qt3ds::foundation::NVScopedRefCounted<uic::state::INDDStateLuaEngine> m_ScriptBridge; - qt3ds::foundation::NVScopedRefCounted<uic::state::IVisualStateContext> m_VisualStateContext; - qt3ds::foundation::NVScopedRefCounted<uic::evt::IEventSystem> m_EventSystem; - uic::state::INDDStateApplication *m_Application; + qt3ds::state::SNDDStateContext &m_Context; + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::INDDStateLuaEngine> m_ScriptBridge; + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IVisualStateContext> m_VisualStateContext; + qt3ds::foundation::NVScopedRefCounted<qt3ds::evt::IEventSystem> m_EventSystem; + qt3ds::state::INDDStateApplication *m_Application; SVisualStateHandler *m_VisualStateHandler; - uic::state::INDDStateFactory::IStateInterpreterCreateCallback *m_StateInterpreterCreateCallback; + qt3ds::state::INDDStateFactory::IStateInterpreterCreateCallback *m_StateInterpreterCreateCallback; qt3ds::QT3DSI32 m_RefCount; - CNDDStateFactory(uic::state::SNDDStateContext &inContext) + CNDDStateFactory(qt3ds::state::SNDDStateContext &inContext) : m_Context(inContext) , m_ScriptBridge(0) , m_VisualStateContext(0) @@ -138,19 +138,19 @@ public: } } - uic::state::INDDStateScriptBridge &GetScriptEngine() override + qt3ds::state::INDDStateScriptBridge &GetScriptEngine() override { if (m_ScriptBridge == NULL) { - m_ScriptBridge = uic::state::INDDStateLuaEngine::Create(m_Context); + m_ScriptBridge = qt3ds::state::INDDStateLuaEngine::Create(m_Context); m_ScriptBridge->PreInitialize(); } return *m_ScriptBridge; } - uic::state::IVisualStateContext &GetVisualStateContext() override + qt3ds::state::IVisualStateContext &GetVisualStateContext() override { if (!m_VisualStateContext) { - m_VisualStateContext = uic::state::IVisualStateContext::Create( + m_VisualStateContext = qt3ds::state::IVisualStateContext::Create( *m_Context.m_Foundation, m_Context.GetStringTable()); SVisualStateHandler *newHandle = QT3DS_NEW(m_Context.m_Foundation->getAllocator(), @@ -162,23 +162,23 @@ public: } return *m_VisualStateContext; } - uic::evt::IEventSystem &GetEventSystem() override + qt3ds::evt::IEventSystem &GetEventSystem() override { if (!m_EventSystem) { - m_EventSystem = uic::evt::IEventSystem::Create(*m_Context.m_Foundation); + m_EventSystem = qt3ds::evt::IEventSystem::Create(*m_Context.m_Foundation); } return *m_EventSystem; } qt3ds::foundation::IStringTable &GetStringTable() override { return m_Context.GetStringTable(); } qt3ds::NVFoundationBase &GetFoundation() override { return *m_Context.m_Foundation.mPtr; } Q3DStudio::ITimeProvider &GetTimeProvider() override { return m_Context.m_TimeProvider; } - uic::state::IInputStreamFactory &GetInputStreamFactory() override + qt3ds::state::IInputStreamFactory &GetInputStreamFactory() override { return *m_Context.m_InputStreamFactory; } - uic::state::INDDStateApplication *GetApplication() override { return m_Application; } - void SetApplication(uic::state::INDDStateApplication *inApplication) override + qt3ds::state::INDDStateApplication *GetApplication() override { return m_Application; } + void SetApplication(qt3ds::state::INDDStateApplication *inApplication) override { m_Application = inApplication; if (inApplication) { @@ -200,11 +200,11 @@ public: } }; -uic::state::IStateInterpreter * +qt3ds::state::IStateInterpreter * SVisualStateHandler::OnNewStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) { - uic::state::IStateInterpreter *theInterpreter = + qt3ds::state::IStateInterpreter *theInterpreter = m_Factory.m_ScriptBridge->CreateStateMachine(inPath, inId, inDatamodelFunction); if (m_StateInterpreterCreateCallback) m_StateInterpreterCreateCallback->OnCreate( @@ -212,15 +212,15 @@ SVisualStateHandler::OnNewStateMachine(const char8_t *inPath, const char8_t *inI return theInterpreter; } -void SVisualStateHandler::Handle(const uic::state::SVisualStateCommand &inCommand, - uic::state::IScriptContext &inScriptContext) +void SVisualStateHandler::Handle(const qt3ds::state::SVisualStateCommand &inCommand, + qt3ds::state::IScriptContext &inScriptContext) { (void)inCommand; (void)inScriptContext; } } -namespace uic { +namespace qt3ds { namespace state { INDDStateFactory &INDDStateFactory::Create(SNDDStateContext &inContext) diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateInputStreamFactory.cpp b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateInputStreamFactory.cpp index 40b15fa0..2fd3dffa 100644 --- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateInputStreamFactory.cpp +++ b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateInputStreamFactory.cpp @@ -43,7 +43,7 @@ #include "foundation/Qt3DSMutex.h" #include <QFile> -using namespace uic::state; +using namespace qt3ds::state; using qt3ds::foundation::CFileTools; namespace { diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp index 3099466b..0bc9e261 100644 --- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp +++ b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp @@ -115,7 +115,7 @@ const char *KEY_ONUPDATE = "onUpdate"; struct SLuaEngineImpl; namespace __SLuaEngineImpl_Basic_Structs__ { - struct SLuaEngineListener : public uic::state::debugger::ILuaSideListener + struct SLuaEngineListener : public qt3ds::state::debugger::ILuaSideListener { qt3ds::NVFoundationBase &m_Foundation; SLuaEngineImpl &m_Engine; @@ -194,7 +194,7 @@ namespace __SLuaEngineImpl_Basic_Structs__ { { FILE *m_File; bool m_EOF; - qt3ds::foundation::NVScopedRefCounted<uic::state::IRefCountedInputStream> m_InputStream; + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IRefCountedInputStream> m_InputStream; eastl::vector<char8_t> m_Buffer; SUserFile() @@ -207,7 +207,7 @@ namespace __SLuaEngineImpl_Basic_Structs__ { , m_EOF(false) { } - SUserFile(uic::state::IRefCountedInputStream &stream) + SUserFile(qt3ds::state::IRefCountedInputStream &stream) : m_File(0) , m_InputStream(stream) , m_EOF(false) @@ -330,7 +330,7 @@ using namespace __SLuaEngineImpl_Basic_Structs__; //} namespace { - uic::state::IInputStreamFactory *g_InputStreamFactory; + qt3ds::state::IInputStreamFactory *g_InputStreamFactory; void *lua_user_fopen(const char *filename, const char *mode, char *absfilename) { @@ -354,7 +354,7 @@ namespace { return 0; } }*/ - uic::state::IRefCountedInputStream *stream = + qt3ds::state::IRefCountedInputStream *stream = g_InputStreamFactory->GetStreamForFile(filename, true); if (stream) { if (absfilename) { @@ -524,7 +524,7 @@ namespace { const char *inBasePath, eastl::string &scriptBuffer //, qt3ds::foundation::IPerfTimer& inPerfTimer , - uic::state::IInputStreamFactory &inStreamFactory, + qt3ds::state::IInputStreamFactory &inStreamFactory, eastl::vector<char8_t> &inLoadVec) { qt3ds::foundation::CFileTools::CombineBaseAndRelative(inBasePath, inRelativePath, @@ -539,8 +539,8 @@ namespace { if (lua_isnil(inLuaState, -1)) { // SStackPerfTimer __perfTimer( inPerfTimer, "Load Lua File" ); lua_pop(inLuaState, 1); - uic::state::IInputStreamFactory &theFactory(inStreamFactory); - qt3ds::foundation::NVScopedRefCounted<uic::state::IRefCountedInputStream> theStream = + qt3ds::state::IInputStreamFactory &theFactory(inStreamFactory); + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::IRefCountedInputStream> theStream = theFactory.GetStreamForFile(inRelativePath, true); inLoadVec.clear(); @@ -568,25 +568,25 @@ namespace { } eastl::vector<eastl::string> g_AdditionalSharedLibraryPaths; -uic::state::TLuaLibraryLoader LoadLuaLibraries = +qt3ds::state::TLuaLibraryLoader LoadLuaLibraries = luaL_openlibs; ///< Defaults to open all lua libraries lua_user_file_io g_engine_file_io; lua_Alloc g_engine_alloc = MemoryAllocator; -struct SLuaEngineImpl : public uic::state::INDDStateLuaEngine +struct SLuaEngineImpl : public qt3ds::state::INDDStateLuaEngine { typedef eastl::vector<eastl::string> TStringList; - uic::state::SNDDStateContext &m_Context; + qt3ds::state::SNDDStateContext &m_Context; lua_State *m_LuaState; - uic::state::INDDStateApplication *m_Application; + qt3ds::state::INDDStateApplication *m_Application; INT32 m_CallbackIndex; INT32 m_ServerPort; ///<port number of remote debugger eastl::string m_ScriptString; eastl::string m_ServerIP; - qt3ds::foundation::NVScopedRefCounted<uic::state::debugger::ILuaDebugger> m_LuaDebugger; + qt3ds::foundation::NVScopedRefCounted<qt3ds::state::debugger::ILuaDebugger> m_LuaDebugger; qt3ds::foundation::NVScopedRefCounted<SLuaEngineListener> m_LuaListener; lua_State *m_PreloadState; @@ -605,7 +605,7 @@ struct SLuaEngineImpl : public uic::state::INDDStateLuaEngine bool m_ProfileActive; eastl::vector<SLuaPerfEvent> m_PerfStack; - SLuaEngineImpl(uic::state::SNDDStateContext &inContext); + SLuaEngineImpl(qt3ds::state::SNDDStateContext &inContext); virtual ~SLuaEngineImpl(); QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(m_Context.GetAllocator()) @@ -614,7 +614,7 @@ struct SLuaEngineImpl : public uic::state::INDDStateLuaEngine void EnableMultithreadedAccess() override; void DisableMultithreadedAccess() override; - void SetApplication(uic::state::INDDStateApplication &inApplication) override; + void SetApplication(qt3ds::state::INDDStateApplication &inApplication) override; // virtual void BeginPreloadScripts( const eastl::vector<const char*>& inScripts, //uic::render::IThreadPool& inThreadPool, const char* inProjectDir ); @@ -634,7 +634,7 @@ struct SLuaEngineImpl : public uic::state::INDDStateLuaEngine void StepGC() override; // functions from CLuaEngine - uic::state::IStateInterpreter *CreateStateMachine(const char8_t *inPath, + qt3ds::state::IStateInterpreter *CreateStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) override; void PreInitialize() override; @@ -801,7 +801,7 @@ namespace __SLuaEngineImpl_Basic_Structs__ { /** * Constructor */ -SLuaEngineImpl::SLuaEngineImpl(uic::state::SNDDStateContext &inContext) +SLuaEngineImpl::SLuaEngineImpl(qt3ds::state::SNDDStateContext &inContext) : m_Context(inContext) , m_LuaState(0) , m_Application(0) @@ -882,7 +882,7 @@ void SLuaEngineImpl::DisableMultithreadedAccess() m_MultithreadedMutex = 0; } -void SLuaEngineImpl::SetApplication(uic::state::INDDStateApplication &inApplication) +void SLuaEngineImpl::SetApplication(qt3ds::state::INDDStateApplication &inApplication) { LUA_ENGINE_MULTITHREAD_PROTECT_METHOD; m_Application = &inApplication; @@ -1120,7 +1120,7 @@ void SLuaEngineImpl::StepGC() * ****************Inherited virtual functions from CLuaEngine ************** */ //============================================================================= -uic::state::IStateInterpreter * +qt3ds::state::IStateInterpreter * SLuaEngineImpl::CreateStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) { @@ -1139,7 +1139,7 @@ SLuaEngineImpl::CreateStateMachine(const char8_t *inPath, const char8_t *inId, eastl::string fullPath; qt3ds::foundation::CFileTools::CombineBaseAndRelative(m_Context.GetProjectDir(), inPath, fullPath); lua_pushstring(m_LuaState, fullPath.c_str()); - uic::state::IStateInterpreter *theInterpreter = 0; + qt3ds::state::IStateInterpreter *theInterpreter = 0; int error = PCall(1, 1, 0); if (error) { qCCritical(qt3ds::INVALID_OPERATION, "Failed to load scxml file: %s", @@ -1187,11 +1187,11 @@ SLuaEngineImpl::CreateStateMachine(const char8_t *inPath, const char8_t *inId, // If all that worked then we should have the state machine and the datatable on the stack // and only those two on the stack. // At which point we can call start, which will pop everything off the stack - uic::state::ILuaScriptContext::Initialize(m_LuaState, inId); + qt3ds::state::ILuaScriptContext::Initialize(m_LuaState, inId); // Now get the interpreter from the map so we can get its value lua_getfield(m_LuaState, LUA_REGISTRYINDEX, "uic_state_machines"); lua_getfield(m_LuaState, -1, inId); - theInterpreter = uic::state::ILuaScriptContext::GetInterpreterFromBindings(m_LuaState); + theInterpreter = qt3ds::state::ILuaScriptContext::GetInterpreterFromBindings(m_LuaState); } return theInterpreter; } @@ -1490,12 +1490,12 @@ namespace __SLuaEngineImpl_Static_Global_Lua_Exporter_Declaration__ { lua_getfield(inLuaState, LUA_REGISTRYINDEX, "uic_lua_engine"); SLuaEngineImpl *theEngine = (SLuaEngineImpl *)(lua_touserdata(inLuaState, -1)); - uic::state::debugger::IDebugger *theDebugger = 0; + qt3ds::state::debugger::IDebugger *theDebugger = 0; // if ( theEngine ) //{ // theDebugger = &theEngine->m_Application->GetStateDebugger(); //} - return uic::state::ILuaScriptContext::ParseSCXML(inLuaState, theDebugger, + return qt3ds::state::ILuaScriptContext::ParseSCXML(inLuaState, theDebugger, *theEngine->m_Context.m_Foundation, theEngine->m_Context.GetStringTable()); } @@ -1524,9 +1524,9 @@ namespace __SLuaEngineImpl_Static_Global_Lua_Exporter_Declaration__ { lua_getfield(inLuaState, LUA_REGISTRYINDEX, "uic_lua_engine"); SLuaEngineImpl *theEngine = (SLuaEngineImpl *)(lua_touserdata(inLuaState, -1)); lua_pop(inLuaState, 1); - uic::evt::IEventSystem &theEventSystem = + qt3ds::evt::IEventSystem &theEventSystem = theEngine->m_Context.m_Factory->GetEventSystem(); - uic::evt::SLuaEventPollerBinding::WrapEventPoller(inLuaState, theEventSystem); + qt3ds::evt::SLuaEventPollerBinding::WrapEventPoller(inLuaState, theEventSystem); lua_pushvalue(inLuaState, -1); lua_setfield(inLuaState, LUA_REGISTRYINDEX, "uic_event_system"); } @@ -1558,7 +1558,7 @@ namespace __SLuaEngineImpl_Static_Global_Lua_Exporter_Declaration__ { */ //============================================================================= //============================================================================== -namespace uic { +namespace qt3ds { namespace state { INDDStateLuaEngine *INDDStateLuaEngine::Create(SNDDStateContext &inContext) { diff --git a/src/Runtime/Source/Runtime/Include/UICActivationManager.h b/src/Runtime/Source/Runtime/Include/UICActivationManager.h index 6ca5eecf..bd9cd7b1 100644 --- a/src/Runtime/Source/Runtime/Include/UICActivationManager.h +++ b/src/Runtime/Source/Runtime/Include/UICActivationManager.h @@ -52,13 +52,13 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace render { class IThreadPool; } } -namespace uic { +namespace qt3ds { namespace runtime { using namespace qt3ds::foundation; using namespace qt3ds; @@ -67,7 +67,7 @@ namespace runtime { using Q3DStudio::IComponentTimeOverrideFinishedCallback; using Q3DStudio::CPresentation; using Q3DStudio::TTimeUnit; - using uic::render::IThreadPool; + using qt3ds::render::IThreadPool; class IActivationManager; diff --git a/src/Runtime/Source/Runtime/Include/UICAnimationSystem.h b/src/Runtime/Source/Runtime/Include/UICAnimationSystem.h index 54a0f79d..0fecb6ca 100644 --- a/src/Runtime/Source/Runtime/Include/UICAnimationSystem.h +++ b/src/Runtime/Source/Runtime/Include/UICAnimationSystem.h @@ -39,7 +39,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace runtime { using namespace qt3ds; using namespace qt3ds::foundation; diff --git a/src/Runtime/Source/Runtime/Include/UICApplication.h b/src/Runtime/Source/Runtime/Include/UICApplication.h index 1c5e4c66..f1490382 100644 --- a/src/Runtime/Source/Runtime/Include/UICApplication.h +++ b/src/Runtime/Source/Runtime/Include/UICApplication.h @@ -46,7 +46,7 @@ class CInputEngine; class IAudioPlayer; } -namespace uic { +namespace qt3ds { namespace state { namespace debugger { class IDebugger; @@ -55,7 +55,7 @@ class ISceneGraphRuntimeDebugger; } } -namespace uic { +namespace qt3ds { class UICAssetVisitor; namespace runtime { using namespace qt3ds::foundation; @@ -110,8 +110,8 @@ public: virtual Q3DStudio::IRuntimeFactoryCore &GetRuntimeFactoryCore() = 0; virtual void HideFPS(bool flag) = 0; - virtual uic::state::debugger::ISceneGraphRuntimeDebugger &GetSceneGraphDebugger() = 0; - virtual uic::state::debugger::IDebugger &GetStateDebugger() = 0; + virtual qt3ds::state::debugger::ISceneGraphRuntimeDebugger &GetSceneGraphDebugger() = 0; + virtual qt3ds::state::debugger::IDebugger &GetStateDebugger() = 0; virtual IActivityZoneManager &GetActivityZoneManager() = 0; virtual IElementAllocator &GetElementAllocator() = 0; @@ -140,7 +140,7 @@ public: // Runs any queued runnables. virtual bool HasCompletedLoading() = 0; - virtual void setAssetVisitor(uic::UICAssetVisitor *) = 0; + virtual void setAssetVisitor(qt3ds::UICAssetVisitor *) = 0; // will force loading to end if endLoad hasn't been called yet. Will fire off loading // of resources that need to be uploaded to opengl. Maintains reference to runtime factory diff --git a/src/Runtime/Source/Runtime/Include/UICApplicationValues.h b/src/Runtime/Source/Runtime/Include/UICApplicationValues.h index 03914d4a..987d6e4b 100644 --- a/src/Runtime/Source/Runtime/Include/UICApplicationValues.h +++ b/src/Runtime/Source/Runtime/Include/UICApplicationValues.h @@ -32,7 +32,7 @@ #include "foundation/Qt3DSDiscriminatedUnion.h" #include "foundation/StringTable.h" -namespace uic { +namespace qt3ds { class UICAssetVisitor { @@ -204,29 +204,29 @@ namespace runtime { namespace qt3ds { namespace foundation { template <> - struct DestructTraits<uic::runtime::SPresentationAsset> + struct DestructTraits<qt3ds::runtime::SPresentationAsset> { - void destruct(uic::runtime::SPresentationAsset &) {} + void destruct(qt3ds::runtime::SPresentationAsset &) {} }; template <> - struct DestructTraits<uic::runtime::SSCXMLAsset> + struct DestructTraits<qt3ds::runtime::SSCXMLAsset> { - void destruct(uic::runtime::SSCXMLAsset &) {} + void destruct(qt3ds::runtime::SSCXMLAsset &) {} }; template <> - struct DestructTraits<uic::runtime::SRenderPluginAsset> + struct DestructTraits<qt3ds::runtime::SRenderPluginAsset> { - void destruct(uic::runtime::SRenderPluginAsset &) {} + void destruct(qt3ds::runtime::SRenderPluginAsset &) {} }; template <> - struct DestructTraits<uic::runtime::SBehaviorAsset> + struct DestructTraits<qt3ds::runtime::SBehaviorAsset> { - void destruct(uic::runtime::SBehaviorAsset &) {} + void destruct(qt3ds::runtime::SBehaviorAsset &) {} }; } } -namespace uic { +namespace qt3ds { namespace runtime { // Force compile error if unsupported datatype requested diff --git a/src/Runtime/Source/Runtime/Include/UICBinarySerializationHelper.h b/src/Runtime/Source/Runtime/Include/UICBinarySerializationHelper.h index 5cf63b41..a6b3531c 100644 --- a/src/Runtime/Source/Runtime/Include/UICBinarySerializationHelper.h +++ b/src/Runtime/Source/Runtime/Include/UICBinarySerializationHelper.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSIndexableLinkedList.h" #include "foundation/SerializationTypes.h" -namespace uic { +namespace qt3ds { namespace runtime { template <typename TListType, typename TNodeType> diff --git a/src/Runtime/Source/Runtime/Include/UICBinarySerializerImpl.h b/src/Runtime/Source/Runtime/Include/UICBinarySerializerImpl.h index 12ee50be..ac359439 100644 --- a/src/Runtime/Source/Runtime/Include/UICBinarySerializerImpl.h +++ b/src/Runtime/Source/Runtime/Include/UICBinarySerializerImpl.h @@ -36,7 +36,7 @@ #include "UICBinarySerializer.h" #include "foundation/Qt3DSFoundation.h" -namespace uic { +namespace qt3ds { namespace runtime { class IAnimationSystem; class ISlideSystem; diff --git a/src/Runtime/Source/Runtime/Include/UICElementSystem.h b/src/Runtime/Source/Runtime/Include/UICElementSystem.h index a46d70e5..a894a49e 100644 --- a/src/Runtime/Source/Runtime/Include/UICElementSystem.h +++ b/src/Runtime/Source/Runtime/Include/UICElementSystem.h @@ -60,7 +60,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace runtime { using namespace qt3ds::foundation; using namespace qt3ds; @@ -460,7 +460,7 @@ namespace runtime { { SetFlag(inFlag, inValue ? true : false); } - uic::runtime::IActivityZone &GetActivityZone() const; + qt3ds::runtime::IActivityZone &GetActivityZone() const; bool HasActivityZone() const; // Floating point number differences above this trigger a setDirty call. static float SmallestDifference() { return 0.000001f; } diff --git a/src/Runtime/Source/Runtime/Include/UICIComponentManager.h b/src/Runtime/Source/Runtime/Include/UICIComponentManager.h index 121270ff..831fd86a 100644 --- a/src/Runtime/Source/Runtime/Include/UICIComponentManager.h +++ b/src/Runtime/Source/Runtime/Include/UICIComponentManager.h @@ -36,7 +36,7 @@ // Includes //============================================================================== -namespace uic { +namespace qt3ds { namespace runtime { namespace element { struct TElement; diff --git a/src/Runtime/Source/Runtime/Include/UICIScene.h b/src/Runtime/Source/Runtime/Include/UICIScene.h index cb985f7b..a7040a0c 100644 --- a/src/Runtime/Source/Runtime/Include/UICIScene.h +++ b/src/Runtime/Source/Runtime/Include/UICIScene.h @@ -34,7 +34,7 @@ #include "foundation/StringTable.h" #include "foundation/Qt3DSBounds3.h" #include "UICBoundingBox.h" -namespace uic { +namespace qt3ds { namespace render { class IImageLoadListener; } @@ -165,7 +165,7 @@ public: // Base Interface virtual Q3DStudio::INT32 LoadImageBatch(qt3ds::foundation::CRegisteredString *inFullPaths, INT32 inNumPaths, qt3ds::foundation::CRegisteredString inDefaultImage, - uic::render::IImageLoadListener *inLoadCallback = NULL) = 0; + qt3ds::render::IImageLoadListener *inLoadCallback = NULL) = 0; virtual SMousePosition WindowToPresentation(const SMousePosition &inWindowPos) = 0; diff --git a/src/Runtime/Source/Runtime/Include/UICIScriptBridge.h b/src/Runtime/Source/Runtime/Include/UICIScriptBridge.h index 14682e9c..d1b424ea 100644 --- a/src/Runtime/Source/Runtime/Include/UICIScriptBridge.h +++ b/src/Runtime/Source/Runtime/Include/UICIScriptBridge.h @@ -37,20 +37,20 @@ //============================================================================== // Namespace //============================================================================== -namespace uic { +namespace qt3ds { namespace runtime { class IApplication; class IApplicationCore; } } -namespace uic { +namespace qt3ds { namespace state { namespace debugger { class IMultiProtocolSocket; } } } -namespace uic { +namespace qt3ds { namespace render { class IThreadPool; } @@ -129,15 +129,15 @@ public: // thread virtual void DisableMultithreadedAccess() = 0; public: // Settings - virtual void SetApplicationCore(uic::runtime::IApplicationCore &inApplication) = 0; - virtual void SetApplication(uic::runtime::IApplication &inApplication) = 0; + virtual void SetApplicationCore(qt3ds::runtime::IApplicationCore &inApplication) = 0; + virtual void SetApplication(qt3ds::runtime::IApplication &inApplication) = 0; public: // Binary preloading // Starts preloading scripts offline. This sets m_LuaState to NULL until after // EndPreloadScripts // This function is only used for binary loading, eg, .uiab virtual void BeginPreloadScripts(const eastl::vector<const char *> &inScripts, - uic::render::IThreadPool &inThreadPool, + qt3ds::render::IThreadPool &inThreadPool, const char *inProjectDir) = 0; // This function is blocking if m_LuaState == NULL, which only holds during binary loading virtual void EndPreloadScripts() = 0; @@ -192,7 +192,7 @@ public: // Multimedia virtual bool PlaySoundFile(const char *soundPath) = 0; public: // Miscellaneous - virtual void EnableDebugging(uic::state::debugger::IMultiProtocolSocket &socket) = 0; + virtual void EnableDebugging(qt3ds::state::debugger::IMultiProtocolSocket &socket) = 0; virtual void EnableProfiling() = 0; virtual void StepGC() = 0; }; diff --git a/src/Runtime/Source/Runtime/Include/UICInputEngine.h b/src/Runtime/Source/Runtime/Include/UICInputEngine.h index aa83bd26..55aaaf29 100644 --- a/src/Runtime/Source/Runtime/Include/UICInputEngine.h +++ b/src/Runtime/Source/Runtime/Include/UICInputEngine.h @@ -42,7 +42,7 @@ //============================================================================== // Namespace //============================================================================== -namespace uic { +namespace qt3ds { namespace runtime { class IApplication; } @@ -70,7 +70,7 @@ protected: SInputFrame m_InputFrame; ///< The data describing the input state eastl::vector<eastl::pair<float, float>> m_PickInput; bool m_BeginPickInput; - uic::runtime::IApplication *m_Application; ///< The Runtime object + qt3ds::runtime::IApplication *m_Application; ///< The Runtime object qt3ds::foundation::NVScopedRefCounted<CInputEventProvider> m_InputEventProvider; ///< The event provider for keyboard @@ -83,7 +83,7 @@ public: // Construction virtual ~CInputEngine(); public: // Runtime interfaces - void SetApplication(uic::runtime::IApplication *inApplication); + void SetApplication(qt3ds::runtime::IApplication *inApplication); public: // Access diff --git a/src/Runtime/Source/Runtime/Include/UICKernelTypes.h b/src/Runtime/Source/Runtime/Include/UICKernelTypes.h index 879b134a..1ae1bdf6 100644 --- a/src/Runtime/Source/Runtime/Include/UICKernelTypes.h +++ b/src/Runtime/Source/Runtime/Include/UICKernelTypes.h @@ -35,7 +35,7 @@ //============================================================================== #include "UICArray.h" -namespace uic { +namespace qt3ds { namespace runtime { namespace element { struct SElement; @@ -45,8 +45,8 @@ namespace runtime { } namespace Q3DStudio { -typedef uic::runtime::element::SElement TElement; -typedef uic::runtime::element::SComponent TComponent; +typedef qt3ds::runtime::element::SElement TElement; +typedef qt3ds::runtime::element::SComponent TComponent; } //============================================================================== // Namespace diff --git a/src/Runtime/Source/Runtime/Include/UICLogicSystem.h b/src/Runtime/Source/Runtime/Include/UICLogicSystem.h index a9d23f2a..cb72f547 100644 --- a/src/Runtime/Source/Runtime/Include/UICLogicSystem.h +++ b/src/Runtime/Source/Runtime/Include/UICLogicSystem.h @@ -32,7 +32,7 @@ #define UIC_LOGIC_SYSTEM_H #include "UICElementSystem.h" -namespace uic { +namespace qt3ds { namespace runtime { class ILogicSystem : public NVRefCounted diff --git a/src/Runtime/Source/Runtime/Include/UICLuaElementHelper.h b/src/Runtime/Source/Runtime/Include/UICLuaElementHelper.h index 6c075b06..71ef5aad 100644 --- a/src/Runtime/Source/Runtime/Include/UICLuaElementHelper.h +++ b/src/Runtime/Source/Runtime/Include/UICLuaElementHelper.h @@ -35,7 +35,7 @@ //============================================================================== #include "UICLuaIncludes.h" -namespace uic { +namespace qt3ds { namespace runtime { class IApplication; } @@ -62,7 +62,7 @@ private: // Constructors virtual ~CLuaElementHelper(); public: // Lua Global Functions - static TElement *GetElement(uic::runtime::IApplication &inApplication, + static TElement *GetElement(qt3ds::runtime::IApplication &inApplication, IPresentation *inDefaultPresentation, const char *inPath, TElement *inStartElement = NULL); static int GetElement(lua_State *inLuaState); diff --git a/src/Runtime/Source/Runtime/Include/UICLuaEngine.h b/src/Runtime/Source/Runtime/Include/UICLuaEngine.h index e598159d..2d701ccc 100644 --- a/src/Runtime/Source/Runtime/Include/UICLuaEngine.h +++ b/src/Runtime/Source/Runtime/Include/UICLuaEngine.h @@ -48,7 +48,7 @@ #include "foundation/Qt3DSSync.h" #include "foundation/Qt3DSMutex.h" -namespace uic { +namespace qt3ds { namespace state { class IStateInterpreter; } @@ -120,7 +120,7 @@ public: virtual ~CLuaEngine() {} public: // Public functions but not functions on the script bridge - virtual uic::state::IStateInterpreter * + virtual qt3ds::state::IStateInterpreter * CreateStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) = 0; virtual void PreInitialize() = 0; diff --git a/src/Runtime/Source/Runtime/Include/UICLuaHelper.h b/src/Runtime/Source/Runtime/Include/UICLuaHelper.h index c1e2fc79..f7c954d0 100644 --- a/src/Runtime/Source/Runtime/Include/UICLuaHelper.h +++ b/src/Runtime/Source/Runtime/Include/UICLuaHelper.h @@ -41,7 +41,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace runtime { class IApplication; } @@ -68,11 +68,11 @@ private: // Constructors public: // Lua Global Functions static UINT8 GetArgument(lua_State *inLuaState, INT32 inIndex, UVariant &outValue, qt3ds::foundation::IStringTable &strTable, - uic::runtime::IApplication &application); + qt3ds::runtime::IApplication &application); static INT32 PushArgument(lua_State *inLuaState, const UINT8 inType, UVariant &inValue, qt3ds::foundation::IStringTable &strTable, - uic::runtime::IApplication &application); + qt3ds::runtime::IApplication &application); }; } // namespace Q3DStudio diff --git a/src/Runtime/Source/Runtime/Include/UICParametersSystem.h b/src/Runtime/Source/Runtime/Include/UICParametersSystem.h index 9fc8051a..a6b08de8 100644 --- a/src/Runtime/Source/Runtime/Include/UICParametersSystem.h +++ b/src/Runtime/Source/Runtime/Include/UICParametersSystem.h @@ -42,7 +42,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace runtime { using namespace qt3ds; using namespace qt3ds::foundation; diff --git a/src/Runtime/Source/Runtime/Include/UICPresentation.h b/src/Runtime/Source/Runtime/Include/UICPresentation.h index 98cb34b7..ad1e51d7 100644 --- a/src/Runtime/Source/Runtime/Include/UICPresentation.h +++ b/src/Runtime/Source/Runtime/Include/UICPresentation.h @@ -54,14 +54,14 @@ Q_SIGNALS: void SigSlideExited(const QString &elementPath, unsigned int index, const QString &name); }; -namespace uic { +namespace qt3ds { namespace runtime { class IApplication; class IActivityZone; } } -namespace uic { +namespace qt3ds { namespace render { class ILoadedBuffer; } @@ -83,9 +83,9 @@ class CPresentation : public IPresentation protected: QString m_Name; ///< Name of ths presentation QString m_FilePath; ///< The full path from which this presentation was loaded - uic::runtime::IApplication *m_Application; ///< Runtime object + qt3ds::runtime::IApplication *m_Application; ///< Runtime object IScene *m_Scene; ///< Connection to the associated scene (render) for this presentation - uic::runtime::IActivityZone *m_ActivityZone; ///< Controls element active status. + qt3ds::runtime::IActivityZone *m_ActivityZone; ///< Controls element active status. TElement *m_RootElement; CPresentationFrameData m_FrameData; ///< Storage of data of the current frame @@ -94,7 +94,7 @@ protected: CEventCallbacks m_EventCallbacks; ///< Handles event callbacks on registered elements SPresentationSize m_Size; ///< Native width, height and mode exported from Studio - qt3ds::foundation::NVScopedRefCounted<uic::render::ILoadedBuffer> + qt3ds::foundation::NVScopedRefCounted<qt3ds::render::ILoadedBuffer> m_LoadedBuffer; ///< Reference to loaded data when loading from binary. CComponentManager m_ComponentManager; @@ -121,7 +121,7 @@ protected: // Methods //============================================================================== public: // Construction - CPresentation(const CHAR *inName, uic::runtime::IApplication *inRuntime); + CPresentation(const CHAR *inName, qt3ds::runtime::IApplication *inRuntime); virtual ~CPresentation(); public: // Execution @@ -143,8 +143,8 @@ public: // Bridge Control IScriptBridge *GetScriptBridgeQml() override; void SetScene(IScene *inScene) override; - void SetActivityZone(uic::runtime::IActivityZone *inZone); - uic::runtime::IActivityZone *GetActivityZone() override { return m_ActivityZone; } + void SetActivityZone(qt3ds::runtime::IActivityZone *inZone); + qt3ds::runtime::IActivityZone *GetActivityZone() override { return m_ActivityZone; } void SetActive(bool inValue); bool GetActive() const; TElement *GetRoot() override { return m_RootElement; } @@ -185,12 +185,12 @@ public: // Managers ILogicSystem &GetLogicSystem() override; IParametersSystem &GetParametersSystem() override; qt3ds::foundation::IStringTable &GetStringTable() override; - uic::runtime::IApplication &GetApplication() override + qt3ds::runtime::IApplication &GetApplication() override { QT3DS_ASSERT(m_Application); return *m_Application; } - void SetLoadedBuffer(uic::render::ILoadedBuffer &inBuffer); + void SetLoadedBuffer(qt3ds::render::ILoadedBuffer &inBuffer); void SetElementPath(TElement &inElement, const char8_t *inPath) override; qt3ds::foundation::CRegisteredString GetElementPath(TElement &inElement) override; diff --git a/src/Runtime/Source/Runtime/Include/UICQmlElementHelper.h b/src/Runtime/Source/Runtime/Include/UICQmlElementHelper.h index ed82af78..c2c07d9b 100644 --- a/src/Runtime/Source/Runtime/Include/UICQmlElementHelper.h +++ b/src/Runtime/Source/Runtime/Include/UICQmlElementHelper.h @@ -50,7 +50,7 @@ private: // Constructors virtual ~CQmlElementHelper(); public: // Lua Global Functions - static TElement *GetElement(uic::runtime::IApplication &inApplication, + static TElement *GetElement(qt3ds::runtime::IApplication &inApplication, IPresentation *inDefaultPresentation, const char *inPath, TElement *inStartElement = NULL); diff --git a/src/Runtime/Source/Runtime/Include/UICQmlEngine.h b/src/Runtime/Source/Runtime/Include/UICQmlEngine.h index fccce025..a0fa4a46 100644 --- a/src/Runtime/Source/Runtime/Include/UICQmlEngine.h +++ b/src/Runtime/Source/Runtime/Include/UICQmlEngine.h @@ -204,7 +204,7 @@ public: // Public functions but not functions on the script bridge */ virtual void Shutdown(qt3ds::NVFoundationBase &inFoundation) = 0; - virtual uic::runtime::IApplication *GetApplication() = 0; + virtual qt3ds::runtime::IApplication *GetApplication() = 0; public: /** diff --git a/src/Runtime/Source/Runtime/Include/UICRuntimeFactory.h b/src/Runtime/Source/Runtime/Include/UICRuntimeFactory.h index 75376cd7..b127abcb 100644 --- a/src/Runtime/Source/Runtime/Include/UICRuntimeFactory.h +++ b/src/Runtime/Source/Runtime/Include/UICRuntimeFactory.h @@ -35,7 +35,7 @@ //============================================================================== #include "UICTimer.h" #include "foundation/Qt3DSRefCounted.h" -namespace uic { +namespace qt3ds { namespace render { class IInputStreamFactory; class IUICRenderContext; @@ -43,20 +43,20 @@ namespace render { } } -namespace uic { +namespace qt3ds { namespace runtime { class IApplication; class IApplicationCore; } } -namespace uic { +namespace qt3ds { namespace state { class IVisualStateContext; } } -namespace uic { +namespace qt3ds { namespace evt { class IEventSystem; } @@ -102,18 +102,18 @@ public: virtual ISceneBinaryLoader &GetSceneLoader() = 0; virtual IScriptBridge &GetScriptEngine() = 0; virtual IScriptBridge &GetScriptEngineQml() = 0; - virtual uic::render::IUICRenderContextCore &GetUICRenderContextCore() = 0; - virtual uic::render::IInputStreamFactory &GetInputStreamFactory() = 0; - virtual uic::state::IVisualStateContext &GetVisualStateContext() = 0; - virtual uic::evt::IEventSystem &GetEventSystem() = 0; + virtual qt3ds::render::IUICRenderContextCore &GetUICRenderContextCore() = 0; + virtual qt3ds::render::IInputStreamFactory &GetInputStreamFactory() = 0; + virtual qt3ds::state::IVisualStateContext &GetVisualStateContext() = 0; + virtual qt3ds::evt::IEventSystem &GetEventSystem() = 0; virtual ITimeProvider &GetTimeProvider() = 0; virtual qt3ds::NVFoundationBase &GetFoundation() = 0; virtual qt3ds::foundation::IPerfTimer &GetPerfTimer() = 0; virtual qt3ds::foundation::IStringTable &GetStringTable() = 0; virtual void AddSearchPath(const char8_t *inFile) = 0; virtual void SetDllDir(const char *inDir) = 0; - virtual uic::runtime::IApplicationCore *GetApplicationCore() = 0; - virtual void SetApplicationCore(uic::runtime::IApplicationCore *app) = 0; + virtual qt3ds::runtime::IApplicationCore *GetApplicationCore() = 0; + virtual void SetApplicationCore(qt3ds::runtime::IApplicationCore *app) = 0; }; //============================================================================== /** @@ -129,9 +129,9 @@ protected: //============================================================================== public: virtual ISceneManager &GetSceneManager() = 0; - virtual uic::render::IUICRenderContext &GetUICRenderContext() = 0; - virtual uic::runtime::IApplication *GetApplication() = 0; - virtual void SetApplication(uic::runtime::IApplication *app) = 0; + virtual qt3ds::render::IUICRenderContext &GetUICRenderContext() = 0; + virtual qt3ds::runtime::IApplication *GetApplication() = 0; + virtual void SetApplication(qt3ds::runtime::IApplication *app) = 0; }; } // namespace Q3DStudio diff --git a/src/Runtime/Source/Runtime/Include/UICSceneManager.h b/src/Runtime/Source/Runtime/Include/UICSceneManager.h index f6fa15fd..52047ae5 100644 --- a/src/Runtime/Source/Runtime/Include/UICSceneManager.h +++ b/src/Runtime/Source/Runtime/Include/UICSceneManager.h @@ -47,7 +47,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace render { class IUICRenderContextCore; class ILoadedBuffer; @@ -89,7 +89,7 @@ public: // threadsafe // returns a handle to the loaded object. Return value of zero means error. virtual qt3ds::QT3DSU32 LoadSceneStage1(qt3ds::foundation::CRegisteredString inPresentationDirectory, - uic::render::ILoadedBuffer &inData) = 0; + qt3ds::render::ILoadedBuffer &inData) = 0; // threadsafe // still does not require openGL context but has dependency on a few other things. diff --git a/src/Runtime/Source/Runtime/Include/UICSlideSystem.h b/src/Runtime/Source/Runtime/Include/UICSlideSystem.h index eebc8415..64d43419 100644 --- a/src/Runtime/Source/Runtime/Include/UICSlideSystem.h +++ b/src/Runtime/Source/Runtime/Include/UICSlideSystem.h @@ -36,7 +36,7 @@ namespace Q3DStudio { class ILogicManager; } -namespace uic { +namespace qt3ds { namespace runtime { class ILogicSystem; class IAnimationSystem; diff --git a/src/Runtime/Source/Runtime/Source/UICActivationManager.cpp b/src/Runtime/Source/Runtime/Source/UICActivationManager.cpp index 3b6a9c0f..0fa4c57f 100644 --- a/src/Runtime/Source/Runtime/Source/UICActivationManager.cpp +++ b/src/Runtime/Source/Runtime/Source/UICActivationManager.cpp @@ -46,9 +46,9 @@ #include "foundation/Qt3DSSync.h" #include "UICRenderThreadPool.h" -using namespace uic::runtime; -using namespace uic::runtime::element; -using uic::render::IThreadPool; +using namespace qt3ds::runtime; +using namespace qt3ds::runtime::element; +using qt3ds::render::IThreadPool; using qt3ds::foundation::Time; namespace { diff --git a/src/Runtime/Source/Runtime/Source/UICAnimationSystem.cpp b/src/Runtime/Source/Runtime/Source/UICAnimationSystem.cpp index 3f62bd01..0174a1c7 100644 --- a/src/Runtime/Source/Runtime/Source/UICAnimationSystem.cpp +++ b/src/Runtime/Source/Runtime/Source/UICAnimationSystem.cpp @@ -46,8 +46,8 @@ #include "foundation/Qt3DSIndexableLinkedList.h" #include "UICBinarySerializationHelper.h" -using namespace uic::runtime; -using namespace uic::runtime::element; +using namespace qt3ds::runtime; +using namespace qt3ds::runtime::element; namespace { diff --git a/src/Runtime/Source/Runtime/Source/UICApplication.cpp b/src/Runtime/Source/Runtime/Source/UICApplication.cpp index aef4f8b6..668e70c3 100644 --- a/src/Runtime/Source/Runtime/Source/UICApplication.cpp +++ b/src/Runtime/Source/Runtime/Source/UICApplication.cpp @@ -83,11 +83,11 @@ #include <QtCore/qlibraryinfo.h> #include <QtCore/qpair.h> -using namespace uic; -using namespace uic::runtime; +using namespace qt3ds; +using namespace qt3ds::runtime; using namespace Q3DStudio; -using uic::state::debugger::ISceneGraphRuntimeDebugger; -using uic::state::debugger::SSGPropertyChange; +using qt3ds::state::debugger::ISceneGraphRuntimeDebugger; +using qt3ds::state::debugger::SSGPropertyChange; namespace qt3ds { namespace foundation { @@ -228,10 +228,10 @@ public: virtual void OnGraphicsInitialized(IRuntimeFactory &inFactory) = 0; virtual bool HasCompletedLoading() = 0; static IAppLoadContext &CreateXMLLoadContext( - SApp &inApp, NVConstDataRef<uic::state::SElementReference> inStateReferences, + SApp &inApp, NVConstDataRef<qt3ds::state::SElementReference> inStateReferences, const char8_t *inScaleMode); static IAppLoadContext &CreateBinaryLoadContext(SApp &inApp, - uic::render::ScaleModes::Enum inScaleMode, + qt3ds::render::ScaleModes::Enum inScaleMode, NVDataRef<QT3DSU8> inStrTableData); }; @@ -452,8 +452,8 @@ struct SApp : public IApplication nvvector<eastl::pair<SBehaviorAsset, bool>> m_Behaviors; NVScopedRefCounted<SocketSystem> m_SocketSystem; NVScopedRefCounted<SocketStream> m_ServerStream; - NVScopedRefCounted<uic::state::debugger::IMultiProtocolSocket> m_ProtocolSocket; - NVScopedRefCounted<uic::state::debugger::IDebugger> m_StateDebugger; + NVScopedRefCounted<qt3ds::state::debugger::IMultiProtocolSocket> m_ProtocolSocket; + NVScopedRefCounted<qt3ds::state::debugger::IDebugger> m_StateDebugger; NVScopedRefCounted<ISceneGraphRuntimeDebugger> m_SceneGraphDebugger; NVScopedRefCounted<IActivityZoneManager> m_ActivityZoneManager; NVScopedRefCounted<IElementAllocator> m_ElementAllocator; @@ -570,7 +570,7 @@ struct SApp : public IApplication } } - void setAssetVisitor(uic::UICAssetVisitor *v) override + void setAssetVisitor(qt3ds::UICAssetVisitor *v) override { m_visitor = v; } @@ -911,10 +911,10 @@ struct SApp : public IApplication m_ChangeBuffer.push_back(SSGPropertyChange()); QT3DSI32 active = theElement.GetActive() ? 1 : 0; m_ChangeBuffer.back().m_Hash = CHash::HashAttribute("active"); - m_ChangeBuffer.back().m_Value = uic::state::debugger::SSGValue(active); + m_ChangeBuffer.back().m_Value = qt3ds::state::debugger::SSGValue(active); for (long attIdx = 0, attEnd = theElement.GetAttributeCount(); attIdx < attEnd; ++attIdx) { - Option<uic::runtime::element::TPropertyDescAndValuePtr> theValue = + Option<qt3ds::runtime::element::TPropertyDescAndValuePtr> theValue = theElement.GetPropertyByIndex(attIdx); m_ChangeBuffer.push_back(SSGPropertyChange()); SSGPropertyChange &theChange(m_ChangeBuffer.back()); @@ -925,27 +925,27 @@ struct SApp : public IApplication case ATTRIBUTETYPE_BOOL: case ATTRIBUTETYPE_INT32: theChange.m_Value = - uic::state::debugger::SSGValue( + qt3ds::state::debugger::SSGValue( (QT3DSI32)theValue->second->m_INT32); break; case ATTRIBUTETYPE_FLOAT: theChange.m_Value = - uic::state::debugger::SSGValue(theValue->second->m_FLOAT); + qt3ds::state::debugger::SSGValue(theValue->second->m_FLOAT); break; case ATTRIBUTETYPE_STRING: { CRegisteredString data = m_CoreFactory->GetStringTable().HandleToStr( theValue->second->m_StringHandle); - theChange.m_Value = uic::state::debugger::SSGValue(data); + theChange.m_Value = qt3ds::state::debugger::SSGValue(data); } break; case ATTRIBUTETYPE_POINTER: { void *ptrVal = theValue->second->m_VoidPointer; QT3DSU64 coercedVal = (QT3DSU64)ptrVal; - theChange.m_Value = uic::state::debugger::SSGValue(coercedVal); + theChange.m_Value = qt3ds::state::debugger::SSGValue(coercedVal); } break; case ATTRIBUTETYPE_ELEMENTREF: { void *ptrVal = GetElementByHandle(theValue->second->m_ElementHandle); QT3DSU64 coercedVal = (QT3DSU64)ptrVal; - theChange.m_Value = uic::state::debugger::SSGValue(coercedVal); + theChange.m_Value = qt3ds::state::debugger::SSGValue(coercedVal); } break; default: QT3DS_ASSERT(false); @@ -1048,7 +1048,7 @@ struct SApp : public IApplication theFile); // Check if the file event exists eastl::string fullPath; - NVScopedRefCounted<uic::render::IRefCountedInputStream> theStream + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream = m_CoreFactory->GetUICRenderContextCore().GetInputStreamFactory().GetStreamForFile( theFile.c_str()); if (theStream) { @@ -1096,7 +1096,7 @@ struct SApp : public IApplication bool LoadUIA(IDOMReader &inReader, NVFoundationBase &fnd) { - NVConstDataRef<uic::state::SElementReference> theStateReferences; + NVConstDataRef<qt3ds::state::SElementReference> theStateReferences; { IDOMReader::Scope __preparseScope(inReader); theStateReferences = m_CoreFactory->GetVisualStateContext().PreParseDocument(inReader); @@ -1228,7 +1228,7 @@ struct SApp : public IApplication if (m_ServerStream) { m_ServerStream->setTimeout(QT3DS_MAX_U32); // This system declares protocols, we don't listen for new ones. - m_ProtocolSocket = uic::state::debugger::IMultiProtocolSocket::CreateProtocolSocket( + m_ProtocolSocket = qt3ds::state::debugger::IMultiProtocolSocket::CreateProtocolSocket( fnd, *m_ServerStream, m_CoreFactory->GetStringTable(), NULL); if (!m_ProtocolSocket->Initialize()) { m_ProtocolSocket = NULL; @@ -1239,7 +1239,7 @@ struct SApp : public IApplication m_DebugSettings->m_Server.c_str(), m_DebugSettings->m_Port); } else { - using namespace uic::state::debugger; + using namespace qt3ds::state::debugger; theBridge.EnableDebugging(*m_ProtocolSocket); NVScopedRefCounted<IMultiProtocolSocketStream> socketStream = m_ProtocolSocket->CreateProtocol( @@ -1306,7 +1306,7 @@ struct SApp : public IApplication RegisterAsset(SPresentationAsset(RegisterStr(filename.c_str()), RegisterStr(relativePath.c_str()))); m_AppLoadContext = IAppLoadContext::CreateXMLLoadContext( - *this, NVDataRef<uic::state::SElementReference>(), ""); + *this, NVDataRef<qt3ds::state::SElementReference>(), ""); retval = true; } else if (extension.comparei("uia") == 0) { @@ -1687,8 +1687,8 @@ struct SApp : public IApplication } QT3DSU32 theScaleMode = 0; theInStream.Read(&theScaleMode, 1); - uic::render::ScaleModes::Enum theProperScaleMode - = static_cast<uic::render::ScaleModes::Enum>(theScaleMode); + qt3ds::render::ScaleModes::Enum theProperScaleMode + = static_cast<qt3ds::render::ScaleModes::Enum>(theScaleMode); theInStream.Read(m_WatermarkCoordinates); m_UIAFileSettings.Load(theInStream); @@ -1878,17 +1878,17 @@ struct SApp : public IApplication return *m_MetaData; } - uic::state::debugger::IDebugger &GetStateDebugger() override + qt3ds::state::debugger::IDebugger &GetStateDebugger() override { if (!m_StateDebugger) - m_StateDebugger = uic::state::debugger::IDebugger::CreateDebugger(); + m_StateDebugger = qt3ds::state::debugger::IDebugger::CreateDebugger(); return *m_StateDebugger; } - uic::state::debugger::ISceneGraphRuntimeDebugger &GetSceneGraphDebugger() override + qt3ds::state::debugger::ISceneGraphRuntimeDebugger &GetSceneGraphDebugger() override { if (!m_SceneGraphDebugger) - m_SceneGraphDebugger = uic::state::debugger::ISceneGraphRuntimeDebugger::Create( + m_SceneGraphDebugger = qt3ds::state::debugger::ISceneGraphRuntimeDebugger::Create( m_CoreFactory->GetFoundation(), m_CoreFactory->GetStringTable()); return *m_SceneGraphDebugger; } @@ -1912,10 +1912,10 @@ struct SXMLLoader : public IAppLoadContext { SApp &m_App; eastl::string m_ScaleMode; - eastl::vector<uic::state::SElementReference> m_References; + eastl::vector<qt3ds::state::SElementReference> m_References; QT3DSI32 mRefCount; - SXMLLoader(SApp &inApp, const char8_t *sc, NVConstDataRef<uic::state::SElementReference> refs) + SXMLLoader(SApp &inApp, const char8_t *sc, NVConstDataRef<qt3ds::state::SElementReference> refs) : m_App(inApp) , m_ScaleMode(nonNull(sc)) , mRefCount(0) @@ -1999,11 +1999,11 @@ struct SXMLLoader : public IAppLoadContext const char8_t *initialScaleMode(m_ScaleMode.c_str()); // Force loading to finish here, just like used to happen. if (AreEqual(initialScaleMode, "center")) { - inFactory.GetUICRenderContext().SetScaleMode(uic::render::ScaleModes::ExactSize); + inFactory.GetUICRenderContext().SetScaleMode(qt3ds::render::ScaleModes::ExactSize); } else if (AreEqual(initialScaleMode, "fit")) { - inFactory.GetUICRenderContext().SetScaleMode(uic::render::ScaleModes::ScaleToFit); + inFactory.GetUICRenderContext().SetScaleMode(qt3ds::render::ScaleModes::ScaleToFit); } else if (AreEqual(initialScaleMode, "fill")) { - inFactory.GetUICRenderContext().SetScaleMode(uic::render::ScaleModes::ScaleToFill); + inFactory.GetUICRenderContext().SetScaleMode(qt3ds::render::ScaleModes::ScaleToFill); } else { qCCritical(INVALID_PARAMETER, "Unrecognized scale mode attribute value: ", initialScaleMode); @@ -2063,7 +2063,7 @@ struct SLoadingPresentation typedef NVDataRef<SLoadingPresentation> TLoadingPresentationBuffer; -struct SUIBLoadedCallback : public uic::render::IBufferLoaderCallback +struct SUIBLoadedCallback : public qt3ds::render::IBufferLoaderCallback { SApp &m_App; TLoadingPresentationBuffer m_LoadingPresentations; @@ -2103,7 +2103,7 @@ struct SUIBLoadedCallback : public uic::render::IBufferLoaderCallback SetPresentation(*theChild, inPresentation); } - void OnBufferLoaded(uic::render::ILoadedBuffer &inBuffer) override + void OnBufferLoaded(qt3ds::render::ILoadedBuffer &inBuffer) override { eastl::pair<SLoadingPresentation *, QT3DSU32> theBufferData = FindBuffer(inBuffer.Path()); SLoadingPresentation *theLoadingPresentation = theBufferData.first; @@ -2163,7 +2163,7 @@ struct SUIBLoadedCallback : public uic::render::IBufferLoaderCallback void OnBufferLoadCancelled(CRegisteredString inPath) override { SetFailCondition(inPath); } }; -struct SUIBSGLoadedCallback : public uic::render::IBufferLoaderCallback +struct SUIBSGLoadedCallback : public qt3ds::render::IBufferLoaderCallback { SApp &m_App; TLoadingPresentationBuffer m_LoadingPresentations; @@ -2194,7 +2194,7 @@ struct SUIBSGLoadedCallback : public uic::render::IBufferLoaderCallback return eastl::make_pair(theLoadingPresentation, theLoadBufferIdx - 1); } - void OnBufferLoaded(uic::render::ILoadedBuffer &inBuffer) override + void OnBufferLoaded(qt3ds::render::ILoadedBuffer &inBuffer) override { SLoadingPresentation *theLoadingPresentation = FindBuffer(inBuffer.Path()).first; @@ -2223,7 +2223,7 @@ struct SUIBSGLoadedCallback : public uic::render::IBufferLoaderCallback struct SBinaryLoader : public IAppLoadContext, public IAppRunnable { SApp &m_App; - uic::render::ScaleModes::Enum m_ScaleMode; + qt3ds::render::ScaleModes::Enum m_ScaleMode; Mutex m_PresentationInitMutex; NVScopedRefCounted<SUIBLoadedCallback> m_UIBCallback; NVScopedRefCounted<SUIBSGLoadedCallback> m_UIBSGCallback; @@ -2232,7 +2232,7 @@ struct SBinaryLoader : public IAppLoadContext, public IAppRunnable SStackPerfTimer *m_OfflineLoadTimer; QT3DSI32 mRefCount; - SBinaryLoader(SApp &app, uic::render::ScaleModes::Enum sc, NVDataRef<QT3DSU8> inStringTableData) + SBinaryLoader(SApp &app, qt3ds::render::ScaleModes::Enum sc, NVDataRef<QT3DSU8> inStringTableData) : m_App(app) , m_ScaleMode(sc) , m_PresentationInitMutex(app.m_CoreFactory->GetFoundation().getAllocator()) @@ -2241,7 +2241,7 @@ struct SBinaryLoader : public IAppLoadContext, public IAppRunnable new SStackPerfTimer(app.m_CoreFactory->GetPerfTimer(), "Binary Offline Load")) , mRefCount(0) { - using uic::render::IBufferLoader; + using qt3ds::render::IBufferLoader; IBufferLoader &theLoader(m_App.m_CoreFactory->GetUICRenderContextCore().GetBufferLoader()); eastl::string fullpath, directory, filename, extension, sceneGraphPath, presentationPath; IStringTable &theStringTable(m_App.m_CoreFactory->GetStringTable()); @@ -2297,7 +2297,7 @@ struct SBinaryLoader : public IAppLoadContext, public IAppRunnable ~SBinaryLoader() { - using uic::render::IBufferLoader; + using qt3ds::render::IBufferLoader; NVFoundationBase &theBase = m_App.m_CoreFactory->GetUICRenderContextCore().GetFoundation(); IBufferLoader &theLoader(m_App.m_CoreFactory->GetUICRenderContextCore().GetBufferLoader()); (void)theBase; @@ -2341,7 +2341,7 @@ struct SBinaryLoader : public IAppLoadContext, public IAppRunnable void EndLoad() override { - using uic::render::IBufferLoader; + using qt3ds::render::IBufferLoader; IBufferLoader &theLoader(m_App.m_CoreFactory->GetUICRenderContextCore().GetBufferLoader()); while (theLoader.WillLoadedBuffersBeAvailable()) theLoader.NextLoadedBuffer(); @@ -2436,7 +2436,7 @@ struct SBinaryLoader : public IAppLoadContext, public IAppRunnable }; IAppLoadContext &IAppLoadContext::CreateXMLLoadContext( - SApp &inApp, NVConstDataRef<uic::state::SElementReference> inStateReferences, + SApp &inApp, NVConstDataRef<qt3ds::state::SElementReference> inStateReferences, const char8_t *inScaleMode) { return *QT3DS_NEW(inApp.m_CoreFactory->GetFoundation().getAllocator(), @@ -2444,7 +2444,7 @@ IAppLoadContext &IAppLoadContext::CreateXMLLoadContext( } IAppLoadContext &IAppLoadContext::CreateBinaryLoadContext(SApp &inApp, - uic::render::ScaleModes::Enum inScaleMode, + qt3ds::render::ScaleModes::Enum inScaleMode, NVDataRef<QT3DSU8> inStrTableData) { return *QT3DS_NEW(inApp.m_CoreFactory->GetFoundation().getAllocator(), diff --git a/src/Runtime/Source/Runtime/Source/UICBinarySerializerImpl.cpp b/src/Runtime/Source/Runtime/Source/UICBinarySerializerImpl.cpp index 50610bc8..7e3eae1e 100644 --- a/src/Runtime/Source/Runtime/Source/UICBinarySerializerImpl.cpp +++ b/src/Runtime/Source/Runtime/Source/UICBinarySerializerImpl.cpp @@ -59,7 +59,7 @@ using qt3ds::foundation::atomicIncrement; using qt3ds::foundation::atomicDecrement; using qt3ds::QT3DSI32; -using uic::runtime::ISlideSystem; +using qt3ds::runtime::ISlideSystem; using qt3ds::foundation::SDataReader; //============================================================================== @@ -69,7 +69,7 @@ namespace { using namespace qt3ds::foundation; using namespace qt3ds; -using namespace uic::runtime; +using namespace qt3ds::runtime; using Q3DStudio::CFileStream; struct SSerializerDataReadWrapper : public SDataReader @@ -159,20 +159,20 @@ void LoadSystemFromBinary(SSerializerDataReadWrapper &inWrapper, TSystemType &in struct SLoadScript { - uic::runtime::element::SElement *m_Element; + qt3ds::runtime::element::SElement *m_Element; QT3DSU32 m_ScriptHandle; SLoadScript() : m_Element(NULL) { } - SLoadScript(uic::runtime::element::SElement *inElement, QT3DSU32 inStrHandle) + SLoadScript(qt3ds::runtime::element::SElement *inElement, QT3DSU32 inStrHandle) : m_Element(inElement) , m_ScriptHandle(inStrHandle) { } }; -struct SBinarySerializerAppRunnable : public uic::runtime::IAppRunnable +struct SBinarySerializerAppRunnable : public qt3ds::runtime::IAppRunnable { qt3ds::NVFoundationBase &m_Foundation; Q3DStudio::IScriptBridge &m_Bridge; @@ -195,7 +195,7 @@ struct SBinarySerializerAppRunnable : public uic::runtime::IAppRunnable void Run() override { - using uic::runtime::element::SElement; + using qt3ds::runtime::element::SElement; qt3ds::foundation::IStringTable &theStrTable(m_Presentation.GetStringTable()); for (QT3DSU32 idx = 0, end = m_Scripts.size(); idx < end; ++idx) { SElement *theElement = reinterpret_cast<SElement *>( @@ -207,7 +207,7 @@ struct SBinarySerializerAppRunnable : public uic::runtime::IAppRunnable }; void SaveScripts(eastl::vector<SLoadScript> &presentationScripts, - uic::runtime::element::SElement &inElement, CRegisteredString inSrcPathStr, + qt3ds::runtime::element::SElement &inElement, CRegisteredString inSrcPathStr, IElementAllocator &inAlloc) { if (inElement.HasScriptCallbacks()) { @@ -259,7 +259,7 @@ void CBinarySerializer::BinarySave(CPresentation *inPresentation) NVFoundationBase &theFoundation = inPresentation->GetApplication().GetRuntimeFactoryCore().GetFoundation(); - uic::runtime::IElementAllocator &theAllocator = + qt3ds::runtime::IElementAllocator &theAllocator = inPresentation->GetApplication().GetElementAllocator(); SaveSystemToBinary(theStream, inPresentation->GetAnimationSystem(), theFoundation, diff --git a/src/Runtime/Source/Runtime/Source/UICComponentManager.cpp b/src/Runtime/Source/Runtime/Source/UICComponentManager.cpp index 8c9f3335..02e4c411 100644 --- a/src/Runtime/Source/Runtime/Source/UICComponentManager.cpp +++ b/src/Runtime/Source/Runtime/Source/UICComponentManager.cpp @@ -42,7 +42,7 @@ #include "UICActivationManager.h" #include "UICPresentation.h" -using uic::runtime::SSlideKey; +using qt3ds::runtime::SSlideKey; //============================================================================== // Namespace //============================================================================== @@ -178,7 +178,7 @@ void CComponentManager::GotoSlideIndex(TElement *inComponent, inComponent->SetDirty(); m_Presentation.FireEvent(EVENT_ONSLIDEENTER, inComponent); - uic::runtime::IActivityZone *theZone = m_Presentation.GetActivityZone(); + qt3ds::runtime::IActivityZone *theZone = m_Presentation.GetActivityZone(); if (theZone) theZone->OnSlideChange(*inComponent); diff --git a/src/Runtime/Source/Runtime/Source/UICElementSystem.cpp b/src/Runtime/Source/Runtime/Source/UICElementSystem.cpp index b4bc5440..8f7d9175 100644 --- a/src/Runtime/Source/Runtime/Source/UICElementSystem.cpp +++ b/src/Runtime/Source/Runtime/Source/UICElementSystem.cpp @@ -45,7 +45,7 @@ #include "foundation/Qt3DSIndexableLinkedList.h" #include "UICBinarySerializationHelper.h" -using namespace uic::runtime::element; +using namespace qt3ds::runtime::element; using namespace qt3ds; using namespace qt3ds::foundation; using namespace qt3ds::intrinsics; @@ -73,7 +73,7 @@ QT3DSU32 GetNumValueAllocations(const STypeDesc &inTypeDesc) return ((inTypeDesc.m_Properties.size() + SPropertyValueGroup::NumValues - 1) / SPropertyValueGroup::NumValues); } -struct SElementAllocator : public uic::runtime::IElementAllocator +struct SElementAllocator : public qt3ds::runtime::IElementAllocator { typedef Pool<SElement, ForwardingAllocator> TElementPool; typedef Pool<SComponent, ForwardingAllocator> TComponentPool; @@ -497,7 +497,7 @@ struct SElementAllocator : public uic::runtime::IElementAllocator inBuffer.write(theComponent); } else inBuffer.write(inElement); - uic::runtime::SaveIndexableList<TElementPropertyList>( + qt3ds::runtime::SaveIndexableList<TElementPropertyList>( inElement.UnsafeGetFirstPropertyGroup(), inBuffer); if (inElement.m_Child) SaveDFS(inBuffer, *inElement.m_Child, ioElementOffsets); @@ -650,7 +650,7 @@ struct SElementAllocator : public uic::runtime::IElementAllocator theElement->m_Child = RemapElement(theElement->m_Child, retval); theElement->m_Sibling = RemapElement(theElement->m_Sibling, retval); const STypeDesc &theTypeDescription = theElement->GetTypeDescription(); - uic::runtime::LoadIndexableList<TElementPropertyList>( + qt3ds::runtime::LoadIndexableList<TElementPropertyList>( theElement->UnsafeGetFirstPropertyGroup(), theTypeDescription.m_Properties.size(), theReader); } @@ -919,7 +919,7 @@ bool SElement::HasActivityZone() const return m_BelongedPresentation->GetActivityZone() != NULL; } -uic::runtime::IActivityZone &SElement::GetActivityZone() const +qt3ds::runtime::IActivityZone &SElement::GetActivityZone() const { return *m_BelongedPresentation->GetActivityZone(); } @@ -989,8 +989,8 @@ const Q3DStudio::CTimePolicy &SComponent::GetTimePolicy() const return const_cast<SComponent *>(this)->GetTimePolicy(); } -uic::runtime::IElementAllocator & -uic::runtime::IElementAllocator::CreateElementAllocator(NVFoundationBase &inFoundation, +qt3ds::runtime::IElementAllocator & +qt3ds::runtime::IElementAllocator::CreateElementAllocator(NVFoundationBase &inFoundation, IStringTable &inStringTable) { return *QT3DS_NEW(inFoundation.getAllocator(), SElementAllocator)(inFoundation, inStringTable); diff --git a/src/Runtime/Source/Runtime/Source/UICInputEngine.cpp b/src/Runtime/Source/Runtime/Source/UICInputEngine.cpp index 2abc5b46..b1e275a6 100644 --- a/src/Runtime/Source/Runtime/Source/UICInputEngine.cpp +++ b/src/Runtime/Source/Runtime/Source/UICInputEngine.cpp @@ -47,7 +47,7 @@ //============================================================================== namespace Q3DStudio { -class CInputEventProvider : public uic::evt::IEventProvider +class CInputEventProvider : public qt3ds::evt::IEventProvider { int m_RefCount; @@ -73,7 +73,7 @@ public: EType m_Type; virtual SEvent *Clone() const = 0; - virtual SUICEventSystemEvent *GenEventSystemEvent(uic::evt::IEventFactory &inFactory) = 0; + virtual SUICEventSystemEvent *GenEventSystemEvent(qt3ds::evt::IEventFactory &inFactory) = 0; }; struct SKeyboardEvent : public SEvent { @@ -93,7 +93,7 @@ public: { return new SKeyboardEvent(this->m_KeyCode, this->m_KeyEvent); } - SUICEventSystemEvent *GenEventSystemEvent(uic::evt::IEventFactory &inFactory) override + SUICEventSystemEvent *GenEventSystemEvent(qt3ds::evt::IEventFactory &inFactory) override { if (m_KeyEvent == ON_KEYDOWN || m_KeyEvent == ON_KEYUP || m_KeyEvent == ON_KEYREPEAT) { SUICEventSystemEvent &theEvent = inFactory.CreateEvent(3); @@ -141,7 +141,7 @@ public: { return new SKeyboardEvent(this->m_ButtonCode, this->m_ButtonEvent); } - SUICEventSystemEvent *GenEventSystemEvent(uic::evt::IEventFactory &inFactory) override + SUICEventSystemEvent *GenEventSystemEvent(qt3ds::evt::IEventFactory &inFactory) override { if (m_ButtonEvent == ON_BUTTONDOWN || m_ButtonEvent == ON_BUTTONUP || m_ButtonEvent == ON_BUTTONREPEAT) { @@ -172,7 +172,7 @@ public: INT32 m_ButtonCode; UINT32 m_ButtonEvent; }; - size_t GetNextEvents(uic::evt::IEventFactory &inFactory, SUICEventSystemEvent **outBuffer, + size_t GetNextEvents(qt3ds::evt::IEventFactory &inFactory, SUICEventSystemEvent **outBuffer, size_t inBufLenInEvent) override { size_t theEventCount = 0; @@ -242,7 +242,7 @@ CInputEngine::~CInputEngine() * Set the top-level interface of the Runtime object * @param inRuntime the top-level interface of the Runtime object */ -void CInputEngine::SetApplication(uic::runtime::IApplication *inApplication) +void CInputEngine::SetApplication(qt3ds::runtime::IApplication *inApplication) { m_Application = inApplication; // Create this here. If we die before the application does, then the system will crash unless diff --git a/src/Runtime/Source/Runtime/Source/UICLogicSystem.cpp b/src/Runtime/Source/Runtime/Source/UICLogicSystem.cpp index ac749bb2..cfb0f882 100644 --- a/src/Runtime/Source/Runtime/Source/UICLogicSystem.cpp +++ b/src/Runtime/Source/Runtime/Source/UICLogicSystem.cpp @@ -39,10 +39,10 @@ #include "foundation/SerializationTypes.h" #include "foundation/IOStreams.h" -using namespace uic::runtime; +using namespace qt3ds::runtime; using namespace qt3ds::foundation; using namespace qt3ds; -using namespace uic::runtime::element; +using namespace qt3ds::runtime::element; namespace { struct SLogicKey @@ -195,8 +195,8 @@ struct SLogicSystem : public ILogicSystem SLogicKey theKey(inTarget.GetHandle(), inEventName); TLogicKeyHash::const_iterator iter = m_LogicKeys.find(theKey); if (iter != m_LogicKeys.end()) { - uic::runtime::IApplication &theApplication = inPresentation.GetApplication(); - uic::runtime::IElementAllocator &theElemAllocator = + qt3ds::runtime::IApplication &theApplication = inPresentation.GetApplication(); + qt3ds::runtime::IElementAllocator &theElemAllocator = theApplication.GetElementAllocator(); for (TLogicDataList::const_iterator listIter = iter->second.begin(), endIter = iter->second.end(); diff --git a/src/Runtime/Source/Runtime/Source/UICLuaElementHelper.cpp b/src/Runtime/Source/Runtime/Source/UICLuaElementHelper.cpp index 96509876..386d30b6 100644 --- a/src/Runtime/Source/Runtime/Source/UICLuaElementHelper.cpp +++ b/src/Runtime/Source/Runtime/Source/UICLuaElementHelper.cpp @@ -82,7 +82,7 @@ CLuaElementHelper::~CLuaElementHelper() { } -TElement *CLuaElementHelper::GetElement(uic::runtime::IApplication &inApplication, +TElement *CLuaElementHelper::GetElement(qt3ds::runtime::IApplication &inApplication, IPresentation *inDefaultPresentation, const char *inPath, TElement *inStartElement) { @@ -192,8 +192,8 @@ int CLuaElementHelper::GetElement(lua_State *inLuaState) theElement = reinterpret_cast<TElement *>(lua_touserdata(inLuaState, ARG_START)); } lua_getglobal(inLuaState, "UICApplication"); - uic::runtime::IApplication *theApp = - static_cast<uic::runtime::IApplication *>(lua_touserdata(inLuaState, -1)); + qt3ds::runtime::IApplication *theApp = + static_cast<qt3ds::runtime::IApplication *>(lua_touserdata(inLuaState, -1)); if (theApp) theElement = GetElement(*theApp, thePresentation, thePath, theElement); @@ -243,7 +243,7 @@ int CLuaElementHelper::GetAttribute(lua_State *inLuaState) theAttributeKey.m_Hash = CHash::HashAttribute(attName); IPresentation *thePresentation = theElement->GetBelongedPresentation(); - uic::runtime::IApplication &theApplication = thePresentation->GetApplication(); + qt3ds::runtime::IApplication &theApplication = thePresentation->GetApplication(); if (theAttributeKey.m_Hash == SPECIAL_ATTRIBUTE_GLOBAL_ACTIVE) lua_pushboolean(inLuaState, theElement->GetActive()); @@ -254,7 +254,7 @@ int CLuaElementHelper::GetAttribute(lua_State *inLuaState) } else if (theAttributeKey.m_Hash == Q3DStudio::CHash::HashAttribute("path")) { lua_pushstring(inLuaState, theElement->m_Path.c_str()); } else { - Option<uic::runtime::element::TPropertyDescAndValuePtr> thePropertyInfo = + Option<qt3ds::runtime::element::TPropertyDescAndValuePtr> thePropertyInfo = theElement->FindProperty(theAttributeKey.m_Hash); if (thePropertyInfo.hasValue()) { UVariant *theValuePtr = thePropertyInfo->second; @@ -325,7 +325,7 @@ bool CLuaElementHelper::SetAttribute(lua_State *inLuaState, TElement *theElement theElement->SetFlag(ELEMENTFLAG_EXPLICITACTIVE, (lua_toboolean(inLuaState, ARG_VALUE) ? true : false)); } else { - Option<uic::runtime::element::TPropertyDescAndValuePtr> thePropertyInfo = + Option<qt3ds::runtime::element::TPropertyDescAndValuePtr> thePropertyInfo = theElement->FindProperty(theAttributeKey.m_Hash); if (thePropertyInfo.hasValue()) { UVariant theNewValue; diff --git a/src/Runtime/Source/Runtime/Source/UICLuaEngine.cpp b/src/Runtime/Source/Runtime/Source/UICLuaEngine.cpp index 994a1e05..58f22811 100644 --- a/src/Runtime/Source/Runtime/Source/UICLuaEngine.cpp +++ b/src/Runtime/Source/Runtime/Source/UICLuaEngine.cpp @@ -94,8 +94,8 @@ namespace Q3DStudio { #define Q3DStudio_LOG_EVENT(S) #endif -using uic::runtime::IApplicationCore; -using uic::runtime::IApplication; +using qt3ds::runtime::IApplicationCore; +using qt3ds::runtime::IApplication; using namespace qt3ds; // forward declaration of exported lua global functions @@ -212,7 +212,7 @@ namespace __SLuaEngineImpl_Basic_Structs__ { void Release() override; }; - struct SImageLoadCallback : public uic::render::IImageLoadListener + struct SImageLoadCallback : public qt3ds::render::IImageLoadListener { NVFoundationBase &m_Foundation; SLuaEngineImpl *m_Engine; // Note the engine may be null in the case of system shutdown. @@ -227,7 +227,7 @@ namespace __SLuaEngineImpl_Basic_Structs__ { } void OnImageLoadComplete(CRegisteredString inPath, - uic::render::ImageLoadResult::Enum inResult) override; + qt3ds::render::ImageLoadResult::Enum inResult) override; void OnImageBatchComplete(QT3DSU64) override {} @@ -236,7 +236,7 @@ namespace __SLuaEngineImpl_Basic_Structs__ { void release() override; }; - struct SLuaEngineListener : public uic::state::debugger::ILuaSideListener + struct SLuaEngineListener : public qt3ds::state::debugger::ILuaSideListener { NVFoundationBase &m_Foundation; SLuaEngineImpl &m_Engine; @@ -315,7 +315,7 @@ namespace __SLuaEngineImpl_Basic_Structs__ { { bool m_EOF; FILE *m_File; - NVScopedRefCounted<uic::render::IRefCountedInputStream> m_InputStream; + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> m_InputStream; eastl::vector<char8_t> m_Buffer; SUserFile() @@ -328,7 +328,7 @@ namespace __SLuaEngineImpl_Basic_Structs__ { , m_EOF(false) { } - SUserFile(uic::render::IRefCountedInputStream &stream) + SUserFile(qt3ds::render::IRefCountedInputStream &stream) : m_File(NULL) , m_InputStream(stream) , m_EOF(false) @@ -447,7 +447,7 @@ eastl::string CScriptEngineCallFunctionArgRetriever::GetArgDescription() } namespace { - uic::render::IInputStreamFactory *g_InputStreamFactory; + qt3ds::render::IInputStreamFactory *g_InputStreamFactory; void *lua_user_fopen(const char *filename, const char *mode, char *absfilename) { @@ -471,7 +471,7 @@ namespace { return NULL; } }*/ - uic::render::IRefCountedInputStream *stream = + qt3ds::render::IRefCountedInputStream *stream = g_InputStreamFactory->GetStreamForFile(filename, true); if (stream) { if (absfilename) { @@ -669,7 +669,7 @@ namespace { static int EnsureScriptIsLoaded(lua_State *inLuaState, const char *inRelativePath, const char *inBasePath, eastl::string &scriptBuffer, qt3ds::foundation::IPerfTimer &inPerfTimer, - uic::render::IInputStreamFactory &inStreamFactory, + qt3ds::render::IInputStreamFactory &inStreamFactory, eastl::vector<char8_t> &inLoadVec) { qt3ds::foundation::CFileTools::CombineBaseAndRelative(inBasePath, inRelativePath, @@ -684,8 +684,8 @@ namespace { if (lua_isnil(inLuaState, -1)) { SStackPerfTimer __perfTimer(inPerfTimer, "Load Lua File"); lua_pop(inLuaState, 1); - uic::render::IInputStreamFactory &theFactory(inStreamFactory); - NVScopedRefCounted<uic::render::IRefCountedInputStream> theStream = + qt3ds::render::IInputStreamFactory &theFactory(inStreamFactory); + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream = theFactory.GetStreamForFile(inRelativePath, true); inLoadVec.clear(); @@ -735,7 +735,7 @@ struct SLuaEngineImpl : public CLuaEngine INT32 m_ServerPort; ///<port number of remote debugger eastl::string m_ScriptString; eastl::string m_ServerIP; - NVScopedRefCounted<uic::state::debugger::ILuaDebugger> m_LuaDebugger; + NVScopedRefCounted<qt3ds::state::debugger::ILuaDebugger> m_LuaDebugger; NVScopedRefCounted<SLuaEngineListener> m_LuaListener; lua_State *m_PreloadState; @@ -762,11 +762,11 @@ struct SLuaEngineImpl : public CLuaEngine void EnableMultithreadedAccess() override; void DisableMultithreadedAccess() override; - void SetApplicationCore(uic::runtime::IApplicationCore &inApplication) override; - void SetApplication(uic::runtime::IApplication &inApplication) override; + void SetApplicationCore(qt3ds::runtime::IApplicationCore &inApplication) override; + void SetApplication(qt3ds::runtime::IApplication &inApplication) override; void BeginPreloadScripts(const eastl::vector<const char *> &inScripts, - uic::render::IThreadPool &inThreadPool, + qt3ds::render::IThreadPool &inThreadPool, const char *inProjectDir) override; void EndPreloadScripts() override; eastl::vector<eastl::string> GetLoadedScripts() override; @@ -801,12 +801,12 @@ struct SLuaEngineImpl : public CLuaEngine bool PlaySoundFile(const char *soundPath) override; void AddGlobalFunction(const CHAR *inFunctionName, lua_CFunction inFunction) override; - void EnableDebugging(uic::state::debugger::IMultiProtocolSocket &socket) override; + void EnableDebugging(qt3ds::state::debugger::IMultiProtocolSocket &socket) override; void EnableProfiling() override; void StepGC() override; // functions from CLuaEngine - uic::state::IStateInterpreter *CreateStateMachine(const char8_t *inPath, + qt3ds::state::IStateInterpreter *CreateStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) override; void PreInitialize() override; @@ -841,7 +841,7 @@ namespace __SLuaEngineImpl_Static_Calls__ { eastl::string theLuaBinFile = theEngine->m_PreloadProjectDir; CFileTools::CombineBaseAndRelative(theEngine->m_PreloadProjectDir.c_str(), "binary/compiledlua.bin", theLuaBinFile); - NVScopedRefCounted<uic::render::IRefCountedInputStream> theBinFile = + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theBinFile = theEngine->m_ApplicationCore->GetRuntimeFactoryCore() .GetInputStreamFactory() .GetStreamForFile(theLuaBinFile.c_str()); @@ -955,11 +955,11 @@ namespace __SLuaEngineImpl_Static_Calls__ { lua_getfield(inLuaState, LUA_REGISTRYINDEX, "uic_lua_engine"); SLuaEngineImpl *theEngine = (SLuaEngineImpl *)(lua_touserdata(inLuaState, -1)); - uic::state::debugger::IDebugger *theDebugger = NULL; + qt3ds::state::debugger::IDebugger *theDebugger = NULL; if (theEngine) { theDebugger = &theEngine->m_Application->GetStateDebugger(); } - return uic::state::ILuaScriptContext::ParseSCXML( + return qt3ds::state::ILuaScriptContext::ParseSCXML( inLuaState, theDebugger, theEngine->m_Foundation, theEngine->m_ApplicationCore->GetRuntimeFactoryCore().GetStringTable()); } @@ -975,11 +975,11 @@ namespace __SLuaEngineImpl_Basic_Structs__ { } void SImageLoadCallback::OnImageLoadComplete(CRegisteredString inPath, - uic::render::ImageLoadResult::Enum inResult) + qt3ds::render::ImageLoadResult::Enum inResult) { if (m_Engine) { m_Engine->CallImageLoadComplete( - inPath, inResult == uic::render::ImageLoadResult::Succeeded, m_CallbackId); + inPath, inResult == qt3ds::render::ImageLoadResult::Succeeded, m_CallbackId); } } @@ -1120,7 +1120,7 @@ theEngine->m_ApplicationCore->GetRuntimeFactoryCore().GetInputStreamFactory() return 1; }*/ -void SLuaEngineImpl::SetApplicationCore(uic::runtime::IApplicationCore &inApplication) +void SLuaEngineImpl::SetApplicationCore(qt3ds::runtime::IApplicationCore &inApplication) { LUA_ENGINE_MULTITHREAD_PROTECT_METHOD; m_ApplicationCore = &inApplication; @@ -1156,7 +1156,7 @@ void SLuaEngineImpl::SetApplicationCore(uic::runtime::IApplicationCore &inApplic }*/ } -void SLuaEngineImpl::SetApplication(uic::runtime::IApplication &inApplication) +void SLuaEngineImpl::SetApplication(qt3ds::runtime::IApplication &inApplication) { LUA_ENGINE_MULTITHREAD_PROTECT_METHOD; m_Application = &inApplication; @@ -1167,7 +1167,7 @@ void SLuaEngineImpl::SetApplication(uic::runtime::IApplication &inApplication) // Starts preloading scripts offline. This sets m_LuaState to NULL until after EndPreloadScripts to // avoid multithreaded lua state access. Some calls may be queued till EndPreloadScripts void SLuaEngineImpl::BeginPreloadScripts(const eastl::vector<const char *> &inScripts, - uic::render::IThreadPool &inThreadPool, + qt3ds::render::IThreadPool &inThreadPool, const char *inProjDir) { m_PreloadScripts.assign(inScripts.begin(), inScripts.end()); @@ -1469,8 +1469,8 @@ void SLuaEngineImpl::CallFunction(const char *behavior, const char *handler, LUA_ENGINE_MULTITHREAD_PROTECT_METHOD; int theTop = lua_gettop(m_LuaState); lua_getglobal(m_LuaState, "UICApplication"); - uic::runtime::IApplication *theApp = - static_cast<uic::runtime::IApplication *>(lua_touserdata(m_LuaState, -1)); + qt3ds::runtime::IApplication *theApp = + static_cast<qt3ds::runtime::IApplication *>(lua_touserdata(m_LuaState, -1)); lua_pop(m_LuaState, 1); TElement *theBehavior = CLuaElementHelper::GetElement(*theApp, NULL, behavior, NULL); @@ -1558,7 +1558,7 @@ void SLuaEngineImpl::CallFunction(const char *behavior, const char *handler, void SLuaEngineImpl::ProcessCustomActions(IPresentation *inPresentation, const SEventCommand &inCommand) { - using uic::runtime::TIdValuePair; + using qt3ds::runtime::TIdValuePair; LUA_ENGINE_MULTITHREAD_PROTECT_METHOD; TElement *theBehavior = inCommand.m_Target; // the element that is a behavior @@ -1764,8 +1764,8 @@ void SLuaEngineImpl::GotoSlide(const char *component, const char *slideName, LUA_ENGINE_MULTITHREAD_PROTECT_METHOD; int theTop = lua_gettop(m_LuaState); lua_getglobal(m_LuaState, "UICApplication"); - uic::runtime::IApplication *theApp = - static_cast<uic::runtime::IApplication *>(lua_touserdata(m_LuaState, -1)); + qt3ds::runtime::IApplication *theApp = + static_cast<qt3ds::runtime::IApplication *>(lua_touserdata(m_LuaState, -1)); lua_pop(m_LuaState, 1); TElement *theTarget = CLuaElementHelper::GetElement(*theApp, NULL, component, NULL); @@ -1844,17 +1844,17 @@ void SLuaEngineImpl::AddGlobalFunction(const CHAR *inFunctionName, lua_CFunction } } -void SLuaEngineImpl::EnableDebugging(uic::state::debugger::IMultiProtocolSocket &socket) +void SLuaEngineImpl::EnableDebugging(qt3ds::state::debugger::IMultiProtocolSocket &socket) { LUA_ENGINE_MULTITHREAD_PROTECT_METHOD; - using namespace uic::state::debugger; + using namespace qt3ds::state::debugger; QT3DS_ASSERT(m_ApplicationCore); - NVScopedRefCounted<uic::state::debugger::IMultiProtocolSocketStream> theStream = - socket.CreateProtocol(uic::state::debugger::ILuaArchitectDebugServer::LuaProtocolName(), + NVScopedRefCounted<qt3ds::state::debugger::IMultiProtocolSocketStream> theStream = + socket.CreateProtocol(qt3ds::state::debugger::ILuaArchitectDebugServer::LuaProtocolName(), NULL); m_LuaListener = QT3DS_NEW(m_Foundation.getAllocator(), SLuaEngineListener)(m_Foundation, *this); - m_LuaDebugger = uic::state::debugger::ILuaDebugger::CreateLuaSideDebugger( + m_LuaDebugger = qt3ds::state::debugger::ILuaDebugger::CreateLuaSideDebugger( m_ApplicationCore->GetRuntimeFactoryCore().GetFoundation(), *theStream, m_LuaState, m_ApplicationCore->GetRuntimeFactoryCore().GetStringTable(), m_ApplicationCore->GetProjectDirectory().c_str(), m_LuaListener.mPtr); @@ -1887,7 +1887,7 @@ void SLuaEngineImpl::StepGC() * ****************Inherited virtual functions from CLuaEngine ************** */ //============================================================================= -uic::state::IStateInterpreter * +qt3ds::state::IStateInterpreter * SLuaEngineImpl::CreateStateMachine(const char8_t *inPath, const char8_t *inId, const char8_t *inDatamodelFunction) { @@ -1907,7 +1907,7 @@ SLuaEngineImpl::CreateStateMachine(const char8_t *inPath, const char8_t *inId, qt3ds::foundation::CFileTools::CombineBaseAndRelative(m_Application->GetProjectDirectory().c_str(), inPath, fullPath); lua_pushstring(m_LuaState, fullPath.c_str()); - uic::state::IStateInterpreter *theInterpreter = NULL; + qt3ds::state::IStateInterpreter *theInterpreter = NULL; int error = PCall(1, 1, 0); if (error) { qCCritical(INVALID_OPERATION, "Failed to load scxml file: %s", lua_tostring(m_LuaState, -1)); @@ -1954,11 +1954,11 @@ SLuaEngineImpl::CreateStateMachine(const char8_t *inPath, const char8_t *inId, // If all that worked then we should have the state machine and the datatable on the stack // and only those two on the stack. // At which point we can call start, which will pop everything off the stack - uic::state::ILuaScriptContext::Initialize(m_LuaState, inId); + qt3ds::state::ILuaScriptContext::Initialize(m_LuaState, inId); // Now get the interpreter from the map so we can get its value lua_getfield(m_LuaState, LUA_REGISTRYINDEX, "uic_state_machines"); lua_getfield(m_LuaState, -1, inId); - theInterpreter = uic::state::ILuaScriptContext::GetInterpreterFromBindings(m_LuaState); + theInterpreter = qt3ds::state::ILuaScriptContext::GetInterpreterFromBindings(m_LuaState); } return theInterpreter; } @@ -2282,7 +2282,7 @@ int SLuaEngineImpl::PCall(int argcount, int retcount, int errorIndex) void SLuaEngineImpl::OnBreak() { - uic::state::debugger::IDebugger &theDebugger = m_ApplicationCore->GetStateDebugger(); + qt3ds::state::debugger::IDebugger &theDebugger = m_ApplicationCore->GetStateDebugger(); theDebugger.OnExternalBreak(); } @@ -2433,7 +2433,7 @@ namespace __SLuaEngineImpl_Static_Global_Lua_Exporter_Declaration__ { int GetScreenInformation(lua_State *inLuaState) { CPresentation *thePresentation = CLuaEngine::GetCurrentPresentation(inLuaState); - uic::runtime::IApplication &theApp = thePresentation->GetApplication(); + qt3ds::runtime::IApplication &theApp = thePresentation->GetApplication(); INT32 theViewWidth; INT32 theViewHeight; @@ -2710,7 +2710,7 @@ namespace __SLuaEngineImpl_Static_Global_Lua_Exporter_Declaration__ { { TElement *theElement = reinterpret_cast<TElement *>(lua_touserdata(inLuaState, 1)); - NVScopedRefCounted<uic::render::IRefCountedInputStream> theStream = + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream = theElement->GetBelongedPresentation() ->GetApplication() .GetRuntimeFactoryCore() @@ -2768,7 +2768,7 @@ namespace __SLuaEngineImpl_Static_Global_Lua_Exporter_Declaration__ { Q3DStudio::INT32 retval = 0; - uic::render::IImageLoadListener *theListener = NULL; + qt3ds::render::IImageLoadListener *theListener = NULL; if (lua_gettop(inLuaState) == 4) { SLuaEngineImpl *theEngine = static_cast<SLuaEngineImpl *>(thePresentation->GetScriptBridge()); @@ -2876,9 +2876,9 @@ namespace __SLuaEngineImpl_Static_Global_Lua_Exporter_Declaration__ { lua_getfield(inLuaState, LUA_REGISTRYINDEX, "uic_lua_engine"); SLuaEngineImpl *theEngine = (SLuaEngineImpl *)(lua_touserdata(inLuaState, -1)); lua_pop(inLuaState, 1); - uic::evt::IEventSystem &theEventSystem = + qt3ds::evt::IEventSystem &theEventSystem = theEngine->m_ApplicationCore->GetRuntimeFactoryCore().GetEventSystem(); - uic::evt::SLuaEventPollerBinding::WrapEventPoller(inLuaState, theEventSystem); + qt3ds::evt::SLuaEventPollerBinding::WrapEventPoller(inLuaState, theEventSystem); lua_pushvalue(inLuaState, -1); lua_setfield(inLuaState, LUA_REGISTRYINDEX, "uic_event_system"); } diff --git a/src/Runtime/Source/Runtime/Source/UICLuaEventHelper.cpp b/src/Runtime/Source/Runtime/Source/UICLuaEventHelper.cpp index 2e5e839a..04317933 100644 --- a/src/Runtime/Source/Runtime/Source/UICLuaEventHelper.cpp +++ b/src/Runtime/Source/Runtime/Source/UICLuaEventHelper.cpp @@ -122,7 +122,7 @@ int CLuaEventHelper::FireEvent(lua_State *inLuaState) UVariant theArg2; qt3ds::foundation::IStringTable &theStrTable( theElement->GetBelongedPresentation()->GetStringTable()); - uic::runtime::IApplication &theApplication( + qt3ds::runtime::IApplication &theApplication( theElement->GetBelongedPresentation()->GetApplication()); if (theTop == 3) @@ -241,7 +241,7 @@ void CLuaEventHelper::EventCallback(void *inContextData, SEventCommand &ioEvent) qt3ds::foundation::IStringTable &theStrTable( ioEvent.m_Target->GetBelongedPresentation()->GetStringTable()); - uic::runtime::IApplication &theApplication( + qt3ds::runtime::IApplication &theApplication( ioEvent.m_Target->GetBelongedPresentation()->GetApplication()); theArgumentCount += CLuaHelper::PushArgument(theLuaState, ioEvent.m_Arg1Type, ioEvent.m_Arg1, diff --git a/src/Runtime/Source/Runtime/Source/UICLuaHelper.cpp b/src/Runtime/Source/Runtime/Source/UICLuaHelper.cpp index dbe05b3c..a66d1679 100644 --- a/src/Runtime/Source/Runtime/Source/UICLuaHelper.cpp +++ b/src/Runtime/Source/Runtime/Source/UICLuaHelper.cpp @@ -68,7 +68,7 @@ CLuaHelper::~CLuaHelper() */ INT32 CLuaHelper::PushArgument(lua_State *inLuaState, const UINT8 inType, UVariant &inValue, qt3ds::foundation::IStringTable &strTable, - uic::runtime::IApplication &application) + qt3ds::runtime::IApplication &application) { INT32 theResult = 1; @@ -121,7 +121,7 @@ INT32 CLuaHelper::PushArgument(lua_State *inLuaState, const UINT8 inType, UVaria * @return the type of the argument that is retrieved */ UINT8 CLuaHelper::GetArgument(lua_State *inLuaState, INT32 inIndex, UVariant &outValue, - qt3ds::foundation::IStringTable &strTable, uic::runtime::IApplication &) + qt3ds::foundation::IStringTable &strTable, qt3ds::runtime::IApplication &) { UINT8 theType = ATTRIBUTETYPE_NONE; switch (lua_type(inLuaState, inIndex)) { diff --git a/src/Runtime/Source/Runtime/Source/UICLuaKeyboard.cpp b/src/Runtime/Source/Runtime/Source/UICLuaKeyboard.cpp index 5bcec814..9faa8959 100644 --- a/src/Runtime/Source/Runtime/Source/UICLuaKeyboard.cpp +++ b/src/Runtime/Source/Runtime/Source/UICLuaKeyboard.cpp @@ -43,7 +43,7 @@ // Namespace //============================================================================== using namespace Q3DStudio; -using uic::runtime::IApplication; +using qt3ds::runtime::IApplication; //============================================================================== // Statics //============================================================================== diff --git a/src/Runtime/Source/Runtime/Source/UICParametersSystem.cpp b/src/Runtime/Source/Runtime/Source/UICParametersSystem.cpp index acb81a7a..064345aa 100644 --- a/src/Runtime/Source/Runtime/Source/UICParametersSystem.cpp +++ b/src/Runtime/Source/Runtime/Source/UICParametersSystem.cpp @@ -38,7 +38,7 @@ #include "UICBinarySerializationHelper.h" #include "foundation/IOStreams.h" -using namespace uic::runtime; +using namespace qt3ds::runtime; namespace { diff --git a/src/Runtime/Source/Runtime/Source/UICPresentation.cpp b/src/Runtime/Source/Runtime/Source/UICPresentation.cpp index 4a24253f..4db2e1e6 100644 --- a/src/Runtime/Source/Runtime/Source/UICPresentation.cpp +++ b/src/Runtime/Source/Runtime/Source/UICPresentation.cpp @@ -69,7 +69,7 @@ const INT32 Q3DStudio_MAXEVENTCOMMANDLOOPCOUNT = Q3DStudio_EVENTCOMMANDQUEUECAPA /** * Constructor */ -CPresentation::CPresentation(const CHAR *inName, uic::runtime::IApplication *inApplication) +CPresentation::CPresentation(const CHAR *inName, qt3ds::runtime::IApplication *inApplication) : m_Name(inName) , m_Application(inApplication) , m_Scene(NULL) @@ -125,7 +125,7 @@ void CPresentation::RegisterEventCallback(TElement *inElement, const TEventComma m_EventCallbacks.RegisterCallback(inElement, inEventHash, inCallback, inContextData); inElement->SetFlag(ELEMENTFLAG_REGISTEREDFOREVENTCALLBACK, true); - if (uic::runtime::IApplicationCore::isPickingEvent(inEventHash)) + if (qt3ds::runtime::IApplicationCore::isPickingEvent(inEventHash)) inElement->SetFlag(ELEMENTFLAG_PICKENABLED, true); } @@ -149,7 +149,7 @@ BOOL CPresentation::UnregisterEventCallback(TElement *inElement, if (theLast) inElement->SetFlag(ELEMENTFLAG_REGISTEREDFOREVENTCALLBACK, false); - if (uic::runtime::IApplicationCore::isPickingEvent(inEventHash)) + if (qt3ds::runtime::IApplicationCore::isPickingEvent(inEventHash)) inElement->SetFlag(ELEMENTFLAG_PICKENABLED, false); return theResult; @@ -164,7 +164,7 @@ void CPresentation::ClearDirtyList() GetFrameData().Reset(); } -inline void ConvertActivityZoneBufferToElementList(uic::runtime::TActivityItemBuffer inSource, +inline void ConvertActivityZoneBufferToElementList(qt3ds::runtime::TActivityItemBuffer inSource, TElementList &outResult) { for (qt3ds::QT3DSU32 idx = 0, end = inSource.size(); idx < end; ++idx) @@ -620,12 +620,12 @@ void CPresentation::SetScene(IScene *inScene) m_Scene = inScene; } -void CPresentation::SetActivityZone(uic::runtime::IActivityZone *inZone) +void CPresentation::SetActivityZone(qt3ds::runtime::IActivityZone *inZone) { m_ActivityZone = inZone; m_ActivityZone->SetZoneActive(m_Active); TElement *theSceneElement = m_RootElement; - uic::runtime::IActivityZone &theZone(*GetActivityZone()); + qt3ds::runtime::IActivityZone &theZone(*GetActivityZone()); // The activity zone requires elements described to it in breadth first search order. theZone.AddActivityItems(*theSceneElement); } @@ -696,7 +696,7 @@ ISlideSystem &CPresentation::GetSlideSystem() /** * Simple manager access: Animation Manager */ -uic::runtime::IAnimationSystem &CPresentation::GetAnimationSystem() +qt3ds::runtime::IAnimationSystem &CPresentation::GetAnimationSystem() { return *m_AnimationSystem; } @@ -753,7 +753,7 @@ CPresentationFrameData &CPresentation::GetFrameData() return m_FrameData; } -void CPresentation::SetLoadedBuffer(uic::render::ILoadedBuffer &inBuffer) +void CPresentation::SetLoadedBuffer(qt3ds::render::ILoadedBuffer &inBuffer) { m_LoadedBuffer = inBuffer; } diff --git a/src/Runtime/Source/Runtime/Source/UICQmlElementHelper.cpp b/src/Runtime/Source/Runtime/Source/UICQmlElementHelper.cpp index 2616bf2c..d618c1a8 100644 --- a/src/Runtime/Source/Runtime/Source/UICQmlElementHelper.cpp +++ b/src/Runtime/Source/Runtime/Source/UICQmlElementHelper.cpp @@ -63,7 +63,7 @@ CQmlElementHelper::~CQmlElementHelper() { } -TElement *CQmlElementHelper::GetElement(uic::runtime::IApplication &inApplication, +TElement *CQmlElementHelper::GetElement(qt3ds::runtime::IApplication &inApplication, IPresentation *inDefaultPresentation, const char *inPath, TElement *inStartElement) { @@ -161,7 +161,7 @@ bool CQmlElementHelper::SetAttribute(TElement *theElement, const char *theAttNam } // first search if it is a static property - Option<uic::runtime::element::TPropertyDescAndValuePtr> thePropertyInfo = + Option<qt3ds::runtime::element::TPropertyDescAndValuePtr> thePropertyInfo = theElement->FindProperty(theAttributeKey.m_Hash); if (!thePropertyInfo.hasValue()) { @@ -169,7 +169,7 @@ bool CQmlElementHelper::SetAttribute(TElement *theElement, const char *theAttNam thePropertyInfo = theElement->FindDynamicProperty(theAttributeKey.m_Hash); if (!thePropertyInfo.hasValue()) { // create a new dynamic porperty - uic::runtime::IElementAllocator &theElemAllocator( + qt3ds::runtime::IElementAllocator &theElemAllocator( theElement->GetBelongedPresentation()->GetApplication().GetElementAllocator()); qt3ds::foundation::IStringTable &theStringTable( theElement->GetBelongedPresentation()->GetStringTable()); @@ -250,7 +250,7 @@ bool CQmlElementHelper::GetAttribute(TElement *inElement, const char *inAttribut SAttributeKey theAttributeKey; theAttributeKey.m_Hash = CHash::HashAttribute(inAttribute); - Option<uic::runtime::element::TPropertyDescAndValuePtr> thePropertyInfo = + Option<qt3ds::runtime::element::TPropertyDescAndValuePtr> thePropertyInfo = inElement->FindDynamicProperty(theAttributeKey.m_Hash); if (thePropertyInfo.hasValue()) { diff --git a/src/Runtime/Source/Runtime/Source/UICQmlEngine.cpp b/src/Runtime/Source/Runtime/Source/UICQmlEngine.cpp index 175cfd49..623cfe1f 100644 --- a/src/Runtime/Source/Runtime/Source/UICQmlEngine.cpp +++ b/src/Runtime/Source/Runtime/Source/UICQmlEngine.cpp @@ -86,8 +86,8 @@ namespace Q3DStudio { #define Q3DStudio_LOG_EVENT(S) #endif -using uic::runtime::IApplicationCore; -using uic::runtime::IApplication; +using qt3ds::runtime::IApplicationCore; +using qt3ds::runtime::IApplication; using namespace qt3ds; namespace __SQmlEngineImpl_Basic_Structs__ { @@ -386,12 +386,12 @@ public: void EnableMultithreadedAccess() override; void DisableMultithreadedAccess() override; - void SetApplicationCore(uic::runtime::IApplicationCore &inApplication) override; - void SetApplication(uic::runtime::IApplication &inApplication) override; - uic::runtime::IApplication *GetApplication() override; + void SetApplicationCore(qt3ds::runtime::IApplicationCore &inApplication) override; + void SetApplication(qt3ds::runtime::IApplication &inApplication) override; + qt3ds::runtime::IApplication *GetApplication() override; void BeginPreloadScripts(const eastl::vector<const char *> &, - uic::render::IThreadPool &, const char *) override {} + qt3ds::render::IThreadPool &, const char *) override {} void EndPreloadScripts() override {} eastl::vector<eastl::string> GetLoadedScripts() override { @@ -430,7 +430,7 @@ public: // No need to implement here, as sound playing is done in UICViewerApp bool PlaySoundFile(const char *) override { return false; } - void EnableDebugging(uic::state::debugger::IMultiProtocolSocket &) override {} + void EnableDebugging(qt3ds::state::debugger::IMultiProtocolSocket &) override {} void EnableProfiling() override {} void StepGC() override {} @@ -476,19 +476,19 @@ void CQmlEngineImpl::DisableMultithreadedAccess() m_MultithreadedMutex = NULL; } -void CQmlEngineImpl::SetApplicationCore(uic::runtime::IApplicationCore &inApplication) +void CQmlEngineImpl::SetApplicationCore(qt3ds::runtime::IApplicationCore &inApplication) { QML_ENGINE_MULTITHREAD_PROTECT_METHOD; m_ApplicationCore = &inApplication; } -void CQmlEngineImpl::SetApplication(uic::runtime::IApplication &inApplication) +void CQmlEngineImpl::SetApplication(qt3ds::runtime::IApplication &inApplication) { QML_ENGINE_MULTITHREAD_PROTECT_METHOD; m_Application = &inApplication; } -uic::runtime::IApplication *CQmlEngineImpl::GetApplication() +qt3ds::runtime::IApplication *CQmlEngineImpl::GetApplication() { QML_ENGINE_MULTITHREAD_PROTECT_METHOD; return m_Application; @@ -666,14 +666,14 @@ bool CQmlEngineImpl::GetSlideInfo(const char *element, int ¤tIndex, int &p if (currentIndex > 0) { currentName = QString::fromLocal8Bit( thePresentation->GetSlideSystem().GetSlideName( - uic::runtime::SSlideKey(*theComponent, QT3DSU32(currentIndex)))); + qt3ds::runtime::SSlideKey(*theComponent, QT3DSU32(currentIndex)))); } else { currentName.clear(); } if (previousIndex > 0) { previousName = QString::fromLocal8Bit( thePresentation->GetSlideSystem().GetSlideName( - uic::runtime::SSlideKey(*theComponent, QT3DSU32(previousIndex)))); + qt3ds::runtime::SSlideKey(*theComponent, QT3DSU32(previousIndex)))); } else { previousName.clear(); } @@ -721,7 +721,7 @@ void CQmlEngineImpl::ProcessFrameCallbacks(IPresentation *) void CQmlEngineImpl::ProcessSignal(IPresentation *inPresentation, const SEventCommand &inCommand) { - using uic::runtime::TIdValuePair; + using qt3ds::runtime::TIdValuePair; QML_ENGINE_MULTITHREAD_PROTECT_METHOD; TElement *theElement = inCommand.m_Target; // the element that is a behavior @@ -760,7 +760,7 @@ void CQmlEngineImpl::ProcessCustomActions(IPresentation *presentation, return; } - uic::runtime::TIdValuePair tempData = parametersManager.GetParameter(groupId, 0); + qt3ds::runtime::TIdValuePair tempData = parametersManager.GetParameter(groupId, 0); if (tempData.first != CHash::HashString("string")) { QT3DS_ASSERT(false); return; diff --git a/src/Runtime/Source/Runtime/Source/UICSlideSystem.cpp b/src/Runtime/Source/Runtime/Source/UICSlideSystem.cpp index 6e063d4f..6e9c730a 100644 --- a/src/Runtime/Source/Runtime/Source/UICSlideSystem.cpp +++ b/src/Runtime/Source/Runtime/Source/UICSlideSystem.cpp @@ -43,8 +43,8 @@ #include "foundation/Qt3DSIndexableLinkedList.h" #include "UICBinarySerializationHelper.h" -using namespace uic::runtime; -using namespace uic::runtime::element; +using namespace qt3ds::runtime; +using namespace qt3ds::runtime::element; namespace { struct SSlideAttribute diff --git a/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp b/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp index 8e754b31..54f7e9fa 100644 --- a/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp +++ b/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp @@ -129,7 +129,7 @@ void Q3DSQmlScript::call(const QString &function) void Q3DSQmlScript::updateProperties() { using namespace qt3ds::foundation; - using namespace uic::runtime::element; + using namespace qt3ds::runtime::element; if (!m_behavior.GetActive()) return; @@ -314,7 +314,7 @@ QVector2D Q3DSQmlScript::getMousePosition() { CPresentation *presentation = static_cast<CPresentation *>(m_behavior.GetBelongedPresentation()); - uic::runtime::IApplication &app = presentation->GetApplication(); + qt3ds::runtime::IApplication &app = presentation->GetApplication(); SInputFrame input = app.GetInputEngine().GetInputFrame(); if (app.GetPrimaryPresentation()) { diff --git a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerCustomMaterialParser.h b/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerCustomMaterialParser.h index 33d2390c..90343fb3 100644 --- a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerCustomMaterialParser.h +++ b/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerCustomMaterialParser.h @@ -54,12 +54,12 @@ struct CCustomMaterialParser ParseFile(std::shared_ptr<UICDM::IDOMFactory> inFactory, std::shared_ptr<UICDM::IStringTable> inStringTable, const char8_t *inFileData, UICDM::CXmlErrorHandler &inErrorHandler, - uic::render::IInputStreamFactory &inStreamFactory) + qt3ds::render::IInputStreamFactory &inStreamFactory) { using namespace qt3ds; using namespace qt3ds::foundation; - NVScopedRefCounted<uic::render::IRefCountedInputStream> theStream( + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream( inStreamFactory.GetStreamForFile(inFileData)); if (!theStream) { QT3DS_ASSERT(0); diff --git a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerLuaParser.h b/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerLuaParser.h index 9d798337..90815a03 100644 --- a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerLuaParser.h +++ b/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerLuaParser.h @@ -190,14 +190,14 @@ namespace LuaParser { ParseLuaFile(std::shared_ptr<IDOMFactory> inFactory, std::shared_ptr<UICDM::IStringTable> inStringTable, const char8_t *inFileData, CXmlErrorHandler &inErrorHandler, - uic::render::IInputStreamFactory &inStreamFactory) + qt3ds::render::IInputStreamFactory &inStreamFactory) { eastl::vector<QT3DSU8> readBuf; { using namespace qt3ds; using namespace qt3ds::foundation; eastl::string strConvert; - NVScopedRefCounted<uic::render::IRefCountedInputStream> theStream( + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream( inStreamFactory.GetStreamForFile(inFileData)); if (!theStream) { QT3DS_ASSERT(0); diff --git a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerRenderPluginParser.h b/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerRenderPluginParser.h index ddac71d0..b4682a06 100644 --- a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerRenderPluginParser.h +++ b/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerRenderPluginParser.h @@ -54,12 +54,12 @@ struct CRenderPluginParser ParseFile(std::shared_ptr<UICDM::IDOMFactory> inFactory, std::shared_ptr<UICDM::IStringTable> inStringTable, const char8_t *inFileData, UICDM::CXmlErrorHandler &inErrorHandler, - uic::render::IInputStreamFactory &inStreamFactory) + qt3ds::render::IInputStreamFactory &inStreamFactory) { using namespace qt3ds; using namespace qt3ds::foundation; - NVScopedRefCounted<uic::render::IRefCountedInputStream> theStream( + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream( inStreamFactory.GetStreamForFile(inFileData)); if (!theStream) { QT3DS_ASSERT(0); diff --git a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerScriptParser.h b/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerScriptParser.h index 235a168b..a8cf1491 100644 --- a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerScriptParser.h +++ b/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerScriptParser.h @@ -74,14 +74,14 @@ namespace ScriptParser { ParseScriptFile(std::shared_ptr<IDOMFactory> factory, std::shared_ptr<UICDM::IStringTable> stringTable, const QString &fullPath, CXmlErrorHandler &errorHandler, - uic::render::IInputStreamFactory &streamFactory) + qt3ds::render::IInputStreamFactory &streamFactory) { QVector<QT3DSU8> readBuf; { using namespace qt3ds; using namespace qt3ds::foundation; eastl::string strConvert; - NVScopedRefCounted<uic::render::IRefCountedInputStream> stream( + NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> stream( streamFactory.GetStreamForFile(fullPath)); if (!stream) { QT3DS_ASSERT(0); diff --git a/src/Runtime/Source/RuntimeUICDM/Include/UICMetadata.h b/src/Runtime/Source/RuntimeUICDM/Include/UICMetadata.h index f808642f..d68b2973 100644 --- a/src/Runtime/Source/RuntimeUICDM/Include/UICMetadata.h +++ b/src/Runtime/Source/RuntimeUICDM/Include/UICMetadata.h @@ -49,7 +49,7 @@ struct SMetaDataEffect; struct SMetaDataCustomMaterial; } -namespace uic { +namespace qt3ds { namespace render { class IInputStreamFactory; } @@ -384,7 +384,7 @@ public: * This takes an input stream factory because on android the metadata is installed * in the APK file, so we don't have exact access to it on the filesystem. */ - static IRuntimeMetaData &Create(uic::render::IInputStreamFactory &inInputStreamFactory); + static IRuntimeMetaData &Create(qt3ds::render::IInputStreamFactory &inInputStreamFactory); }; } // namespace Q3DStudio diff --git a/src/Runtime/Source/RuntimeUICDM/Source/UICMetadata.cpp b/src/Runtime/Source/RuntimeUICDM/Source/UICMetadata.cpp index 10a4822a..05674a04 100644 --- a/src/Runtime/Source/RuntimeUICDM/Source/UICMetadata.cpp +++ b/src/Runtime/Source/RuntimeUICDM/Source/UICMetadata.cpp @@ -50,8 +50,8 @@ #include "foundation/Qt3DSFoundation.h" #include "foundation/StringTable.h" -using uic::render::IInputStreamFactory; -using uic::render::IRefCountedInputStream; +using qt3ds::render::IInputStreamFactory; +using qt3ds::render::IRefCountedInputStream; using namespace UICDM; using namespace Q3DStudio; diff --git a/src/Runtime/Source/UICCompiler/Source/UICCompilerMain.cpp b/src/Runtime/Source/UICCompiler/Source/UICCompilerMain.cpp index 49bb7933..874dac20 100644 --- a/src/Runtime/Source/UICCompiler/Source/UICCompilerMain.cpp +++ b/src/Runtime/Source/UICCompiler/Source/UICCompilerMain.cpp @@ -46,7 +46,7 @@ #include <QSurfaceFormat> -using namespace uic::render; +using namespace qt3ds::render; #if defined(_LINUX) || defined(_MACOSX) || defined(_LINUXPLATFORM) || defined(_INTEGRITYPLATFORM) namespace qt3ds { @@ -137,13 +137,13 @@ int main(int c, char **v) theRenderFactory->GetUICRenderContext().GetShaderCache().SetShaderCompilationEnabled(false); Q3DStudio::CInputEngine theInputEngine; - NVScopedRefCounted<uic::runtime::IApplicationCore> theAppCore = - uic::runtime::IApplicationCore::CreateApplicationCore(*theRenderFactoryCore, + NVScopedRefCounted<qt3ds::runtime::IApplicationCore> theAppCore = + qt3ds::runtime::IApplicationCore::CreateApplicationCore(*theRenderFactoryCore, theApplicationDirectory.c_str()); bool loadStarted = theAppCore->BeginLoad(uiaFile.c_str()); if (loadStarted) { - NVScopedRefCounted<uic::runtime::IApplication> theApp = + NVScopedRefCounted<qt3ds::runtime::IApplication> theApp = theAppCore->CreateApplication(theInputEngine, 0, *theRenderFactory); theApp->SaveBinary(); return 0; diff --git a/src/Runtime/Source/UICEvent/Include/EventSystem.h b/src/Runtime/Source/UICEvent/Include/EventSystem.h index 5ace5445..5197ca4b 100644 --- a/src/Runtime/Source/UICEvent/Include/EventSystem.h +++ b/src/Runtime/Source/UICEvent/Include/EventSystem.h @@ -33,7 +33,7 @@ #include <cstdlib> #include "EventSystemC.h" -namespace uic { +namespace qt3ds { namespace evt { typedef TUICEventSystemStr TEventStr; diff --git a/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystem.h b/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystem.h index 5161e1be..46442b78 100644 --- a/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystem.h +++ b/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystem.h @@ -35,7 +35,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "EventSystem.h" -namespace uic { +namespace qt3ds { namespace evt { class CEventProviderRefCounted; diff --git a/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystemLuaBinding.h b/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystemLuaBinding.h index b15ca070..df970186 100644 --- a/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystemLuaBinding.h +++ b/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystemLuaBinding.h @@ -32,7 +32,7 @@ #define EVENT_POLLING_SYSTEM_LUA_BINDING_H struct lua_State; -namespace uic { +namespace qt3ds { namespace evt { class IEventSystem; diff --git a/src/Runtime/Source/UICEvent/Source/EventFactory.cpp b/src/Runtime/Source/UICEvent/Source/EventFactory.cpp index 9ee9071a..27e38736 100644 --- a/src/Runtime/Source/UICEvent/Source/EventFactory.cpp +++ b/src/Runtime/Source/UICEvent/Source/EventFactory.cpp @@ -34,7 +34,7 @@ #include "foundation/StringTable.h" #include "foundation/Utils.h" -using namespace uic::evt; +using namespace qt3ds::evt; typedef char TEventChar; using qt3ds::QT3DSU32; diff --git a/src/Runtime/Source/UICEvent/Source/EventFactory.h b/src/Runtime/Source/UICEvent/Source/EventFactory.h index 38a98228..fa82c710 100644 --- a/src/Runtime/Source/UICEvent/Source/EventFactory.h +++ b/src/Runtime/Source/UICEvent/Source/EventFactory.h @@ -44,7 +44,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace evt { class CEventProviderRefCounted; diff --git a/src/Runtime/Source/UICEvent/Source/EventPoller.cpp b/src/Runtime/Source/UICEvent/Source/EventPoller.cpp index 8be89e43..118ab0fb 100644 --- a/src/Runtime/Source/UICEvent/Source/EventPoller.cpp +++ b/src/Runtime/Source/UICEvent/Source/EventPoller.cpp @@ -40,7 +40,7 @@ #define MAX_EVENTS 256 -using namespace uic::evt; +using namespace qt3ds::evt; using qt3ds::QT3DSU32; IEventSystem &IEventSystem::Create(qt3ds::NVFoundationBase &inFoundation) diff --git a/src/Runtime/Source/UICEvent/Source/EventPoller.h b/src/Runtime/Source/UICEvent/Source/EventPoller.h index 5ea5849b..c247b2ea 100644 --- a/src/Runtime/Source/UICEvent/Source/EventPoller.h +++ b/src/Runtime/Source/UICEvent/Source/EventPoller.h @@ -43,7 +43,7 @@ namespace qt3ds { class NVFoundationBase; } -namespace uic { +namespace qt3ds { namespace evt { class CFactory; diff --git a/src/Runtime/Source/UICEvent/Source/EventPollingSystemLuaBinding.cpp b/src/Runtime/Source/UICEvent/Source/EventPollingSystemLuaBinding.cpp index 65c73372..8de1e03d 100644 --- a/src/Runtime/Source/UICEvent/Source/EventPollingSystemLuaBinding.cpp +++ b/src/Runtime/Source/UICEvent/Source/EventPollingSystemLuaBinding.cpp @@ -38,7 +38,7 @@ #include "EventPollingSystem.h" #include "EventPollingSystemLuaBinding.h" -using namespace uic::evt; +using namespace qt3ds::evt; namespace { // No need to use static in an anonymous namespace @@ -176,7 +176,7 @@ int GetNextEvents(lua_State *inState) //} } -void uic::evt::SLuaEventPollerBinding::WrapEventPoller(lua_State *inState, IEventSystem &inPoller) +void qt3ds::evt::SLuaEventPollerBinding::WrapEventPoller(lua_State *inState, IEventSystem &inPoller) { lua_newtable(inState); lua_pushlightuserdata(inState, inPoller.GetCInterface()); // Store the C poller, for Lua will diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.cpp index 4d3b1f83..5a68825a 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.cpp @@ -37,7 +37,7 @@ #include <Windows.h> */ -using namespace uic::render; +using namespace qt3ds::render; namespace { @@ -325,7 +325,7 @@ void SCamera::LookAt(const QT3DSVec3 &inCameraPos, const QT3DSVec3 &inUpDir, con theDirection.z *= -1.0f; m_Rotation = GetRotationVectorFromRotationMatrix(GetLookAtMatrix(inUpDir, theDirection)); m_Position = inCameraPos; - MarkDirty(uic::render::NodeTransformDirtyFlag::TransformIsDirty); + MarkDirty(qt3ds::render::NodeTransformDirtyFlag::TransformIsDirty); } void SCamera::CalculateViewProjectionMatrix(QT3DSMat44 &outMatrix) const diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.h index 432ef873..0a77e153 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.h @@ -33,7 +33,7 @@ #include "UICRenderNode.h" #include "UICRenderRay.h" -namespace uic { +namespace qt3ds { namespace render { struct SCameraGlobalCalculationResult diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCustomMaterial.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderCustomMaterial.h index 5d0c3409..d113af70 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCustomMaterial.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderCustomMaterial.h @@ -36,7 +36,7 @@ #include "UICRenderLightmaps.h" #include "foundation/Qt3DSFlags.h" -namespace uic { +namespace qt3ds { namespace render { // IMPORTANT: These flags matches the key produced by a MDL export file diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.cpp index 90727033..ef0a9759 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include "UICRenderDefaultMaterial.h" -using namespace uic::render; +using namespace qt3ds::render; SDefaultMaterial::SDefaultMaterial() : SGraphObject(GraphObjectTypes::DefaultMaterial) diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.h index 8f8371c2..6aa253de 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.h @@ -38,7 +38,7 @@ #include "UICRenderMaterialDirty.h" #include "UICRenderLightmaps.h" -namespace uic { +namespace qt3ds { namespace render { struct DefaultMaterialLighting { diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.cpp index 3eea8d6f..3d42583e 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.cpp @@ -35,8 +35,8 @@ #include <QtCore/qdir.h> -using namespace uic; -using namespace uic::render; +using namespace qt3ds; +using namespace qt3ds::render; SDynamicObject::SDynamicObject(GraphObjectTypes::Enum inType, CRegisteredString inObjName, QT3DSU32 inDSByteSize, QT3DSU32 thisObjSize) diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.h index 35ac9186..daa5568d 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.h @@ -35,7 +35,7 @@ #include "UICRenderNode.h" #include "EASTL/string.h" -namespace uic { +namespace qt3ds { namespace render { namespace dynamic { diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.cpp index 72b74fd5..08766cf8 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.cpp @@ -34,7 +34,7 @@ #include "UICRenderString.h" #include "foundation/FileTools.h" -using namespace uic::render; +using namespace qt3ds::render; void SEffect::Initialize() { diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.h index 4331f2a5..ef771da4 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.h @@ -36,7 +36,7 @@ #include "EASTL/string.h" #include "UICRenderDynamicObject.h" -namespace uic { +namespace qt3ds { namespace render { struct SLayer; struct SEffectContext; diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderGraphObject.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderGraphObject.h index 7f20fd38..4ff8f9ed 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderGraphObject.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderGraphObject.h @@ -34,7 +34,7 @@ #include "UICRenderTaggedPointer.h" #include "UICRenderGraphObjectTypes.h" -namespace uic { +namespace qt3ds { namespace render { // Types should be setup on construction. Change the type diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.cpp index fdccc938..6583e56e 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.cpp @@ -34,7 +34,7 @@ #include "UICRenderPlugin.h" #include "UICRenderPluginGraphObject.h" -using namespace uic::render; +using namespace qt3ds::render; SImage::SImage() : SGraphObject(GraphObjectTypes::Image) diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.h index 8ee70dc8..9804933a 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.h @@ -39,7 +39,7 @@ #include "UICRenderImageTextureData.h" #include "EASTL/utility.h" -namespace uic { +namespace qt3ds { namespace render { class IUICRenderContext; class IOffscreenRenderManager; diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.cpp index b576af6b..77589f9b 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.cpp @@ -31,7 +31,7 @@ #include "UICRenderLayer.h" #include "UICRenderEffect.h" -using namespace uic::render; +using namespace qt3ds::render; SLayer::SLayer() : SNode(GraphObjectTypes::Layer) diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.h index 36fc64b9..238f4874 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.h @@ -35,7 +35,7 @@ #include "foundation/Qt3DSContainers.h" #include "UICRenderer.h" -namespace uic { +namespace qt3ds { namespace render { class IUICRenderContext; struct SPresentation; diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.cpp index ce1983d4..8877f9b4 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include "UICRenderLight.h" -using namespace uic::render; +using namespace qt3ds::render; SLight::SLight() : SNode(GraphObjectTypes::Light) diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.h index 80d2f415..19393e3e 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.h @@ -32,7 +32,7 @@ #define UIC_RENDER_LIGHT_H #include "UICRenderNode.h" -namespace uic { +namespace qt3ds { namespace render { struct RenderLightTypes diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.cpp index 21ad0548..d8ae00aa 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.cpp @@ -30,7 +30,7 @@ #include "UICRenderLightmaps.h" -using namespace uic::render; +using namespace qt3ds::render; SLightmaps::SLightmaps() : SGraphObject(GraphObjectTypes::Lightmaps) diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.h index c7972bc5..8cfe7d1f 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.h @@ -38,7 +38,7 @@ #include "UICRenderer.h" #include "UICRenderMaterialDirty.h" -namespace uic { +namespace qt3ds { namespace render { struct MaterialLightmapsUsage diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderMaterialDirty.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderMaterialDirty.h index 7b8fc056..def29fa8 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderMaterialDirty.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderMaterialDirty.h @@ -31,7 +31,7 @@ #ifndef UIC_RENDER_MATERIAL_DIRTY_H #define UIC_RENDER_MATERIAL_DIRTY_H -namespace uic { +namespace qt3ds { namespace render { class CMaterialDirty { diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.cpp index 770d2b4e..c52dedf3 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.cpp @@ -32,7 +32,7 @@ #include "UICRenderBufferManager.h" #include "UICRenderMesh.h" -using namespace uic::render; +using namespace qt3ds::render; SModel::SModel() : SNode(GraphObjectTypes::Model) diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.h index f7e16054..dd371270 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.h @@ -35,7 +35,7 @@ #include "foundation/StringTable.h" #include "UICRenderTessModeValues.h" -namespace uic { +namespace qt3ds { namespace render { struct SDefaultMaterial; diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.cpp index 1d9f9af0..20b28f04 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.cpp @@ -35,7 +35,7 @@ #include "UICRenderPathManager.h" #include "UICRenderPath.h" -using namespace uic::render; +using namespace qt3ds::render; SNode::SNode(GraphObjectTypes::Enum inGraphObjectType) : SGraphObject(inGraphObjectType) @@ -203,10 +203,10 @@ QT3DSVec3 SNode::GetRotationVectorFromRotationMatrix(const QT3DSMat33 &inMatrix) QT3DSMat44 theConvertMatrix(inMatrix, QT3DSVec3(0, 0, 0)); if (m_Flags.IsLeftHanded()) SNode::FlipCoordinateSystem(theConvertMatrix); - uic::render::CEulerAngleConverter theConverter; - uic::render::HMatrix *theHMatrix = - reinterpret_cast<uic::render::HMatrix *>(theConvertMatrix.front()); - uic::render::EulerAngles theAngles = theConverter.Eul_FromHMatrix(*theHMatrix, m_RotationOrder); + qt3ds::render::CEulerAngleConverter theConverter; + qt3ds::render::HMatrix *theHMatrix = + reinterpret_cast<qt3ds::render::HMatrix *>(theConvertMatrix.front()); + qt3ds::render::EulerAngles theAngles = theConverter.Eul_FromHMatrix(*theHMatrix, m_RotationOrder); return GetRotationVectorFromEulerAngles(theAngles); } diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.h index 50661b95..d55e10de 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.h @@ -40,7 +40,7 @@ #include "UICRenderEulerAngles.h" #include "foundation/StringTable.h" -namespace uic { +namespace qt3ds { namespace render { struct SModel; diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.cpp index 7927a3ac..0986a752 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.cpp @@ -30,7 +30,7 @@ #include "UICRenderPath.h" #include "UICRenderPathSubPath.h" -using namespace uic::render; +using namespace qt3ds::render; void SPath::AddSubPath(SPathSubPath &inSegment) { diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.h index 5cf392f3..ea214e96 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.h @@ -33,7 +33,7 @@ #include "UICRender.h" #include "UICRenderNode.h" -namespace uic { +namespace qt3ds { namespace render { struct PathCapping { diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPathSubPath.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPathSubPath.h index f8c4d3f0..09073e47 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPathSubPath.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPathSubPath.h @@ -33,7 +33,7 @@ #include "UICRender.h" #include "UICRenderGraphObject.h" -namespace uic { +namespace qt3ds { namespace render { struct SPathSubPath : public SGraphObject { diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.cpp index b0590082..1d2c7285 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.cpp @@ -31,7 +31,7 @@ #include "render/Qt3DSRenderContext.h" #include "UICRenderContext.h" -using namespace uic::render; +using namespace qt3ds::render; void SPresentation::Render(IUICRenderContext &inContext) { diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.h index d56bf72a..7891de61 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.h @@ -36,7 +36,7 @@ #include "UICRenderScene.h" #include "foundation/Qt3DSVec2.h" -namespace uic { +namespace qt3ds { namespace render { struct RenderRotationValues diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderReferencedMaterial.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderReferencedMaterial.h index a8063d34..e9215877 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderReferencedMaterial.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderReferencedMaterial.h @@ -34,7 +34,7 @@ #include "UICRenderGraphObject.h" #include "UICRenderMaterialDirty.h" -namespace uic { +namespace qt3ds { namespace render { struct SReferencedMaterial : SGraphObject diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.cpp index 292c5a45..821ffe23 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.cpp @@ -33,7 +33,7 @@ #include "UICRenderContext.h" #include "render/Qt3DSRenderContext.h" -using namespace uic::render; +using namespace qt3ds::render; SScene::SScene() : SGraphObject(GraphObjectTypes::Scene) diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.h index d8f5b32c..4d17abe8 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSVec3.h" #include "UICRenderGraphObject.h" -namespace uic { +namespace qt3ds { namespace render { struct SLayer; struct SPresentation; diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.cpp b/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.cpp index 3b5acbb7..3b6f23b2 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.cpp +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include "UICRenderText.h" -using namespace uic::render; +using namespace qt3ds::render; STextRenderInfo::STextRenderInfo() : m_FontSize(24) diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.h b/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.h index 7f2ab701..a7d25e35 100644 --- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.h +++ b/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.h @@ -34,7 +34,7 @@ #include "UICRenderNode.h" #include "UICRenderTextTypes.h" -namespace uic { +namespace qt3ds { namespace render { struct SText : public SNode, public STextRenderInfo diff --git a/src/Runtime/Source/UICRender/Include/LINUX/DynamicLibLoader.h b/src/Runtime/Source/UICRender/Include/LINUX/DynamicLibLoader.h index a260c7da..fd12f850 100644 --- a/src/Runtime/Source/UICRender/Include/LINUX/DynamicLibLoader.h +++ b/src/Runtime/Source/UICRender/Include/LINUX/DynamicLibLoader.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSFoundation.h" #include "foundation/Qt3DSBroadcastingAllocator.h" -namespace uic { +namespace qt3ds { namespace render { using namespace qt3ds; using namespace qt3ds::render; diff --git a/src/Runtime/Source/UICRender/Include/UICOffscreenRenderKey.h b/src/Runtime/Source/UICRender/Include/UICOffscreenRenderKey.h index abf2e96b..33172a57 100644 --- a/src/Runtime/Source/UICRender/Include/UICOffscreenRenderKey.h +++ b/src/Runtime/Source/UICRender/Include/UICOffscreenRenderKey.h @@ -45,7 +45,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace render { struct OffscreenRendererKeyTypes { diff --git a/src/Runtime/Source/UICRender/Include/UICOffscreenRenderManager.h b/src/Runtime/Source/UICRender/Include/UICOffscreenRenderManager.h index 99985823..772550ac 100644 --- a/src/Runtime/Source/UICRender/Include/UICOffscreenRenderManager.h +++ b/src/Runtime/Source/UICRender/Include/UICOffscreenRenderManager.h @@ -39,7 +39,7 @@ #include "UICRenderScene.h" #include "UICRenderLayer.h" -namespace uic { +namespace qt3ds { namespace render { class IResourceManager; struct SUICRenderPickResult; diff --git a/src/Runtime/Source/UICRender/Include/UICOldNBustedRenderPlugin.h b/src/Runtime/Source/UICRender/Include/UICOldNBustedRenderPlugin.h index e9ff52cc..3e101548 100644 --- a/src/Runtime/Source/UICRender/Include/UICOldNBustedRenderPlugin.h +++ b/src/Runtime/Source/UICRender/Include/UICOldNBustedRenderPlugin.h @@ -41,7 +41,7 @@ #include "render/Qt3DSRenderBaseTypes.h" #include "UICPluginDLL.h" -namespace uic { +namespace qt3ds { namespace render { class COldNBustedPluginRenderer; diff --git a/src/Runtime/Source/UICRender/Include/UICRender.h b/src/Runtime/Source/UICRender/Include/UICRender.h index 78788f91..fde46c0b 100644 --- a/src/Runtime/Source/UICRender/Include/UICRender.h +++ b/src/Runtime/Source/UICRender/Include/UICRender.h @@ -108,7 +108,7 @@ class NVPlane; namespace eastl { } -namespace uic { +namespace qt3ds { namespace render { using namespace qt3ds; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderClippingFrustum.h b/src/Runtime/Source/UICRender/Include/UICRenderClippingFrustum.h index a0962dfc..9c02b7c0 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderClippingFrustum.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderClippingFrustum.h @@ -35,7 +35,7 @@ #include "foundation/Qt3DSFlags.h" #include "foundation/Qt3DSBounds3.h" -namespace uic { +namespace qt3ds { namespace render { struct BoxEdgeFlagValues diff --git a/src/Runtime/Source/UICRender/Include/UICRenderContext.h b/src/Runtime/Source/UICRender/Include/UICRenderContext.h index 77795e85..ea619d5f 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderContext.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderContext.h @@ -39,7 +39,7 @@ #include <QPair> -namespace uic { +namespace qt3ds { namespace render { struct ScaleModes { diff --git a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialRenderContext.h b/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialRenderContext.h index 32658678..161b66cc 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialRenderContext.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialRenderContext.h @@ -36,7 +36,7 @@ #include "foundation/Qt3DSMat33.h" #include "UICRenderShaderKeys.h" -namespace uic { +namespace qt3ds { namespace render { struct SLayerRenderData; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialShaderGenerator.h b/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialShaderGenerator.h index f8dc5f0c..1463c91a 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialShaderGenerator.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialShaderGenerator.h @@ -32,7 +32,7 @@ #define UIC_RENDER_CUSTOM_MATERIAL_SHADER_GENERATOR_H #include "UICRenderMaterialShaderGenerator.h" -namespace uic { +namespace qt3ds { namespace render { class UICShadowMap; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialSystem.h b/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialSystem.h index 662754ff..d3382eaa 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialSystem.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialSystem.h @@ -35,7 +35,7 @@ #include "UICRenderDynamicObjectSystem.h" #include "../RendererImpl/UICVertexPipelineImpl.h" -namespace uic { +namespace qt3ds { namespace render { namespace dynamic { diff --git a/src/Runtime/Source/UICRender/Include/UICRenderDefaultMaterialShaderGenerator.h b/src/Runtime/Source/UICRender/Include/UICRenderDefaultMaterialShaderGenerator.h index fe80eb68..025fdec3 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderDefaultMaterialShaderGenerator.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderDefaultMaterialShaderGenerator.h @@ -32,7 +32,7 @@ #define UIC_RENDER_DEFAULT_MATERIAL_SHADER_GENERATOR_H #include "UICRenderMaterialShaderGenerator.h" -namespace uic { +namespace qt3ds { namespace render { class UICShadowMap; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystem.h b/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystem.h index c47d05fa..98fc1362 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystem.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystem.h @@ -44,7 +44,7 @@ #include <QtCore/qstring.h> -namespace uic { +namespace qt3ds { namespace render { struct SDynamicObject; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemCommands.h b/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemCommands.h index fe23b7cf..2a84d3f6 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemCommands.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemCommands.h @@ -36,7 +36,7 @@ #include "foundation/Qt3DSIntrinsics.h" #include "foundation/Qt3DSFlags.h" -namespace uic { +namespace qt3ds { namespace render { namespace dynamic { using qt3ds::render::NVRenderBufferBarrierFlags; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemUtil.h b/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemUtil.h index 918e1fc6..bb086a31 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemUtil.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemUtil.h @@ -35,7 +35,7 @@ #include "foundation/Qt3DSAllocatorCallback.h" #include "UICRenderString.h" -namespace uic { +namespace qt3ds { namespace render { namespace dynamic { diff --git a/src/Runtime/Source/UICRender/Include/UICRenderEffectSystem.h b/src/Runtime/Source/UICRender/Include/UICRenderEffectSystem.h index 69e47ecc..a6a60b66 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderEffectSystem.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderEffectSystem.h @@ -37,7 +37,7 @@ #include "foundation/Qt3DSVec2.h" #include "UICRenderDynamicObjectSystem.h" -namespace uic { +namespace qt3ds { namespace render { struct SEffect; struct SEffectContext; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderEulerAngles.h b/src/Runtime/Source/UICRender/Include/UICRenderEulerAngles.h index fcc1bab9..f63d84ff 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderEulerAngles.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderEulerAngles.h @@ -33,7 +33,7 @@ #define _USE_MATH_DEFINES #include <math.h> -namespace uic { +namespace qt3ds { namespace render { //============================================================================== // Description diff --git a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectPickQuery.h b/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectPickQuery.h index efc46683..1580972f 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectPickQuery.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectPickQuery.h @@ -37,7 +37,7 @@ #include "foundation/Qt3DSMat44.h" #include "UICRenderImage.h" -namespace uic { +namespace qt3ds { namespace render { class IOffscreenRenderer; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectSerializer.h b/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectSerializer.h index e7f14b36..3a3f784e 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectSerializer.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectSerializer.h @@ -38,7 +38,7 @@ namespace qt3ds { class NVFoundationBase; } -namespace uic { +namespace qt3ds { namespace render { struct SPresentation; class IEffectSystem; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectTypes.h b/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectTypes.h index ff5f11a1..ab347aa7 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectTypes.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectTypes.h @@ -33,7 +33,7 @@ #include "UICRender.h" #include "foundation/Qt3DSAssert.h" -namespace uic { +namespace qt3ds { namespace render { // If you need a generic switch statement, then these macros will ensure diff --git a/src/Runtime/Source/UICRender/Include/UICRenderImageScaler.h b/src/Runtime/Source/UICRender/Include/UICRenderImageScaler.h index ddfe5059..29841d54 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderImageScaler.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderImageScaler.h @@ -35,7 +35,7 @@ #define __IMAGESCALER_H_ #include "UICRender.h" -namespace uic { +namespace qt3ds { namespace render { //============================================================================== // Class diff --git a/src/Runtime/Source/UICRender/Include/UICRenderImageTextureData.h b/src/Runtime/Source/UICRender/Include/UICRenderImageTextureData.h index 6aff912b..3ffbbed2 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderImageTextureData.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderImageTextureData.h @@ -33,7 +33,7 @@ #include "UICRender.h" #include "foundation/Qt3DSFlags.h" -namespace uic { +namespace qt3ds { namespace render { // forward declararion diff --git a/src/Runtime/Source/UICRender/Include/UICRenderInputStreamFactory.h b/src/Runtime/Source/UICRender/Include/UICRenderInputStreamFactory.h index daff204e..9473d05e 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderInputStreamFactory.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderInputStreamFactory.h @@ -35,7 +35,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "EASTL/string.h" -namespace uic { +namespace qt3ds { namespace render { class IRefCountedInputStream : public qt3ds::foundation::ISeekableIOStream, public NVRefCounted { diff --git a/src/Runtime/Source/UICRender/Include/UICRenderMaterialHelpers.h b/src/Runtime/Source/UICRender/Include/UICRenderMaterialHelpers.h index e59e6730..6ddaf030 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderMaterialHelpers.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderMaterialHelpers.h @@ -34,7 +34,7 @@ #include "UICRenderDefaultMaterial.h" #include "UICRenderReferencedMaterial.h" -namespace uic { +namespace qt3ds { namespace render { inline bool IsMaterial(SGraphObject &obj) diff --git a/src/Runtime/Source/UICRender/Include/UICRenderMaterialShaderGenerator.h b/src/Runtime/Source/UICRender/Include/UICRenderMaterialShaderGenerator.h index b108564f..0eede4c0 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderMaterialShaderGenerator.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderMaterialShaderGenerator.h @@ -36,7 +36,7 @@ #include "UICRenderShaderCache.h" #include "UICRenderShaderCodeGeneratorV2.h" -namespace uic { +namespace qt3ds { namespace render { // these are our current shader limits diff --git a/src/Runtime/Source/UICRender/Include/UICRenderMesh.h b/src/Runtime/Source/UICRender/Include/UICRenderMesh.h index 9705d3c7..259cbe53 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderMesh.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderMesh.h @@ -40,7 +40,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSNoCopy.h" -namespace uic { +namespace qt3ds { namespace render { struct SRenderSubsetBase diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPathManager.h b/src/Runtime/Source/UICRender/Include/UICRenderPathManager.h index 403bba83..2e14d791 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderPathManager.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderPathManager.h @@ -38,7 +38,7 @@ #include "foundation/Qt3DSBounds3.h" //#include "UICRenderDefaultMaterialShaderGenerator.h" //SLayerGlobalRenderProperties -namespace uic { +namespace qt3ds { namespace render { struct SLayerGlobalRenderProperties; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPathMath.h b/src/Runtime/Source/UICRender/Include/UICRenderPathMath.h index 07ad3f62..afa0dad0 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderPathMath.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderPathMath.h @@ -32,7 +32,7 @@ #include "UICRender.h" #include "foundation/Qt3DSVec2.h" #include "foundation/Qt3DSVec3.h" -namespace uic { +namespace qt3ds { namespace render { namespace path { // Solve quadratic equation in with a templated real number system. diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPathRenderContext.h b/src/Runtime/Source/UICRender/Include/UICRenderPathRenderContext.h index f1d6344b..e9d610fb 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderPathRenderContext.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderPathRenderContext.h @@ -39,7 +39,7 @@ #include "UICRenderShaderKeys.h" #include "UICRenderableImage.h" -namespace uic { +namespace qt3ds { namespace render { struct SPathRenderContext diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsRenderer.h b/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsRenderer.h index b7b49e23..66a4b773 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsRenderer.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsRenderer.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSDataRef.h" -namespace uic { +namespace qt3ds { namespace render { // Pixel graphics are graphics described in pixels. diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsTypes.h b/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsTypes.h index cff29d0d..44e5db57 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsTypes.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsTypes.h @@ -36,7 +36,7 @@ #include "foundation/Qt3DSMat33.h" #include "foundation/Qt3DSOption.h" -namespace uic { +namespace qt3ds { namespace render { // Vector graphics with no scaling are pixel aligned with 0,0 being the bottom,left of the diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPlugin.h b/src/Runtime/Source/UICRender/Include/UICRenderPlugin.h index c973a549..f4676111 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderPlugin.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderPlugin.h @@ -35,7 +35,7 @@ #include "UICOffscreenRenderManager.h" #include "EASTL/utility.h" -namespace uic { +namespace qt3ds { namespace render { // UICRenderPluginPropertyValue.h diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPluginGraphObject.h b/src/Runtime/Source/UICRender/Include/UICRenderPluginGraphObject.h index 5d80ab21..de426e61 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderPluginGraphObject.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderPluginGraphObject.h @@ -32,7 +32,7 @@ #define UIC_RENDER_PLUGIN_GRAPH_OBJECT_H #include "UICRender.h" #include "UICRenderGraphObject.h" -namespace uic { +namespace qt3ds { namespace render { struct SRenderPlugin : public SGraphObject diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPluginPropertyValue.h b/src/Runtime/Source/UICRender/Include/UICRenderPluginPropertyValue.h index 96b3dab1..48d6cba7 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderPluginPropertyValue.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderPluginPropertyValue.h @@ -46,7 +46,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace render { template <typename TDatatype> diff --git a/src/Runtime/Source/UICRender/Include/UICRenderProfiler.h b/src/Runtime/Source/UICRender/Include/UICRenderProfiler.h index 6b4d8471..c6034e85 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderProfiler.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderProfiler.h @@ -37,7 +37,7 @@ #include "render/Qt3DSRenderBaseTypes.h" #include "foundation/Qt3DSContainers.h" -namespace uic { +namespace qt3ds { namespace render { /** diff --git a/src/Runtime/Source/UICRender/Include/UICRenderRay.h b/src/Runtime/Source/UICRender/Include/UICRenderRay.h index 70447f7f..34c14378 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderRay.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderRay.h @@ -38,7 +38,7 @@ #include "foundation/Qt3DSMat44.h" #include "foundation/Qt3DSBounds3.h" -namespace uic { +namespace qt3ds { namespace render { struct SBasisPlanes diff --git a/src/Runtime/Source/UICRender/Include/UICRenderRenderList.h b/src/Runtime/Source/UICRender/Include/UICRenderRenderList.h index 55d669b2..a48702cb 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderRenderList.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderRenderList.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "render/Qt3DSRenderBaseTypes.h" -namespace uic { +namespace qt3ds { namespace render { class IRenderTask diff --git a/src/Runtime/Source/UICRender/Include/UICRenderRotationHelper.h b/src/Runtime/Source/UICRender/Include/UICRenderRotationHelper.h index d95bd829..afd2f20c 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderRotationHelper.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderRotationHelper.h @@ -34,7 +34,7 @@ #include "UICRenderNode.h" #include "EASTL/utility.h" -namespace uic { +namespace qt3ds { namespace render { /** * Unfortunately we still use an XYZ-Euler rotation system. This means that identical diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShaderCache.h b/src/Runtime/Source/UICRender/Include/UICRenderShaderCache.h index bbaefcb9..092508bc 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderShaderCache.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderShaderCache.h @@ -35,7 +35,7 @@ #include "foundation/Qt3DSFlags.h" #include "foundation/StringTable.h" -namespace uic { +namespace qt3ds { namespace render { struct ShaderCacheProgramFlagValues { diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGenerator.h b/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGenerator.h index c19ef2ae..e6844ea5 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGenerator.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGenerator.h @@ -37,7 +37,7 @@ #include "render/Qt3DSRenderBaseTypes.h" #include "UICRenderString.h" -namespace uic { +namespace qt3ds { namespace render { struct SEndlType diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGeneratorV2.h b/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGeneratorV2.h index a7d17eb7..15134b08 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGeneratorV2.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGeneratorV2.h @@ -36,7 +36,7 @@ #include <QtCore/qstring.h> -namespace uic { +namespace qt3ds { namespace render { // So far the generator is only useful for graphics stages, // it doesn't seem useful for compute stages. diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShaderKeys.h b/src/Runtime/Source/UICRender/Include/UICRenderShaderKeys.h index 71cf18ba..5b69c856 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderShaderKeys.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderShaderKeys.h @@ -39,7 +39,7 @@ #include "UICRenderTessModeValues.h" #include "render/Qt3DSRenderBaseTypes.h" -namespace uic { +namespace qt3ds { namespace render { // We have an ever expanding set of properties we like to hash into one or more 32 bit // quantities. @@ -503,15 +503,15 @@ namespace render { } void SetSpecularModel(NVDataRef<QT3DSU32> inKeySet, - uic::render::DefaultMaterialSpecularModel::Enum inModel) + qt3ds::render::DefaultMaterialSpecularModel::Enum inModel) { SetValue(inKeySet, (QT3DSU32)inModel); } - uic::render::DefaultMaterialSpecularModel::Enum + qt3ds::render::DefaultMaterialSpecularModel::Enum GetSpecularModel(NVConstDataRef<QT3DSU32> inKeySet) const { - return static_cast<uic::render::DefaultMaterialSpecularModel::Enum>(GetValue(inKeySet)); + return static_cast<qt3ds::render::DefaultMaterialSpecularModel::Enum>(GetValue(inKeySet)); } void ToString(eastl::string &ioStr, NVConstDataRef<QT3DSU32> inKeySet) const @@ -784,9 +784,9 @@ namespace render { namespace eastl { template <> -struct hash<uic::render::SShaderDefaultMaterialKey> +struct hash<qt3ds::render::SShaderDefaultMaterialKey> { - size_t operator()(const uic::render::SShaderDefaultMaterialKey &key) const + size_t operator()(const qt3ds::render::SShaderDefaultMaterialKey &key) const { return key.hash(); } diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShadowMap.h b/src/Runtime/Source/UICRender/Include/UICRenderShadowMap.h index d37da5b3..07e1c295 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderShadowMap.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderShadowMap.h @@ -42,7 +42,7 @@ #include "render/Qt3DSRenderTextureCube.h" #endif -namespace uic { +namespace qt3ds { namespace render { struct SLayerRenderData; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderString.h b/src/Runtime/Source/UICRender/Include/UICRenderString.h index b9a14f35..a33194ac 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderString.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderString.h @@ -33,7 +33,7 @@ #include "UICRender.h" #include <string> -namespace uic { +namespace qt3ds { namespace render { // can't name this CString else we will conflict a class CRenderString : public std::basic_string<char8_t> diff --git a/src/Runtime/Source/UICRender/Include/UICRenderSubPresentationHelper.h b/src/Runtime/Source/UICRender/Include/UICRenderSubPresentationHelper.h index 635e73de..876e10cb 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderSubPresentationHelper.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderSubPresentationHelper.h @@ -34,7 +34,7 @@ #include "UICRenderer.h" #include "render/Qt3DSRenderContext.h" -namespace uic { +namespace qt3ds { namespace render { // Small helper object to setup the state needed to render a sub presentation diff --git a/src/Runtime/Source/UICRender/Include/UICRenderSubpresentation.h b/src/Runtime/Source/UICRender/Include/UICRenderSubpresentation.h index b9837306..48c79262 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderSubpresentation.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderSubpresentation.h @@ -40,7 +40,7 @@ #include "foundation/StringTable.h" #include "render/Qt3DSRenderBaseTypes.h" -namespace uic { +namespace qt3ds { namespace render { class CSubPresentationRenderer; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTaggedPointer.h b/src/Runtime/Source/UICRender/Include/UICRenderTaggedPointer.h index 83b0a528..b94b3a44 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderTaggedPointer.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderTaggedPointer.h @@ -33,7 +33,7 @@ #include "UICRender.h" #include "foundation/StringTable.h" -namespace uic { +namespace qt3ds { namespace render { // User's will need to define specialize this struct in order diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTessModeValues.h b/src/Runtime/Source/UICRender/Include/UICRenderTessModeValues.h index b83fc5ff..4b089d04 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderTessModeValues.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderTessModeValues.h @@ -32,7 +32,7 @@ #define UIC_RENDER_TESS_MODE_VALUES_H #include "UICRender.h" -namespace uic { +namespace qt3ds { namespace render { struct SDefaultMaterial; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTextTextureAtlas.h b/src/Runtime/Source/UICRender/Include/UICRenderTextTextureAtlas.h index c99253c4..460d19e6 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderTextTextureAtlas.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderTextTextureAtlas.h @@ -35,7 +35,7 @@ #include "UICRenderText.h" #include "EASTL/algorithm.h" -namespace uic { +namespace qt3ds { namespace render { class ITextRenderer; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTextTextureCache.h b/src/Runtime/Source/UICRender/Include/UICRenderTextTextureCache.h index 485c540e..73a9a1fa 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderTextTextureCache.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderTextTextureCache.h @@ -35,7 +35,7 @@ #include "UICRenderText.h" #include "EASTL/algorithm.h" -namespace uic { +namespace qt3ds { namespace render { class ITextRenderer; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTextTypes.h b/src/Runtime/Source/UICRender/Include/UICRenderTextTypes.h index a51501a7..651f02b1 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderTextTypes.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderTextTypes.h @@ -36,7 +36,7 @@ #include "foundation/StringTable.h" #include "foundation/Qt3DSVec2.h" -namespace uic { +namespace qt3ds { namespace render { struct TextHorizontalAlignment diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTextureAtlas.h b/src/Runtime/Source/UICRender/Include/UICRenderTextureAtlas.h index edc9083e..80e3c9f4 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderTextureAtlas.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderTextureAtlas.h @@ -35,7 +35,7 @@ #include "render/Qt3DSRenderBaseTypes.h" #include "EASTL/algorithm.h" -namespace uic { +namespace qt3ds { namespace render { class ITextRenderer; diff --git a/src/Runtime/Source/UICRender/Include/UICRenderThreadPool.h b/src/Runtime/Source/UICRender/Include/UICRenderThreadPool.h index 1996f97c..0265c080 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderThreadPool.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderThreadPool.h @@ -33,7 +33,7 @@ #include "UICRender.h" #include "foundation/Qt3DSRefCounted.h" -namespace uic { +namespace qt3ds { namespace render { typedef void (*TTaskFunction)(void *inUserData); diff --git a/src/Runtime/Source/UICRender/Include/UICRenderUIPLoader.h b/src/Runtime/Source/UICRender/Include/UICRenderUIPLoader.h index 41853316..a15336ac 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderUIPLoader.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderUIPLoader.h @@ -49,7 +49,7 @@ struct SMetaDataEffect; struct SMetaDataCustomMaterial; } -namespace uic { +namespace qt3ds { namespace render { class IBufferManager; @@ -97,7 +97,7 @@ namespace render { , IEffectSystem &inEffectSystem, const char8_t *inPresentationDir, IRenderPluginManager &inPluginManager, ICustomMaterialSystem &inMaterialSystem, - IDynamicObjectSystem &inDynamicSystem, uic::render::IPathManager &inPathManager + IDynamicObjectSystem &inDynamicSystem, qt3ds::render::IPathManager &inPathManager // Resolve references to objects; this is done by the main uip loader during // its normal mode of operation so we try to reuse that code. , diff --git a/src/Runtime/Source/UICRender/Include/UICRenderUIPSharedTranslation.h b/src/Runtime/Source/UICRender/Include/UICRenderUIPSharedTranslation.h index e5997802..16aeb650 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderUIPSharedTranslation.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderUIPSharedTranslation.h @@ -42,7 +42,7 @@ #include "UICRenderPresentation.h" // map from UICDM to UIC::RENDER -namespace uic { +namespace qt3ds { namespace render { template <typename TEnumType> diff --git a/src/Runtime/Source/UICRender/Include/UICRenderWidgets.h b/src/Runtime/Source/UICRender/Include/UICRenderWidgets.h index 7b113f42..a8beed42 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderWidgets.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderWidgets.h @@ -42,7 +42,7 @@ #include "render/Qt3DSRenderIndexBuffer.h" #include "UICRenderText.h" -namespace uic { +namespace qt3ds { namespace render { struct SWidgetRenderInformation diff --git a/src/Runtime/Source/UICRender/Include/UICRenderWindowDimensions.h b/src/Runtime/Source/UICRender/Include/UICRenderWindowDimensions.h index 8f328cf1..b8ad4458 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderWindowDimensions.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderWindowDimensions.h @@ -33,7 +33,7 @@ #include "UICRender.h" #include "foundation/Qt3DSSimpleTypes.h" -namespace uic { +namespace qt3ds { namespace render { struct SWindowDimensions { diff --git a/src/Runtime/Source/UICRender/Include/UICRenderableImage.h b/src/Runtime/Source/UICRender/Include/UICRenderableImage.h index 0120c5f3..15819549 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderableImage.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderableImage.h @@ -32,7 +32,7 @@ #define UIC_RENDERABLE_IMAGE_H #include "UICRender.h" -namespace uic { +namespace qt3ds { namespace render { struct ImageMapTypes diff --git a/src/Runtime/Source/UICRender/Include/UICRenderer.h b/src/Runtime/Source/UICRender/Include/UICRenderer.h index d351e35a..fe71cfc4 100644 --- a/src/Runtime/Source/UICRender/Include/UICRenderer.h +++ b/src/Runtime/Source/UICRender/Include/UICRenderer.h @@ -42,7 +42,7 @@ #include "render/Qt3DSRenderBaseTypes.h" #include "UICRenderRay.h" -namespace uic { +namespace qt3ds { namespace render { class IRenderableObject; diff --git a/src/Runtime/Source/UICRender/Include/UICRendererUtil.h b/src/Runtime/Source/UICRender/Include/UICRendererUtil.h index 64dbe11f..d9d5c3b8 100644 --- a/src/Runtime/Source/UICRender/Include/UICRendererUtil.h +++ b/src/Runtime/Source/UICRender/Include/UICRendererUtil.h @@ -32,7 +32,7 @@ #define UIC_RENDERER_UTIL_H #include "UICRender.h" #include "render/Qt3DSRenderBaseTypes.h" -namespace uic { +namespace qt3ds { namespace render { class CRendererUtil { diff --git a/src/Runtime/Source/UICRender/Include/UICTextRenderer.h b/src/Runtime/Source/UICRender/Include/UICTextRenderer.h index da9632f2..11ff167d 100644 --- a/src/Runtime/Source/UICRender/Include/UICTextRenderer.h +++ b/src/Runtime/Source/UICRender/Include/UICTextRenderer.h @@ -36,7 +36,7 @@ #include "foundation/StringTable.h" #include "UICRenderTextTypes.h" -namespace uic { +namespace qt3ds { namespace render { struct SRendererFontEntry diff --git a/src/Runtime/Source/UICRender/Include/WINDOWS/DynamicLibLoader.h b/src/Runtime/Source/UICRender/Include/WINDOWS/DynamicLibLoader.h index 628a4d1e..c8f0dbc8 100644 --- a/src/Runtime/Source/UICRender/Include/WINDOWS/DynamicLibLoader.h +++ b/src/Runtime/Source/UICRender/Include/WINDOWS/DynamicLibLoader.h @@ -36,7 +36,7 @@ #include <QLibrary> -namespace uic { +namespace qt3ds { namespace render { using namespace qt3ds; // using namespace qt3ds::render; diff --git a/src/Runtime/Source/UICRender/Include/q3dsqmlrender.h b/src/Runtime/Source/UICRender/Include/q3dsqmlrender.h index 3e80080c..1c9ee287 100644 --- a/src/Runtime/Source/UICRender/Include/q3dsqmlrender.h +++ b/src/Runtime/Source/UICRender/Include/q3dsqmlrender.h @@ -35,7 +35,7 @@ class IQt3DS; -using namespace uic::render; +using namespace qt3ds::render; class IQ3DSQmlStreamService; class IQ3DSQmlStreamRenderer; diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.cpp b/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.cpp index 47dbbb59..effdcbb6 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.cpp +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.cpp @@ -38,7 +38,7 @@ using qt3ds::foundation::CRegisteredString; -namespace uic { +namespace qt3ds { namespace render { struct SRenderableImage; struct SShaderGeneratorGeneratedShader; diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.h b/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.h index 5d3e7c29..8a287afb 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.h +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.h @@ -43,7 +43,7 @@ #include "foundation/Qt3DSInvasiveLinkedList.h" #include "UICRenderableImage.h" -namespace uic { +namespace qt3ds { namespace render { struct RenderPreparationResultFlagValues diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.cpp b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.cpp index a6f90c43..085701f1 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.cpp +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.cpp @@ -76,7 +76,7 @@ using qt3ds::foundation::CRegisteredString; -namespace uic { +namespace qt3ds { namespace render { struct SRenderableImage; diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.h b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.h index ee553415..8d88a83b 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.h +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.h @@ -67,7 +67,7 @@ #include "UICRenderProfiler.h" #include "UICRenderDefaultMaterialShaderGenerator.h" -namespace uic { +namespace qt3ds { namespace render { inline bool FloatLessThan(QT3DSF32 lhs, QT3DSF32 rhs) diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.cpp b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.cpp index d8dc4cee..9b2d2cec 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.cpp +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.cpp @@ -66,7 +66,7 @@ #define UIC_CACHED_POST_EFFECT const float UIC3D_DEGREES_TO_RADIANS = 0.0174532925199f; -namespace uic { +namespace qt3ds { namespace render { using eastl::reverse; using eastl::stable_sort; diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.h b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.h index e73e9610..f9917353 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.h +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.h @@ -34,7 +34,7 @@ #include "UICRendererImplLayerRenderPreparationData.h" #include "UICRenderResourceBufferObjects.h" -namespace uic { +namespace qt3ds { namespace render { struct AdvancedBlendModes diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.cpp b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.cpp index 32028ef2..523a929d 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.cpp +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.cpp @@ -31,7 +31,7 @@ #include "UICRenderLayer.h" #include "UICTextRenderer.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { // left/top @@ -78,7 +78,7 @@ SLayerRenderHelper::SLayerRenderHelper(const NVRenderRectF &inPresentationViewpo const NVRenderRectF &inPresentationScissor, const QT3DSVec2 &inPresentationDesignDimensions, SLayer &inLayer, bool inOffscreen, - uic::render::ScaleModes::Enum inScaleMode, + qt3ds::render::ScaleModes::Enum inScaleMode, qt3ds::QT3DSVec2 inScaleFactor) : m_PresentationViewport(inPresentationViewport) , m_PresentationScissor(inPresentationScissor) @@ -93,7 +93,7 @@ SLayerRenderHelper::SLayerRenderHelper(const NVRenderRectF &inPresentationViewpo QT3DSF32 right = m_Layer->m_Right; QT3DSF32 width = m_Layer->m_Width; - if (m_ScaleMode == uic::render::ScaleModes::FitSelected) { + if (m_ScaleMode == qt3ds::render::ScaleModes::FitSelected) { if (m_Layer->m_LeftUnits == LayerUnitTypes::Pixels) left *= m_ScaleFactor.x; @@ -130,7 +130,7 @@ SLayerRenderHelper::SLayerRenderHelper(const NVRenderRectF &inPresentationViewpo QT3DSF32 bottom = m_Layer->m_Bottom; QT3DSF32 height = m_Layer->m_Height; - if (m_ScaleMode == uic::render::ScaleModes::FitSelected) { + if (m_ScaleMode == qt3ds::render::ScaleModes::FitSelected) { if (m_Layer->m_TopUnits == LayerUnitTypes::Pixels) top *= m_ScaleFactor.y; diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.h b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.h index 4947c7f1..e93173c7 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.h +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.h @@ -35,7 +35,7 @@ #include "UICRenderCamera.h" #include "UICRenderContext.h" -namespace uic { +namespace qt3ds { namespace render { /** An independent, testable entity to encapsulate taking at least: @@ -75,7 +75,7 @@ namespace render { SLayerRenderHelper(const NVRenderRectF &inPresentationViewport, const NVRenderRectF &inPresentationScissor, const QT3DSVec2 &inPresentationDesignDimensions, SLayer &inLayer, - bool inOffscreen, uic::render::ScaleModes::Enum inScaleMode, + bool inOffscreen, qt3ds::render::ScaleModes::Enum inScaleMode, qt3ds::QT3DSVec2 inScaleFactor); NVRenderRectF GetPresentationViewport() const { return m_PresentationViewport; } diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.cpp b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.cpp index e496fbfc..fd214c9a 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.cpp +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.cpp @@ -63,7 +63,7 @@ #ifdef _WIN32 #pragma warning(disable : 4355) #endif -namespace uic { +namespace qt3ds { namespace render { using eastl::reverse; using eastl::stable_sort; diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.h b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.h index c2edd416..f51dbb25 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.h +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.h @@ -43,7 +43,7 @@ #include "foundation/Qt3DSPool.h" #include "UICRenderableObjects.h" -namespace uic { +namespace qt3ds { namespace render { struct SLayerRenderData; class CUICRendererImpl; diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.cpp b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.cpp index a752e021..26c031ba 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.cpp +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.cpp @@ -42,7 +42,7 @@ // texture-based effects. #define UIC_RENDER_SUPPORT_DEPTH_TEXTURE 1 -namespace uic { +namespace qt3ds { namespace render { void STextShader::Render(NVRenderTexture2D &inTexture, diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.h b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.h index fe5af0d0..fda7813b 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.h +++ b/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.h @@ -34,7 +34,7 @@ #include "render/Qt3DSRenderShaderProgram.h" #include "render/Qt3DSRenderProgramPipeline.h" -namespace uic { +namespace qt3ds { namespace render { using qt3ds::render::NVRenderCachedShaderProperty; using qt3ds::render::NVRenderCachedShaderBuffer; diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICVertexPipelineImpl.h b/src/Runtime/Source/UICRender/RendererImpl/UICVertexPipelineImpl.h index 47419a99..56b5da7f 100644 --- a/src/Runtime/Source/UICRender/RendererImpl/UICVertexPipelineImpl.h +++ b/src/Runtime/Source/UICRender/RendererImpl/UICVertexPipelineImpl.h @@ -32,7 +32,7 @@ #define UIC_VERTEX_PIPELINE_IMPL_H #include "UICRenderDefaultMaterialShaderGenerator.h" -namespace uic { +namespace qt3ds { namespace render { // Baseclass for the vertex pipelines to be sure we have consistent implementations. struct SVertexPipelineImpl : public IDefaultMaterialVertexPipeline diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.cpp b/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.cpp index 725a3c2e..79c0722e 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.cpp +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.cpp @@ -37,7 +37,7 @@ #include "UICRenderInputStreamFactory.h" #include "UICRenderThreadPool.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { struct SBufferLoader; diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.h index dde8c1ab..60c2b4f2 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.h @@ -35,7 +35,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "foundation/StringTable.h" -namespace uic { +namespace qt3ds { namespace render { class IBufferLoaderCallback; diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.cpp b/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.cpp index 1082a532..9a076145 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.cpp +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.cpp @@ -50,7 +50,7 @@ #include "foundation/Qt3DSMutex.h" #include "UICRenderPrefilterTexture.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.h index 0c68bfc7..2a591a4f 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.h @@ -37,7 +37,7 @@ #include "UICRenderImageTextureData.h" #include "foundation/Qt3DSBounds3.h" -namespace uic { +namespace qt3ds { namespace render { class IBufferManager : public NVRefCounted diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.cpp b/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.cpp index f498d176..f3a44aa0 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.cpp +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.cpp @@ -44,7 +44,7 @@ #include "foundation/Qt3DSPool.h" #include "foundation/Qt3DSPerfTimer.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.h index 5c176f75..24cf5791 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSDataRef.h" -namespace uic { +namespace qt3ds { namespace render { struct ImageLoadResult { diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.cpp b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.cpp index f418e017..0aff7e4b 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.cpp +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.cpp @@ -39,7 +39,7 @@ #include "UICTextRenderer.h" #include <QImage> -using namespace uic::render; +using namespace qt3ds::render; SLoadedTexture *SLoadedTexture::LoadQImage(const QString &inPath, QT3DSI32 flipVertical, NVFoundationBase &fnd) diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.h index cc708903..6052288d 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.h @@ -44,7 +44,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace render { class IInputStreamFactory; diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.cpp b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.cpp index c494a688..4075a984 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.cpp +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.cpp @@ -31,9 +31,9 @@ #include "UICRenderLoadedTextureDDS.h" #include "UICRenderLoadedTextureFreeImageCompat.h" -using namespace uic::render; +using namespace qt3ds::render; -namespace uic { +namespace qt3ds { namespace render { static int s_exception_string; diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.h index 7e074cca..8eb00c68 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.h @@ -32,7 +32,7 @@ #ifndef UIC_RENDER_LOAD_DDS_H #define UIC_RENDER_LOAD_DDS_H -namespace uic { +namespace qt3ds { namespace render { /** The maximum number of mipmap levels (per texture or per cubemap face) */ diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureFreeImageCompat.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureFreeImageCompat.h index 9b3f73b8..026a3150 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureFreeImageCompat.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureFreeImageCompat.h @@ -45,7 +45,7 @@ // We use a compatibility layer so we can easily convert freeimage code to load our texture formats // where necessary. -namespace uic { +namespace qt3ds { namespace render { using namespace qt3ds::foundation; @@ -408,6 +408,6 @@ namespace render { } } -using namespace uic::render; +using namespace qt3ds::render; #endif diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.cpp b/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.cpp index 6a2e466c..0c414160 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.cpp +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.cpp @@ -37,7 +37,7 @@ using namespace qt3ds; using namespace qt3ds::render; using namespace qt3ds::foundation; -using namespace uic::render; +using namespace qt3ds::render; UICRenderPrefilterTexture::UICRenderPrefilterTexture(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth, QT3DSI32 inHeight, diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.h index fb637ef4..989a01f8 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.h @@ -37,7 +37,7 @@ #include "UICTypes.h" #include "UICRenderLoadedTexture.h" -namespace uic { +namespace qt3ds { namespace render { class UICRenderPrefilterTexture : public NVRefCounted diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.cpp b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.cpp index 501b82c9..059b38f5 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.cpp +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include "UICRenderResourceBufferObjects.h" -using namespace uic::render; +using namespace qt3ds::render; /* IResourceManager& m_ResourceManager; diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.h index 846cd054..378ef9b9 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.h @@ -36,7 +36,7 @@ #include "render/Qt3DSRenderFrameBuffer.h" #include "render/Qt3DSRenderRenderBuffer.h" -namespace uic { +namespace qt3ds { namespace render { class CResourceFrameBuffer { diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.cpp b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.cpp index b87a60a6..a95daca5 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.cpp +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.cpp @@ -37,7 +37,7 @@ #include "foundation/Qt3DSAtomic.h" #include "foundation/Qt3DSContainers.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.h index a684bbee..1f54c683 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "render/Qt3DSRenderBaseTypes.h" -namespace uic { +namespace qt3ds { namespace render { /** * Implements simple pooling of render resources diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.cpp b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.cpp index 228f75c8..1dc53a44 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.cpp +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include "UICRenderResourceTexture2D.h" -using namespace uic::render; +using namespace qt3ds::render; CResourceTexture2D::CResourceTexture2D(IResourceManager &mgr, NVRenderTexture2D *inTexture) : m_ResourceManager(mgr) diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.h b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.h index 936a5a15..1f0065f0 100644 --- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.h +++ b/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.h @@ -36,7 +36,7 @@ #include "render/Qt3DSRenderTexture2DArray.h" #include "UICRenderResourceManager.h" -namespace uic { +namespace qt3ds { namespace render { class CResourceTexture2D { diff --git a/src/Runtime/Source/UICRender/Source/UICOffscreenRenderManager.cpp b/src/Runtime/Source/UICRender/Source/UICOffscreenRenderManager.cpp index 307086b4..bfcdc56e 100644 --- a/src/Runtime/Source/UICRender/Source/UICOffscreenRenderManager.cpp +++ b/src/Runtime/Source/UICRender/Source/UICOffscreenRenderManager.cpp @@ -46,7 +46,7 @@ #include "UICRenderResourceBufferObjects.h" #include "UICRendererUtil.h" -using namespace uic::render; +using namespace qt3ds::render; namespace eastl { template <> diff --git a/src/Runtime/Source/UICRender/Source/UICOldNBustedRenderPlugin.cpp b/src/Runtime/Source/UICRender/Source/UICOldNBustedRenderPlugin.cpp index 11e55faa..bb665a98 100644 --- a/src/Runtime/Source/UICRender/Source/UICOldNBustedRenderPlugin.cpp +++ b/src/Runtime/Source/UICRender/Source/UICOldNBustedRenderPlugin.cpp @@ -37,7 +37,7 @@ // a physical error #endif -namespace uic { +namespace qt3ds { namespace render { COldNBustedPluginRenderer::COldNBustedPluginRenderer(IUICRenderContext &inRenderContext, diff --git a/src/Runtime/Source/UICRender/Source/UICOnscreenTextRenderer.cpp b/src/Runtime/Source/UICRender/Source/UICOnscreenTextRenderer.cpp index 3c42ea5c..a188903a 100644 --- a/src/Runtime/Source/UICRender/Source/UICOnscreenTextRenderer.cpp +++ b/src/Runtime/Source/UICRender/Source/UICOnscreenTextRenderer.cpp @@ -47,7 +47,7 @@ #include <QtGui/qrawfont.h> #include <QtCore/qfile.h> -using namespace uic::render; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/Source/UICQtTextRenderer.cpp b/src/Runtime/Source/UICRender/Source/UICQtTextRenderer.cpp index 2696ed11..0515ab4c 100644 --- a/src/Runtime/Source/UICRender/Source/UICQtTextRenderer.cpp +++ b/src/Runtime/Source/UICRender/Source/UICQtTextRenderer.cpp @@ -54,7 +54,7 @@ #include <QtMath> #include <QRawFont> -using namespace uic::render; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderClippingFrustum.cpp b/src/Runtime/Source/UICRender/Source/UICRenderClippingFrustum.cpp index b0328619..b022b5ee 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderClippingFrustum.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderClippingFrustum.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include "UICRenderClippingFrustum.h" -using namespace uic::render; +using namespace qt3ds::render; SClippingFrustum::SClippingFrustum(const QT3DSMat44 &modelviewprojection, SClipPlane nearPlane) { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderContext.cpp b/src/Runtime/Source/UICRender/Source/UICRenderContext.cpp index d0442450..87b4edd0 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderContext.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderContext.cpp @@ -66,7 +66,7 @@ #include "UICRenderDefaultMaterialShaderGenerator.h" #include "UICRenderCustomMaterialShaderGenerator.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialShaderGenerator.cpp b/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialShaderGenerator.cpp index c80e9c68..8daa8e61 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialShaderGenerator.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialShaderGenerator.cpp @@ -42,7 +42,7 @@ #include "UICRenderCustomMaterial.h" #include "UICRenderCustomMaterialSystem.h" -using namespace uic::render; +using namespace qt3ds::render; using qt3ds::render::NVRenderCachedShaderProperty; using qt3ds::render::NVRenderCachedShaderBuffer; @@ -659,8 +659,8 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator theShader.m_DepthTexture.Set(inDepthTexture); theShader.m_AOTexture.Set(inSSaoTexture); - uic::render::SImage *theLightProbe = inLightProbe; - uic::render::SImage *theLightProbe2 = inLightProbe2; + qt3ds::render::SImage *theLightProbe = inLightProbe; + qt3ds::render::SImage *theLightProbe2 = inLightProbe2; if (inMaterial.m_IblProbe && inMaterial.m_IblProbe->m_TextureData.m_Texture) { theLightProbe = inMaterial.m_IblProbe; @@ -914,7 +914,7 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator void GenerateFragmentShader(SShaderDefaultMaterialKey &, const char8_t *inShaderPathName) { - uic::render::IDynamicObjectSystem &theDynamicSystem( + qt3ds::render::IDynamicObjectSystem &theDynamicSystem( m_RenderContext.GetDynamicObjectSystem()); CRenderString theShaderBuffer; const char8_t *fragSource = theDynamicSystem.GetShaderSource( diff --git a/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialSystem.cpp b/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialSystem.cpp index 5ee2efd5..d854a7d3 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialSystem.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialSystem.cpp @@ -61,8 +61,8 @@ extern "C" { #include "lualib.h" } -using namespace uic::render; -using namespace uic::render::dynamic; +using namespace qt3ds::render; +using namespace qt3ds::render::dynamic; using qt3ds::render::NVRenderContextScopedProperty; using qt3ds::render::NVRenderCachedShaderProperty; using qt3ds::render::NVRenderCachedShaderBuffer; diff --git a/src/Runtime/Source/UICRender/Source/UICRenderDefaultMaterialShaderGenerator.cpp b/src/Runtime/Source/UICRender/Source/UICRenderDefaultMaterialShaderGenerator.cpp index 8b962ca4..a4244c9f 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderDefaultMaterialShaderGenerator.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderDefaultMaterialShaderGenerator.cpp @@ -42,7 +42,7 @@ #include "UICRenderDynamicObjectSystem.h" #include "render/Qt3DSRenderShaderProgram.h" -using namespace uic::render; +using namespace qt3ds::render; using qt3ds::render::NVRenderCachedShaderProperty; using qt3ds::render::NVRenderCachedShaderBuffer; @@ -1818,8 +1818,8 @@ struct SShaderGenerator : public IDefaultMaterialShaderGenerator shader.m_AOTexture.Set(inSSaoTexture); - uic::render::SImage *theLightProbe = inLightProbe; - uic::render::SImage *theLightProbe2 = inLightProbe2; + qt3ds::render::SImage *theLightProbe = inLightProbe; + qt3ds::render::SImage *theLightProbe2 = inLightProbe2; // If the material has its own IBL Override, we should use that image instead. if ((inMaterial.m_IblProbe) && (inMaterial.m_IblProbe->m_TextureData.m_Texture)) { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderDynamicObjectSystem.cpp b/src/Runtime/Source/UICRender/Source/UICRenderDynamicObjectSystem.cpp index ff4d7597..bdc75b05 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderDynamicObjectSystem.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderDynamicObjectSystem.cpp @@ -48,9 +48,9 @@ #include "UICRenderShaderCodeGenerator.h" #include "foundation/Qt3DSMutex.h" -using namespace uic; -using namespace uic::render; -using namespace uic::render::dynamic; +using namespace qt3ds; +using namespace qt3ds::render; +using namespace qt3ds::render::dynamic; // QT3DS_COMPILE_TIME_ASSERT( sizeof(void*) == 4 ); @@ -69,7 +69,7 @@ struct hash<TStrStrPair> }; } -namespace uic { +namespace qt3ds { namespace render { namespace dynamic { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderEffectSystem.cpp b/src/Runtime/Source/UICRender/Source/UICRenderEffectSystem.cpp index fc9ce829..a17a5a19 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderEffectSystem.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderEffectSystem.cpp @@ -55,8 +55,8 @@ #include "UICOffscreenRenderKey.h" #include "UICRenderDynamicObjectSystemUtil.h" -using namespace uic::render; -using namespace uic::render::dynamic; +using namespace qt3ds::render; +using namespace qt3ds::render::dynamic; using qt3ds::render::NVRenderContextScopedProperty; using qt3ds::render::NVRenderCachedShaderProperty; using qt3ds::render::NVRenderCachedShaderBuffer; @@ -298,7 +298,7 @@ typedef eastl::pair<CRegisteredString, NVScopedRefCounted<SImageEntry>> TNamedIm typedef eastl::pair<CRegisteredString, NVScopedRefCounted<SDataBufferEntry>> TNamedDataBufferEntry; } -namespace uic { +namespace qt3ds { namespace render { struct SEffectContext diff --git a/src/Runtime/Source/UICRender/Source/UICRenderEulerAngles.cpp b/src/Runtime/Source/UICRender/Source/UICRenderEulerAngles.cpp index e176c75f..259d10dd 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderEulerAngles.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderEulerAngles.cpp @@ -43,7 +43,7 @@ //============================================================================== // Namespace //============================================================================== -namespace uic { +namespace qt3ds { namespace render { //============================================================================== diff --git a/src/Runtime/Source/UICRender/Source/UICRenderGpuProfiler.cpp b/src/Runtime/Source/UICRender/Source/UICRenderGpuProfiler.cpp index eabb4a4d..f21d5969 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderGpuProfiler.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderGpuProfiler.cpp @@ -44,7 +44,7 @@ #define RECORDED_FRAME_DELAY 3 #define RECORDED_FRAME_DELAY_MASK 0x0003 -using namespace uic::render; +using namespace qt3ds::render; using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderGraphObjectSerializer.cpp b/src/Runtime/Source/UICRender/Source/UICRenderGraphObjectSerializer.cpp index 5f434156..68691dc7 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderGraphObjectSerializer.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderGraphObjectSerializer.cpp @@ -54,8 +54,8 @@ #include "UICRenderPathSubPath.h" #include "UICRenderPathManager.h" -using namespace uic::render; -using namespace uic::render::dynamic; +using namespace qt3ds::render; +using namespace qt3ds::render::dynamic; namespace { typedef nvhash_set<void *> TPtrSet; @@ -486,7 +486,7 @@ struct SGraphObjectSerializerImpl<SPathSubPath> if (theSubPath) { QT3DSU32 numPoints = *inReadContext.Load<QT3DSU32>(); SPathAnchorPoint *theAnchorPointBuffer = - reinterpret_cast<uic::render::SPathAnchorPoint *>(inReadContext.m_CurrentPtr); + reinterpret_cast<qt3ds::render::SPathAnchorPoint *>(inReadContext.m_CurrentPtr); inReadContext.m_CurrentPtr += sizeof(SPathAnchorPoint) * numPoints; // CN - !!Note this call is done on multiple threads simultaneously. I added a mutex to diff --git a/src/Runtime/Source/UICRender/Source/UICRenderImageScaler.cpp b/src/Runtime/Source/UICRender/Source/UICRenderImageScaler.cpp index 0f69d626..fc8bd8e1 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderImageScaler.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderImageScaler.cpp @@ -37,7 +37,7 @@ #include "UICRenderImageScaler.h" #include "foundation/Qt3DSMemoryBuffer.h" -using namespace uic::render; +using namespace qt3ds::render; //============================================================================== // Namespace //============================================================================== diff --git a/src/Runtime/Source/UICRender/Source/UICRenderInputStreamFactory.cpp b/src/Runtime/Source/UICRender/Source/UICRenderInputStreamFactory.cpp index c7637c48..936ce715 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderInputStreamFactory.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderInputStreamFactory.cpp @@ -47,7 +47,7 @@ #include <QFileInfo> #include <QUrl> -using namespace uic::render; +using namespace qt3ds::render; namespace { struct SInputStream : public IRefCountedInputStream diff --git a/src/Runtime/Source/UICRender/Source/UICRenderPathManager.cpp b/src/Runtime/Source/UICRender/Source/UICRenderPathManager.cpp index 7427dcbf..80d4b0ae 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderPathManager.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderPathManager.cpp @@ -64,7 +64,7 @@ #include "UICRenderInputStreamFactory.h" #include "foundation/Qt3DSMutex.h" -using namespace uic::render; +using namespace qt3ds::render; using qt3ds::render::NVRenderCachedShaderProperty; using qt3ds::render::NVRenderCachedShaderBuffer; using qt3ds::render::NVRenderStencilFunctionArgument; @@ -73,7 +73,7 @@ using qt3ds::render::NVRenderStencilOperationArgument; using qt3ds::render::NVRenderStencilOp; typedef UICIMP::SPathBuffer TImportPathBuffer; -using namespace uic::render::path; +using namespace qt3ds::render::path; typedef eastl::pair<CRegisteredString, CRegisteredString> TStrStrPair; diff --git a/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsRenderer.cpp b/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsRenderer.cpp index b58b6352..b92c3c24 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsRenderer.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsRenderer.cpp @@ -37,8 +37,8 @@ #include "render/Qt3DSRenderShaderProgram.h" #include "UICRenderShaderCache.h" -using namespace uic; -using namespace uic::render; +using namespace qt3ds; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsTypes.cpp b/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsTypes.cpp index 5d072f1f..253f2f2b 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsTypes.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsTypes.cpp @@ -29,8 +29,8 @@ ****************************************************************************/ #include "UICRenderPixelGraphicsTypes.h" -using namespace uic; -using namespace uic::render; +using namespace qt3ds; +using namespace qt3ds::render; SPGGraphObject::SPGGraphObject(SGTypes::Enum inType) : m_Type(inType) diff --git a/src/Runtime/Source/UICRender/Source/UICRenderPlugin.cpp b/src/Runtime/Source/UICRender/Source/UICRenderPlugin.cpp index 65ce11e1..63acc498 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderPlugin.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderPlugin.cpp @@ -54,7 +54,7 @@ #error "Must define an operating system type (QT3DS_WINDOWS, QT3DS_ANDROID, QT3DS_LINUX, QT3DS_APPLE, QT3DS_QNX)" #endif -using namespace uic::render; +using namespace qt3ds::render; namespace { // Legacy definitions... diff --git a/src/Runtime/Source/UICRender/Source/UICRenderRay.cpp b/src/Runtime/Source/UICRender/Source/UICRenderRay.cpp index 21e0d460..bceacb1e 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderRay.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderRay.cpp @@ -30,7 +30,7 @@ #include "UICRenderRay.h" #include "foundation/Qt3DSPlane.h" -using namespace uic::render; +using namespace qt3ds::render; // http://www.siggraph.org/education/materials/HyperGraph/raytrace/rayplane_intersection.htm diff --git a/src/Runtime/Source/UICRender/Source/UICRenderRenderList.cpp b/src/Runtime/Source/UICRender/Source/UICRenderRenderList.cpp index f36bebb7..7862c029 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderRenderList.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderRenderList.cpp @@ -34,7 +34,7 @@ #include "foundation/Qt3DSContainers.h" #include "render/Qt3DSRenderBaseTypes.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderShaderCache.cpp b/src/Runtime/Source/UICRender/Source/UICRenderShaderCache.cpp index 850c81ed..197797b2 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderShaderCache.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderShaderCache.cpp @@ -47,7 +47,7 @@ #include <QRegularExpression> #include <QString> -using namespace uic::render; +using namespace qt3ds::render; namespace { using qt3ds::render::NVRenderContextScopedProperty; @@ -729,7 +729,7 @@ struct ShaderCache : public IShaderCache }; } -size_t uic::render::HashShaderFeatureSet(NVConstDataRef<SShaderPreprocessorFeature> inFeatureSet) +size_t qt3ds::render::HashShaderFeatureSet(NVConstDataRef<SShaderPreprocessorFeature> inFeatureSet) { size_t retval(0); for (QT3DSU32 idx = 0, end = inFeatureSet.size(); idx < end; ++idx) { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGenerator.cpp b/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGenerator.cpp index db9e94d7..2fdfea32 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGenerator.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGenerator.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include "UICRenderShaderCodeGenerator.h" -using namespace uic::render; +using namespace qt3ds::render; using eastl::make_pair; diff --git a/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGeneratorV2.cpp b/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGeneratorV2.cpp index f7855c74..7dd07063 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGeneratorV2.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGeneratorV2.cpp @@ -39,7 +39,7 @@ #include <QtGui/qopengl.h> -using namespace uic::render; +using namespace qt3ds::render; namespace { struct SStageGeneratorBase : public IShaderStageGenerator @@ -478,7 +478,7 @@ struct SProgramGenerator : public IShaderProgramGenerator return NULL; } - uic::render::IDynamicObjectSystem &theDynamicSystem(m_UICContext.GetDynamicObjectSystem()); + qt3ds::render::IDynamicObjectSystem &theDynamicSystem(m_UICContext.GetDynamicObjectSystem()); SShaderCacheProgramFlags theCacheFlags(inFlags); for (QT3DSU32 stageIdx = 0, stageEnd = ShaderGeneratorStages::StageCount; stageIdx < stageEnd; ++stageIdx) { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderShadowMap.cpp b/src/Runtime/Source/UICRender/Source/UICRenderShadowMap.cpp index c5b870c6..e7542b5f 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderShadowMap.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderShadowMap.cpp @@ -35,7 +35,7 @@ #include "render/Qt3DSRenderShaderConstant.h" #include "render/Qt3DSRenderShaderProgram.h" -using namespace uic::render; +using namespace qt3ds::render; using qt3ds::render::NVRenderContextScopedProperty; using qt3ds::render::NVRenderCachedShaderProperty; diff --git a/src/Runtime/Source/UICRender/Source/UICRenderSubpresentation.cpp b/src/Runtime/Source/UICRender/Source/UICRenderSubpresentation.cpp index b045be95..586c9e09 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderSubpresentation.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderSubpresentation.cpp @@ -33,7 +33,7 @@ #pragma warning(disable : 4355) // this used in initializer list. I have never seen this result in // a physical error #endif -namespace uic { +namespace qt3ds { namespace render { SUICRenderPickResult CSubPresentationPickQuery::Pick(const QT3DSVec2 &inMouseCoords, diff --git a/src/Runtime/Source/UICRender/Source/UICRenderTextTextureAtlas.cpp b/src/Runtime/Source/UICRender/Source/UICRenderTextTextureAtlas.cpp index cc027f8d..37bd816e 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderTextTextureAtlas.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderTextTextureAtlas.cpp @@ -35,7 +35,7 @@ #include "foundation/Qt3DSBroadcastingAllocator.h" #include "render/Qt3DSRenderContext.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderTextTextureCache.cpp b/src/Runtime/Source/UICRender/Source/UICRenderTextTextureCache.cpp index 6aba0c36..8bbfecd2 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderTextTextureCache.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderTextTextureCache.cpp @@ -38,13 +38,13 @@ #include "foundation/Qt3DSInvasiveLinkedList.h" #include "foundation/Qt3DSPool.h" -using namespace uic::render; +using namespace qt3ds::render; namespace eastl { template <> struct hash<STextRenderInfo> { - size_t operator()(const uic::render::STextRenderInfo &inInfo) const + size_t operator()(const qt3ds::render::STextRenderInfo &inInfo) const { size_t retval = hash<size_t>()(reinterpret_cast<size_t>(inInfo.m_Text.c_str())); retval = retval ^ hash<size_t>()(reinterpret_cast<size_t>(inInfo.m_Font.c_str())); diff --git a/src/Runtime/Source/UICRender/Source/UICRenderTextureAtlas.cpp b/src/Runtime/Source/UICRender/Source/UICRenderTextureAtlas.cpp index 194ec797..8d53f287 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderTextureAtlas.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderTextureAtlas.cpp @@ -35,7 +35,7 @@ #include "render/Qt3DSRenderTexture2D.h" #include "render/Qt3DSRenderContext.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { diff --git a/src/Runtime/Source/UICRender/Source/UICRenderThreadPool.cpp b/src/Runtime/Source/UICRender/Source/UICRenderThreadPool.cpp index 0a6fbc61..1b034c6e 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderThreadPool.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderThreadPool.cpp @@ -40,7 +40,7 @@ #include "foundation/Qt3DSPool.h" #include "foundation/Qt3DSInvasiveLinkedList.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { struct STask diff --git a/src/Runtime/Source/UICRender/Source/UICRenderUIPLoader.cpp b/src/Runtime/Source/UICRender/Source/UICRenderUIPLoader.cpp index 110bcef4..ad7befb9 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderUIPLoader.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderUIPLoader.cpp @@ -83,42 +83,42 @@ using qt3ds::QT3DSF32; using qt3ds::QT3DSVec3; using qt3ds::foundation::nvvector; using qt3ds::QT3DSU32; -using uic::render::RenderLightTypes; -using uic::render::DefaultMaterialLighting; -using uic::render::ImageMappingModes; -using uic::render::DefaultMaterialBlendMode; +using qt3ds::render::RenderLightTypes; +using qt3ds::render::DefaultMaterialLighting; +using qt3ds::render::ImageMappingModes; +using qt3ds::render::DefaultMaterialBlendMode; using qt3ds::render::NVRenderTextureCoordOp; using qt3ds::foundation::IStringTable; using qt3ds::NVFoundationBase; using namespace qt3ds; using namespace qt3ds::foundation; -using uic::render::TIdObjectMap; -using uic::render::IBufferManager; -using uic::render::IEffectSystem; -using uic::render::SPresentation; -using uic::render::SScene; -using uic::render::SLayer; -using uic::render::SNode; -using uic::render::SLight; -using uic::render::SCamera; -using uic::render::SModel; -using uic::render::SText; -using uic::render::SDefaultMaterial; -using uic::render::SImage; -using uic::render::SGraphObject; -using uic::render::SDynamicObject; -using uic::render::SEffect; -using uic::render::SCustomMaterial; -using uic::render::GraphObjectTypes; -using uic::render::NodeFlags; +using qt3ds::render::TIdObjectMap; +using qt3ds::render::IBufferManager; +using qt3ds::render::IEffectSystem; +using qt3ds::render::SPresentation; +using qt3ds::render::SScene; +using qt3ds::render::SLayer; +using qt3ds::render::SNode; +using qt3ds::render::SLight; +using qt3ds::render::SCamera; +using qt3ds::render::SModel; +using qt3ds::render::SText; +using qt3ds::render::SDefaultMaterial; +using qt3ds::render::SImage; +using qt3ds::render::SGraphObject; +using qt3ds::render::SDynamicObject; +using qt3ds::render::SEffect; +using qt3ds::render::SCustomMaterial; +using qt3ds::render::GraphObjectTypes; +using qt3ds::render::NodeFlags; using qt3ds::foundation::CRegisteredString; -using uic::render::CRenderString; +using qt3ds::render::CRenderString; using qt3ds::foundation::CFileTools; -using uic::render::SReferencedMaterial; -using uic::render::IUIPReferenceResolver; -using uic::render::SPath; -using uic::render::SPathSubPath; -using uic::render::SLightmaps; +using qt3ds::render::SReferencedMaterial; +using qt3ds::render::IUIPReferenceResolver; +using qt3ds::render::SPath; +using qt3ds::render::SPathSubPath; +using qt3ds::render::SLightmaps; namespace UICDM { template <> @@ -454,7 +454,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver IStringTable &m_StrTable; NVFoundationBase &m_Foundation; NVAllocatorCallback &m_PresentationAllocator; - uic::render::TIdObjectMap &m_ObjectMap; + qt3ds::render::TIdObjectMap &m_ObjectMap; IBufferManager &m_BufferManager; SPresentation *m_Presentation; nvvector<char8_t> m_TempBuf; @@ -462,10 +462,10 @@ struct SRenderUIPLoader : public IDOMReferenceResolver IEffectSystem &m_EffectSystem; const char8_t *m_PresentationDir; CRenderString m_PathString; - uic::render::IRenderPluginManager &m_RenderPluginManager; - uic::render::ICustomMaterialSystem &m_CustomMaterialSystem; - uic::render::IDynamicObjectSystem &m_DynamicObjectSystem; - uic::render::IPathManager &m_PathManager; + qt3ds::render::IRenderPluginManager &m_RenderPluginManager; + qt3ds::render::ICustomMaterialSystem &m_CustomMaterialSystem; + qt3ds::render::IDynamicObjectSystem &m_DynamicObjectSystem; + qt3ds::render::IPathManager &m_PathManager; TIdStringMap m_RenderPluginSourcePaths; IUIPReferenceResolver *m_ReferenceResolver; MemoryBuffer<RawAllocator> m_TempBuffer; @@ -484,10 +484,10 @@ struct SRenderUIPLoader : public IDOMReferenceResolver , TIdObjectMap &ioObjectMap, IBufferManager &inBufferManager, IEffectSystem &inEffectSystem, const char8_t *inPresentationDir, - uic::render::IRenderPluginManager &inRPM, - uic::render::ICustomMaterialSystem &inCMS, - uic::render::IDynamicObjectSystem &inDynamicSystem, - uic::render::IPathManager &inPathManager, IUIPReferenceResolver *inResolver) + qt3ds::render::IRenderPluginManager &inRPM, + qt3ds::render::ICustomMaterialSystem &inCMS, + qt3ds::render::IDynamicObjectSystem &inDynamicSystem, + qt3ds::render::IPathManager &inPathManager, IUIPReferenceResolver *inResolver) : m_Reader(inReader) , m_MetaData(inMetaData) , m_StrTable(inStrTable) @@ -519,7 +519,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver CRegisteredString resolvedReference = m_ReferenceResolver->ResolveReference(inRoot.m_Id, path); if (resolvedReference.IsValid()) { - uic::render::TIdObjectMap::iterator iter = m_ObjectMap.find(resolvedReference); + qt3ds::render::TIdObjectMap::iterator iter = m_ObjectMap.find(resolvedReference); if (iter != m_ObjectMap.end()) return iter->second; } @@ -573,7 +573,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver QT3DSU32 &ioRotationOrder) { if (ParseProperty(inParser, inName, m_TempParseString)) - ioRotationOrder = uic::render::MapRotationOrder(m_TempParseString.c_str()); + ioRotationOrder = qt3ds::render::MapRotationOrder(m_TempParseString.c_str()); } void ParseOrientation(IPropertyParser &inParser, const char8_t *inName, NodeFlags &ioFlags) { @@ -594,8 +594,8 @@ struct SRenderUIPLoader : public IDOMReferenceResolver template <typename TEnumType> static bool ConvertEnumFromStr(const char8_t *inStr, TEnumType &ioEnum) { - uic::render::SEnumNameMap *theMap = uic::render::SEnumParseMap<TEnumType>::GetMap(); - for (uic::render::SEnumNameMap *item = theMap; item->m_Name; ++item) { + qt3ds::render::SEnumNameMap *theMap = qt3ds::render::SEnumParseMap<TEnumType>::GetMap(); + for (qt3ds::render::SEnumNameMap *item = theMap; item->m_Name; ++item) { if (UICDM::AreEqual(inStr, item->m_Name)) { ioEnum = static_cast<TEnumType>(item->m_Enum); return true; @@ -637,8 +637,8 @@ struct SRenderUIPLoader : public IDOMReferenceResolver } void ParseNodeFlagsProperty(IPropertyParser &inParser, const char8_t *inName, - uic::render::NodeFlags &ioFlags, - uic::render::NodeFlagValues::Enum prop) + qt3ds::render::NodeFlags &ioFlags, + qt3ds::render::NodeFlagValues::Enum prop) { bool temp; if (ParseProperty(inParser, inName, temp)) @@ -646,8 +646,8 @@ struct SRenderUIPLoader : public IDOMReferenceResolver } void ParseNodeFlagsInverseProperty(IPropertyParser &inParser, const char8_t *inName, - uic::render::NodeFlags &ioFlags, - uic::render::NodeFlagValues::Enum prop) + qt3ds::render::NodeFlags &ioFlags, + qt3ds::render::NodeFlagValues::Enum prop) { bool temp; if (ParseProperty(inParser, inName, temp)) @@ -832,10 +832,10 @@ struct SRenderUIPLoader : public IDOMReferenceResolver inItem.m_##name = !inItem.m_##name; #define HANDLE_UIC_NODE_FLAGS_PROPERTY(type, name, dirty) \ ParseNodeFlagsProperty(inParser, type##_##name, inItem.m_Flags, \ - uic::render::NodeFlagValues::name); + qt3ds::render::NodeFlagValues::name); #define HANDLE_UIC_NODE_FLAGS_INVERSE_PROPERTY(type, name, dirty) \ ParseNodeFlagsInverseProperty(inParser, type##_##name, inItem.m_Flags, \ - uic::render::NodeFlagValues::name); + qt3ds::render::NodeFlagValues::name); #define HANDLE_UIC_RENDER_ENUM_PROPERTY(type, name, dirty) \ ParseEnumProperty(inParser, type##_##name, inItem.m_##name); #define HANDLE_UIC_RENDER_SOURCEPATH_PROPERTY(type, name, dirty) \ @@ -924,14 +924,14 @@ struct SRenderUIPLoader : public IDOMReferenceResolver } template <typename TDataType> void SetDynamicObjectProperty(SDynamicObject &inEffect, - const uic::render::dynamic::SPropertyDefinition &inPropDesc, + const qt3ds::render::dynamic::SPropertyDefinition &inPropDesc, const TDataType &inProp) { memCopy(inEffect.GetDataSectionBegin() + inPropDesc.m_Offset, &inProp, sizeof(TDataType)); } template <typename TDataType> void SetDynamicObjectProperty(SDynamicObject &inEffect, - const uic::render::dynamic::SPropertyDefinition &inPropDesc, + const qt3ds::render::dynamic::SPropertyDefinition &inPropDesc, Option<TDataType> inProp) { if (inProp.hasValue()) { @@ -946,11 +946,11 @@ struct SRenderUIPLoader : public IDOMReferenceResolver } void ParseProperties(SDynamicObject &inDynamicObject, IPropertyParser &inParser) { - NVConstDataRef<uic::render::dynamic::SPropertyDefinition> theProperties = + NVConstDataRef<qt3ds::render::dynamic::SPropertyDefinition> theProperties = m_DynamicObjectSystem.GetProperties(inDynamicObject.m_ClassName); for (QT3DSU32 idx = 0, end = theProperties.size(); idx < end; ++idx) { - const uic::render::dynamic::SPropertyDefinition &theDefinition(theProperties[idx]); + const qt3ds::render::dynamic::SPropertyDefinition &theDefinition(theProperties[idx]); switch (theDefinition.m_DataType) { case qt3ds::render::NVRenderShaderDataTypes::QT3DSRenderBool: SetDynamicObjectProperty(inDynamicObject, theDefinition, @@ -1015,115 +1015,115 @@ struct SRenderUIPLoader : public IDOMReferenceResolver ITERATE_UIC_RENDER_PATH_SUBPATH_PROPERTIES } - void AddPluginPropertyUpdate(eastl::vector<uic::render::SRenderPropertyValueUpdate> &ioUpdates, - uic::render::IRenderPluginClass &, - const uic::render::SRenderPluginPropertyDeclaration &inDeclaration, + void AddPluginPropertyUpdate(eastl::vector<qt3ds::render::SRenderPropertyValueUpdate> &ioUpdates, + qt3ds::render::IRenderPluginClass &, + const qt3ds::render::SRenderPluginPropertyDeclaration &inDeclaration, Option<float> data) { if (data.hasValue()) { ioUpdates.push_back( - uic::render::SRenderPropertyValueUpdate(inDeclaration.m_Name, *data)); + qt3ds::render::SRenderPropertyValueUpdate(inDeclaration.m_Name, *data)); } } - void AddPluginPropertyUpdate(eastl::vector<uic::render::SRenderPropertyValueUpdate> &ioUpdates, - uic::render::IRenderPluginClass &inClass, - const uic::render::SRenderPluginPropertyDeclaration &inDeclaration, + void AddPluginPropertyUpdate(eastl::vector<qt3ds::render::SRenderPropertyValueUpdate> &ioUpdates, + qt3ds::render::IRenderPluginClass &inClass, + const qt3ds::render::SRenderPluginPropertyDeclaration &inDeclaration, Option<QT3DSVec2> data) { if (data.hasValue()) { - ioUpdates.push_back(uic::render::SRenderPropertyValueUpdate( + ioUpdates.push_back(qt3ds::render::SRenderPropertyValueUpdate( inClass.GetPropertyValueInfo(inDeclaration.m_StartOffset).first, data->x)); - ioUpdates.push_back(uic::render::SRenderPropertyValueUpdate( + ioUpdates.push_back(qt3ds::render::SRenderPropertyValueUpdate( inClass.GetPropertyValueInfo(inDeclaration.m_StartOffset + 1).first, data->y)); } } - void AddPluginPropertyUpdate(eastl::vector<uic::render::SRenderPropertyValueUpdate> &ioUpdates, - uic::render::IRenderPluginClass &inClass, - const uic::render::SRenderPluginPropertyDeclaration &inDeclaration, + void AddPluginPropertyUpdate(eastl::vector<qt3ds::render::SRenderPropertyValueUpdate> &ioUpdates, + qt3ds::render::IRenderPluginClass &inClass, + const qt3ds::render::SRenderPluginPropertyDeclaration &inDeclaration, Option<QT3DSVec3> data) { if (data.hasValue()) { - ioUpdates.push_back(uic::render::SRenderPropertyValueUpdate( + ioUpdates.push_back(qt3ds::render::SRenderPropertyValueUpdate( inClass.GetPropertyValueInfo(inDeclaration.m_StartOffset).first, data->x)); - ioUpdates.push_back(uic::render::SRenderPropertyValueUpdate( + ioUpdates.push_back(qt3ds::render::SRenderPropertyValueUpdate( inClass.GetPropertyValueInfo(inDeclaration.m_StartOffset + 1).first, data->y)); - ioUpdates.push_back(uic::render::SRenderPropertyValueUpdate( + ioUpdates.push_back(qt3ds::render::SRenderPropertyValueUpdate( inClass.GetPropertyValueInfo(inDeclaration.m_StartOffset + 2).first, data->z)); } } - void AddPluginPropertyUpdate(eastl::vector<uic::render::SRenderPropertyValueUpdate> &ioUpdates, - uic::render::IRenderPluginClass &, - const uic::render::SRenderPluginPropertyDeclaration &inDeclaration, + void AddPluginPropertyUpdate(eastl::vector<qt3ds::render::SRenderPropertyValueUpdate> &ioUpdates, + qt3ds::render::IRenderPluginClass &, + const qt3ds::render::SRenderPluginPropertyDeclaration &inDeclaration, Option<qt3ds::QT3DSI32> dataOpt) { if (dataOpt.hasValue()) { long data = static_cast<long>(*dataOpt); ioUpdates.push_back( - uic::render::SRenderPropertyValueUpdate(inDeclaration.m_Name, (QT3DSI32)data)); + qt3ds::render::SRenderPropertyValueUpdate(inDeclaration.m_Name, (QT3DSI32)data)); } } - void AddPluginPropertyUpdate(eastl::vector<uic::render::SRenderPropertyValueUpdate> &ioUpdates, - uic::render::IRenderPluginClass &, - const uic::render::SRenderPluginPropertyDeclaration &inDeclaration, + void AddPluginPropertyUpdate(eastl::vector<qt3ds::render::SRenderPropertyValueUpdate> &ioUpdates, + qt3ds::render::IRenderPluginClass &, + const qt3ds::render::SRenderPluginPropertyDeclaration &inDeclaration, Option<eastl::string> dataOpt) { if (dataOpt.hasValue()) { eastl::string &data = dataOpt.getValue(); - ioUpdates.push_back(uic::render::SRenderPropertyValueUpdate( + ioUpdates.push_back(qt3ds::render::SRenderPropertyValueUpdate( inDeclaration.m_Name, m_StrTable.RegisterStr(data.c_str()))); } } - void AddPluginPropertyUpdate(eastl::vector<uic::render::SRenderPropertyValueUpdate> &ioUpdates, - uic::render::IRenderPluginClass &, - const uic::render::SRenderPluginPropertyDeclaration &inDeclaration, + void AddPluginPropertyUpdate(eastl::vector<qt3ds::render::SRenderPropertyValueUpdate> &ioUpdates, + qt3ds::render::IRenderPluginClass &, + const qt3ds::render::SRenderPluginPropertyDeclaration &inDeclaration, Option<bool> dataOpt) { if (dataOpt.hasValue()) { bool &data = dataOpt.getValue(); ioUpdates.push_back( - uic::render::SRenderPropertyValueUpdate(inDeclaration.m_Name, data)); + qt3ds::render::SRenderPropertyValueUpdate(inDeclaration.m_Name, data)); } } - void ParseProperties(uic::render::SRenderPlugin &inRenderPlugin, IPropertyParser &inParser) + void ParseProperties(qt3ds::render::SRenderPlugin &inRenderPlugin, IPropertyParser &inParser) { - uic::render::IRenderPluginClass *theClass = + qt3ds::render::IRenderPluginClass *theClass = m_RenderPluginManager.GetRenderPlugin(inRenderPlugin.m_PluginPath); if (theClass) { - qt3ds::foundation::NVConstDataRef<uic::render::SRenderPluginPropertyDeclaration> + qt3ds::foundation::NVConstDataRef<qt3ds::render::SRenderPluginPropertyDeclaration> theClassProps = theClass->GetRegisteredProperties(); if (theClassProps.size()) { - uic::render::IRenderPluginInstance *theInstance = + qt3ds::render::IRenderPluginInstance *theInstance = m_RenderPluginManager.GetOrCreateRenderPluginInstance( inRenderPlugin.m_PluginPath, &inRenderPlugin); if (theInstance) { - eastl::vector<uic::render::SRenderPropertyValueUpdate> theUpdates; + eastl::vector<qt3ds::render::SRenderPropertyValueUpdate> theUpdates; for (QT3DSU32 idx = 0, end = theClassProps.size(); idx < end; ++idx) { - const uic::render::SRenderPluginPropertyDeclaration &theDec( + const qt3ds::render::SRenderPluginPropertyDeclaration &theDec( theClassProps[idx]); eastl::string tempStr; switch (theDec.m_Type) { - case uic::render::SRenderPluginPropertyTypes::Float: + case qt3ds::render::SRenderPluginPropertyTypes::Float: AddPluginPropertyUpdate(theUpdates, *theClass, theDec, inParser.ParseFloat(theDec.m_Name.c_str())); break; - case uic::render::SRenderPluginPropertyTypes::Vector2: + case qt3ds::render::SRenderPluginPropertyTypes::Vector2: AddPluginPropertyUpdate(theUpdates, *theClass, theDec, inParser.ParseVec2(theDec.m_Name.c_str())); break; - case uic::render::SRenderPluginPropertyTypes::Color: - case uic::render::SRenderPluginPropertyTypes::Vector3: + case qt3ds::render::SRenderPluginPropertyTypes::Color: + case qt3ds::render::SRenderPluginPropertyTypes::Vector3: AddPluginPropertyUpdate(theUpdates, *theClass, theDec, inParser.ParseVec3(theDec.m_Name.c_str())); break; - case uic::render::SRenderPluginPropertyTypes::Long: + case qt3ds::render::SRenderPluginPropertyTypes::Long: AddPluginPropertyUpdate(theUpdates, *theClass, theDec, inParser.ParseI32(theDec.m_Name.c_str())); break; - case uic::render::SRenderPluginPropertyTypes::String: + case qt3ds::render::SRenderPluginPropertyTypes::String: AddPluginPropertyUpdate(theUpdates, *theClass, theDec, inParser.ParseStr(theDec.m_Name.c_str())); break; - case uic::render::SRenderPluginPropertyTypes::Boolean: + case qt3ds::render::SRenderPluginPropertyTypes::Boolean: AddPluginPropertyUpdate(theUpdates, *theClass, theDec, inParser.ParseBool(theDec.m_Name.c_str())); break; @@ -1231,11 +1231,11 @@ struct SRenderUIPLoader : public IDOMReferenceResolver m_RenderPluginSourcePaths.find(m_StrTable.RegisterStr(classId)); if (iter != m_RenderPluginSourcePaths.end()) { CRegisteredString thePluginPath = m_StrTable.RegisterStr(iter->second.c_str()); - uic::render::IRenderPluginClass *theClass = + qt3ds::render::IRenderPluginClass *theClass = m_RenderPluginManager.GetRenderPlugin(thePluginPath); if (theClass) { - uic::render::SRenderPlugin *thePlugin = - QT3DS_NEW(m_PresentationAllocator, uic::render::SRenderPlugin)(); + qt3ds::render::SRenderPlugin *thePlugin = + QT3DS_NEW(m_PresentationAllocator, qt3ds::render::SRenderPlugin)(); thePlugin->m_PluginPath = thePluginPath; thePlugin->m_Flags.SetActive(true); theNewObject = thePlugin; @@ -1347,8 +1347,8 @@ struct SRenderUIPLoader : public IDOMReferenceResolver } } else { if (theNewObject->m_Type == GraphObjectTypes::RenderPlugin) { - uic::render::SRenderPlugin *childObj = - static_cast<uic::render::SRenderPlugin *>(theNewObject); + qt3ds::render::SRenderPlugin *childObj = + static_cast<qt3ds::render::SRenderPlugin *>(theNewObject); if (inParent->m_Type == GraphObjectTypes::Layer) { static_cast<SLayer *>(inParent)->m_RenderPlugin = childObj; } else { @@ -1363,7 +1363,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver if (inParent->m_Type == GraphObjectTypes::Image && theNewObject->m_Type == GraphObjectTypes::RenderPlugin) { static_cast<SImage *>(inParent)->m_RenderPlugin = - static_cast<uic::render::SRenderPlugin *>(theNewObject); + static_cast<qt3ds::render::SRenderPlugin *>(theNewObject); } else { QT3DS_ASSERT(false); } @@ -1439,7 +1439,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver ParsePass2Properties(*static_cast<SEffect *>(theObject->second), theClass); break; case GraphObjectTypes::RenderPlugin: - ParsePass2Properties(*static_cast<uic::render::SRenderPlugin *>(theObject->second), + ParsePass2Properties(*static_cast<qt3ds::render::SRenderPlugin *>(theObject->second), theClass); break; case GraphObjectTypes::CustomMaterial: @@ -1529,20 +1529,20 @@ struct SRenderUIPLoader : public IDOMReferenceResolver break; case GraphObjectTypes::RenderPlugin: ParseProperties( - *static_cast<uic::render::SRenderPlugin *>(theObject->second), parser); + *static_cast<qt3ds::render::SRenderPlugin *>(theObject->second), parser); break; case GraphObjectTypes::CustomMaterial: ParseProperties( - *static_cast<uic::render::SCustomMaterial *>(theObject->second), + *static_cast<qt3ds::render::SCustomMaterial *>(theObject->second), parser); break; case GraphObjectTypes::Path: - ParseProperties(*static_cast<uic::render::SPath *>(theObject->second), + ParseProperties(*static_cast<qt3ds::render::SPath *>(theObject->second), parser); break; case GraphObjectTypes::PathSubPath: ParseProperties( - *static_cast<uic::render::SPathSubPath *>(theObject->second), parser); + *static_cast<qt3ds::render::SPathSubPath *>(theObject->second), parser); break; default: QT3DS_ASSERT(false); @@ -1554,12 +1554,12 @@ struct SRenderUIPLoader : public IDOMReferenceResolver if (iter != m_AnchorIdToPathAndAnchorIndexMap.end()) { SDomReaderPropertyParser parser(m_Reader, m_TempBuf, *this, *iter->second.m_Segment); - NVDataRef<uic::render::SPathAnchorPoint> thePathBuffer = + NVDataRef<qt3ds::render::SPathAnchorPoint> thePathBuffer = m_PathManager.GetPathSubPathBuffer(*iter->second.m_Segment); QT3DSU32 anchorIndex = iter->second.m_AnchorIndex; QT3DSU32 numAnchors = thePathBuffer.size(); if (anchorIndex < numAnchors) { - uic::render::SPathAnchorPoint &thePoint(thePathBuffer[anchorIndex]); + qt3ds::render::SPathAnchorPoint &thePoint(thePathBuffer[anchorIndex]); ParseVec2(parser, "position", thePoint.m_Position); ParseFloat(parser, "incomingangle", thePoint.m_IncomingAngle); thePoint.m_OutgoingAngle = thePoint.m_IncomingAngle + 180.0f; @@ -1572,12 +1572,12 @@ struct SRenderUIPLoader : public IDOMReferenceResolver } } - void AddPluginProperty(uic::render::IRenderPluginClass &pluginClass, - uic::render::SRenderPluginPropertyTypes::Enum inPropType, + void AddPluginProperty(qt3ds::render::IRenderPluginClass &pluginClass, + qt3ds::render::SRenderPluginPropertyTypes::Enum inPropType, eastl::string &tempStr, const char *propName) { tempStr.assign(propName); - uic::render::SRenderPluginPropertyDeclaration theDec( + qt3ds::render::SRenderPluginPropertyDeclaration theDec( m_StrTable.RegisterStr(tempStr.c_str()), inPropType); pluginClass.RegisterProperty(theDec); } @@ -1591,10 +1591,10 @@ struct SRenderUIPLoader : public IDOMReferenceResolver m_Reader.Att("presentationHeight", m_Presentation->m_PresentationDimensions.y); // Upsize them to a multiple of four. m_Presentation->m_PresentationDimensions.x = - (QT3DSF32)uic::render::ITextRenderer::NextMultipleOf4( + (QT3DSF32)qt3ds::render::ITextRenderer::NextMultipleOf4( (QT3DSU32)m_Presentation->m_PresentationDimensions.x); m_Presentation->m_PresentationDimensions.y = - (QT3DSF32)uic::render::ITextRenderer::NextMultipleOf4( + (QT3DSF32)qt3ds::render::ITextRenderer::NextMultipleOf4( (QT3DSU32)m_Presentation->m_PresentationDimensions.y); const char8_t *thePresentationRotation = ""; if (m_Reader.Att("presentationRotation", thePresentationRotation)) { @@ -1621,7 +1621,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver Option<UICDM::SMetaDataEffect> theEffectMetaData = m_MetaData.GetEffectMetaDataBySourcePath(sourcepath); if (theEffectMetaData.hasValue()) { - uic::render::IUIPLoader::CreateEffectClassFromMetaEffect( + qt3ds::render::IUIPLoader::CreateEffectClassFromMetaEffect( theId, m_Foundation, m_EffectSystem, *theEffectMetaData, m_StrTable); } else { @@ -1635,7 +1635,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver Option<UICDM::SMetaDataCustomMaterial> theMetaData = m_MetaData.GetMaterialMetaDataBySourcePath(sourcepath); if (theMetaData.hasValue()) { - uic::render::IUIPLoader::CreateMaterialClassFromMetaMaterial( + qt3ds::render::IUIPLoader::CreateMaterialClassFromMetaMaterial( theId, m_Foundation, m_CustomMaterialSystem, *theMetaData, m_StrTable); } else { @@ -1647,7 +1647,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver m_MetaData.LoadPluginXMLFile(m_Reader.GetNarrowElementName(), idStr, name, sourcepath); eastl::vector<Q3DStudio::TRuntimeMetaDataStrType> theProperties; - uic::render::IRenderPluginClass *thePluginClass = + qt3ds::render::IRenderPluginClass *thePluginClass = m_RenderPluginManager.GetOrCreateRenderPlugin( m_StrTable.RegisterStr(sourcepath)); if (thePluginClass) { @@ -1673,13 +1673,13 @@ struct SRenderUIPLoader : public IDOMReferenceResolver case ERuntimeDataModelDataTypeFloat: AddPluginProperty( *thePluginClass, - uic::render::SRenderPluginPropertyTypes::Float, + qt3ds::render::SRenderPluginPropertyTypes::Float, thePropertyStr, metaProp.c_str()); break; case ERuntimeDataModelDataTypeFloat2: AddPluginProperty( *thePluginClass, - uic::render::SRenderPluginPropertyTypes::Vector2, + qt3ds::render::SRenderPluginPropertyTypes::Vector2, thePropertyStr, metaProp.c_str()); break; case ERuntimeDataModelDataTypeFloat3: @@ -1687,30 +1687,30 @@ struct SRenderUIPLoader : public IDOMReferenceResolver != ERuntimeAdditionalMetaDataTypeColor) AddPluginProperty( *thePluginClass, - uic::render::SRenderPluginPropertyTypes::Vector3, + qt3ds::render::SRenderPluginPropertyTypes::Vector3, thePropertyStr, metaProp.c_str()); else AddPluginProperty( *thePluginClass, - uic::render::SRenderPluginPropertyTypes::Color, + qt3ds::render::SRenderPluginPropertyTypes::Color, thePropertyStr, metaProp.c_str()); break; case ERuntimeDataModelDataTypeLong: AddPluginProperty(*thePluginClass, - uic::render::SRenderPluginPropertyTypes::Long, + qt3ds::render::SRenderPluginPropertyTypes::Long, thePropertyStr, metaProp.c_str()); break; case ERuntimeDataModelDataTypeString: case ERuntimeDataModelDataTypeStringRef: AddPluginProperty( *thePluginClass, - uic::render::SRenderPluginPropertyTypes::String, + qt3ds::render::SRenderPluginPropertyTypes::String, thePropertyStr, metaProp.c_str()); break; case ERuntimeDataModelDataTypeBool: AddPluginProperty( *thePluginClass, - uic::render::SRenderPluginPropertyTypes::Boolean, + qt3ds::render::SRenderPluginPropertyTypes::Boolean, thePropertyStr, metaProp.c_str()); break; default: @@ -1784,7 +1784,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver }; } -SPresentation *uic::render::IUIPLoader::LoadUIPFile( +SPresentation *qt3ds::render::IUIPLoader::LoadUIPFile( UICDM::IDOMReader &inReader, const char8_t *inFullPathToPresentationFile, Q3DStudio::IRuntimeMetaData &inMetaData, IStringTable &inStrTable, NVFoundationBase &inFoundation @@ -1798,7 +1798,7 @@ SPresentation *uic::render::IUIPLoader::LoadUIPFile( TIdObjectMap &ioObjectMap, IBufferManager &inBufferManager, IEffectSystem &inEffectSystem, const char8_t *inPresentationDir, IRenderPluginManager &inPluginManager, ICustomMaterialSystem &inCMS, IDynamicObjectSystem &inDynamicSystem, - uic::render::IPathManager &inPathManager, IUIPReferenceResolver *inResolver, + qt3ds::render::IPathManager &inPathManager, IUIPReferenceResolver *inResolver, bool inSetValuesFromSlides) { SRenderUIPLoader theLoader(inReader, inFullPathToPresentationFile, inMetaData, inStrTable, @@ -1888,11 +1888,11 @@ QString ConvertUTFtoQString(const wchar_t *string) // Re-register all strings because we can't be sure that the meta data system and the effect // system are sharing the same string table. -void uic::render::IUIPLoader::CreateEffectClassFromMetaEffect( +void qt3ds::render::IUIPLoader::CreateEffectClassFromMetaEffect( CRegisteredString inEffectName, NVFoundationBase &inFoundation, IEffectSystem &inEffectSystem, const UICDM::SMetaDataEffect &inMetaDataEffect, IStringTable &inStrTable) { - using namespace uic::render::dynamic; + using namespace qt3ds::render::dynamic; if (inEffectSystem.IsEffectRegistered(inEffectName)) { qCCritical(INVALID_OPERATION, "Effect %s is already registered", inEffectName.c_str()); @@ -1900,9 +1900,9 @@ void uic::render::IUIPLoader::CreateEffectClassFromMetaEffect( return; } nvvector<SPropertyDeclaration> thePropertyDeclarations( - inFoundation.getAllocator(), "uic::render::IUIPLoader::CreateEffectClassFromMetaEffect"); + inFoundation.getAllocator(), "qt3ds::render::IUIPLoader::CreateEffectClassFromMetaEffect"); nvvector<CRegisteredString> theEnumNames( - inFoundation.getAllocator(), "uic::render::IUIPLoader::CreateEffectClassFromMetaEffect"); + inFoundation.getAllocator(), "qt3ds::render::IUIPLoader::CreateEffectClassFromMetaEffect"); CRenderString theConvertStr; CRenderString theConvertShaderTypeStr; CRenderString theConvertShaderVersionStr; @@ -1948,12 +1948,12 @@ void uic::render::IUIPLoader::CreateEffectClassFromMetaEffect( inEffectSystem.SetEffectCommands(inEffectName, inMetaDataEffect.m_EffectCommands); } -void uic::render::IUIPLoader::CreateMaterialClassFromMetaMaterial( +void qt3ds::render::IUIPLoader::CreateMaterialClassFromMetaMaterial( CRegisteredString inClassName, NVFoundationBase &inFoundation, ICustomMaterialSystem &inMaterialSystem, const UICDM::SMetaDataCustomMaterial &inMetaDataMaterial, IStringTable &inStrTable) { - using namespace uic::render::dynamic; + using namespace qt3ds::render::dynamic; if (inMaterialSystem.IsMaterialRegistered(inClassName)) { qCCritical(INVALID_OPERATION, "Effect %s is already registered", inClassName.c_str()); @@ -1962,10 +1962,10 @@ void uic::render::IUIPLoader::CreateMaterialClassFromMetaMaterial( } nvvector<SPropertyDeclaration> thePropertyDeclarations( inFoundation.getAllocator(), - "uic::render::IUIPLoader::CreateMaterialClassFromMetaMaterial"); + "qt3ds::render::IUIPLoader::CreateMaterialClassFromMetaMaterial"); nvvector<CRegisteredString> theEnumNames( inFoundation.getAllocator(), - "uic::render::IUIPLoader::CreateMaterialClassFromMetaMaterial"); + "qt3ds::render::IUIPLoader::CreateMaterialClassFromMetaMaterial"); CRenderString theConvertStr; CRenderString theConvertShaderTypeStr; CRenderString theConvertShaderVersionStr; diff --git a/src/Runtime/Source/UICRender/Source/UICRenderUIPSharedTranslation.cpp b/src/Runtime/Source/UICRender/Source/UICRenderUIPSharedTranslation.cpp index bc3ec8e6..eb8fee58 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderUIPSharedTranslation.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderUIPSharedTranslation.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include "UICRenderUIPSharedTranslation.h" -namespace uic { +namespace qt3ds { namespace render { #define WCHAR_T_Directional L"Directional" diff --git a/src/Runtime/Source/UICRender/Source/UICRenderWidgets.cpp b/src/Runtime/Source/UICRender/Source/UICRenderWidgets.cpp index 2a56fc97..fcfd53db 100644 --- a/src/Runtime/Source/UICRender/Source/UICRenderWidgets.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRenderWidgets.cpp @@ -34,7 +34,7 @@ #include "UICRenderShaderCodeGeneratorV2.h" #include "render/Qt3DSRenderShaderProgram.h" -using namespace uic::render; +using namespace qt3ds::render; namespace { @@ -62,12 +62,12 @@ struct SWidgetBBox : public IRenderWidget { m_BoxShader = inContext.GetShader(m_ItemName); if (!m_BoxShader) { - uic::render::IShaderProgramGenerator &theGenerator(inContext.GetProgramGenerator()); + qt3ds::render::IShaderProgramGenerator &theGenerator(inContext.GetProgramGenerator()); theGenerator.BeginProgram(); - uic::render::IShaderStageGenerator &theVertexGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Vertex)); - uic::render::IShaderStageGenerator &theFragmentGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Fragment)); + qt3ds::render::IShaderStageGenerator &theVertexGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Vertex)); + qt3ds::render::IShaderStageGenerator &theFragmentGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Fragment)); theVertexGenerator.AddIncoming("attr_pos", "vec3"); theVertexGenerator.AddUniform("model_view_projection", "mat4"); @@ -190,12 +190,12 @@ struct SWidgetAxis : public IRenderWidget { m_AxisShader = inContext.GetShader(m_ItemName); if (!m_AxisShader) { - uic::render::IShaderProgramGenerator &theGenerator(inContext.GetProgramGenerator()); + qt3ds::render::IShaderProgramGenerator &theGenerator(inContext.GetProgramGenerator()); theGenerator.BeginProgram(); - uic::render::IShaderStageGenerator &theVertexGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Vertex)); - uic::render::IShaderStageGenerator &theFragmentGenerator( - *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Fragment)); + qt3ds::render::IShaderStageGenerator &theVertexGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Vertex)); + qt3ds::render::IShaderStageGenerator &theFragmentGenerator( + *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Fragment)); theVertexGenerator.AddIncoming("attr_pos", "vec3"); theVertexGenerator.AddIncoming("attr_color", "vec3"); theVertexGenerator.AddOutgoing("output_color", "vec3"); diff --git a/src/Runtime/Source/UICRender/Source/UICRendererUtil.cpp b/src/Runtime/Source/UICRender/Source/UICRendererUtil.cpp index 132c873e..aeb559c7 100644 --- a/src/Runtime/Source/UICRender/Source/UICRendererUtil.cpp +++ b/src/Runtime/Source/UICRender/Source/UICRendererUtil.cpp @@ -31,7 +31,7 @@ #include "UICRenderResourceBufferObjects.h" #include "UICRenderResourceTexture2D.h" -using namespace uic::render; +using namespace qt3ds::render; void CRendererUtil::ResolveMutisampleFBOColorOnly(IResourceManager &inManager, CResourceTexture2D &ioResult, diff --git a/src/Runtime/Source/UICRender/Source/UICTextRenderer.cpp b/src/Runtime/Source/UICRender/Source/UICTextRenderer.cpp index 2db33de3..f4e90c04 100644 --- a/src/Runtime/Source/UICRender/Source/UICTextRenderer.cpp +++ b/src/Runtime/Source/UICRender/Source/UICTextRenderer.cpp @@ -30,7 +30,7 @@ #include "UICTextRenderer.h" #include "render/Qt3DSRenderTexture2D.h" -using namespace uic::render; +using namespace qt3ds::render; // http://acius2.blogspot.com/2007/11/calculating-next-power-of-2.html QT3DSU32 ITextRenderer::NextPowerOf2(QT3DSU32 input) diff --git a/src/Runtime/Source/UICState/Application/UICStateApplication.cpp b/src/Runtime/Source/UICState/Application/UICStateApplication.cpp index ddca675a..69a42823 100644 --- a/src/Runtime/Source/UICState/Application/UICStateApplication.cpp +++ b/src/Runtime/Source/UICState/Application/UICStateApplication.cpp @@ -38,7 +38,7 @@ typedef eastl::string TAppStr; using namespace qt3ds::foundation; -using namespace uic::state; +using namespace qt3ds::state; using namespace eastl; bool IApplication::EnsureApplicationFile(const char *inFullUIPPath, diff --git a/src/Runtime/Source/UICState/Application/UICStateApplication.h b/src/Runtime/Source/UICState/Application/UICStateApplication.h index 3030e3bd..50d02dd2 100644 --- a/src/Runtime/Source/UICState/Application/UICStateApplication.h +++ b/src/Runtime/Source/UICState/Application/UICStateApplication.h @@ -32,7 +32,7 @@ #include "EASTL/string.h" #include <QtCore/qvector.h> -namespace uic { +namespace qt3ds { namespace state { // Shared code for dealing with .uia files. class IApplication diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaDatamodelCache.cpp b/src/Runtime/Source/UICState/Debugger/UICLuaDatamodelCache.cpp index 6f1dd55f..7d27ad7e 100644 --- a/src/Runtime/Source/UICState/Debugger/UICLuaDatamodelCache.cpp +++ b/src/Runtime/Source/UICState/Debugger/UICLuaDatamodelCache.cpp @@ -44,8 +44,8 @@ extern "C" { #include "lualib.h" } -using namespace uic::state; -using namespace uic::state::debugger; +using namespace qt3ds::state; +using namespace qt3ds::state::debugger; /** * The caching system is fairly simple. Basically, the sender side keeps track of table and *function info values and sends the entire table diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaDebugger.h b/src/Runtime/Source/UICState/Debugger/UICLuaDebugger.h index 9c7b2f89..9065e130 100644 --- a/src/Runtime/Source/UICState/Debugger/UICLuaDebugger.h +++ b/src/Runtime/Source/UICState/Debugger/UICLuaDebugger.h @@ -34,7 +34,7 @@ struct lua_State; -namespace uic { +namespace qt3ds { namespace state { namespace debugger { namespace lua { diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerImpl.h b/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerImpl.h index 086e4195..57c99438 100644 --- a/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerImpl.h +++ b/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerImpl.h @@ -34,9 +34,9 @@ namespace eastl { template <> -struct hash<uic::state::debugger::SFileAndLine> +struct hash<qt3ds::state::debugger::SFileAndLine> { - size_t operator()(const uic::state::debugger::SFileAndLine &data) const + size_t operator()(const qt3ds::state::debugger::SFileAndLine &data) const { return hash<qt3ds::foundation::CRegisteredString>()(data.m_File) ^ hash<qt3ds::QT3DSU32>()(data.m_Line); diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerProtocol.h b/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerProtocol.h index 8f605265..6e3635f3 100644 --- a/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerProtocol.h +++ b/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerProtocol.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSMemoryBuffer.h" #include "foundation/SerializationTypes.h" -namespace uic { +namespace qt3ds { namespace state { namespace debugger { namespace lua { diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaSideDebugger.cpp b/src/Runtime/Source/UICState/Debugger/UICLuaSideDebugger.cpp index 6d58e077..17b87b35 100644 --- a/src/Runtime/Source/UICState/Debugger/UICLuaSideDebugger.cpp +++ b/src/Runtime/Source/UICState/Debugger/UICLuaSideDebugger.cpp @@ -43,8 +43,8 @@ extern "C" { } using namespace qt3ds::foundation; -using namespace uic::state::debugger; -using namespace uic::state::debugger::lua; +using namespace qt3ds::state::debugger; +using namespace qt3ds::state::debugger::lua; using namespace qt3ds; namespace { diff --git a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebugger.h b/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebugger.h index 3c1fbdf8..0f1c2fd0 100644 --- a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebugger.h +++ b/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebugger.h @@ -33,7 +33,7 @@ #include "UICStateDebugger.h" #include "UICUIADatamodel.h" -namespace uic { +namespace qt3ds { namespace state { namespace debugger { @@ -102,7 +102,7 @@ namespace state { virtual void RefreshData(bool inNeedReloadData) = 0; - static ISceneGraphArchitectDebugger &Create(uic::app::IDatamodel &inDatamodel); + static ISceneGraphArchitectDebugger &Create(qt3ds::app::IDatamodel &inDatamodel); }; } } diff --git a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerProtocol.h b/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerProtocol.h index 3246e09a..4286e701 100644 --- a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerProtocol.h +++ b/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerProtocol.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSMemoryBuffer.h" #include "foundation/SerializationTypes.h" -namespace uic { +namespace qt3ds { namespace state { namespace debugger { diff --git a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerValue.h b/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerValue.h index 8804ce7b..327b012b 100644 --- a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerValue.h +++ b/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerValue.h @@ -34,7 +34,7 @@ #include "UICUIADatamodelValue.h" #include "UICStateEditorValue.h" -namespace uic { +namespace qt3ds { namespace state { namespace debugger { struct SGPropertyValueTypes diff --git a/src/Runtime/Source/UICState/Debugger/UICSceneGraphRuntimeDebugger.cpp b/src/Runtime/Source/UICState/Debugger/UICSceneGraphRuntimeDebugger.cpp index b133d8c1..91886e17 100644 --- a/src/Runtime/Source/UICState/Debugger/UICSceneGraphRuntimeDebugger.cpp +++ b/src/Runtime/Source/UICState/Debugger/UICSceneGraphRuntimeDebugger.cpp @@ -37,8 +37,8 @@ #include "foundation/AutoDeallocatorAllocator.h" #include "EASTL/sort.h" -using namespace uic::state; -using namespace uic::state::debugger; +using namespace qt3ds::state; +using namespace qt3ds::state::debugger; namespace { diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDataTest.cpp b/src/Runtime/Source/UICState/Debugger/UICStateDataTest.cpp index f8a2722a..d3278e6b 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateDataTest.cpp +++ b/src/Runtime/Source/UICState/Debugger/UICStateDataTest.cpp @@ -52,8 +52,8 @@ extern "C" { #include "lualib.h" } -using namespace uic::state::test; -using namespace uic::state; +using namespace qt3ds::state::test; +using namespace qt3ds::state; using qt3ds::foundation::CFileSeekableIOStream; using qt3ds::foundation::FileReadFlags; using qt3ds::foundation::nonNull; diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.cpp b/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.cpp index 9f09f62a..3738839e 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.cpp +++ b/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.cpp @@ -44,9 +44,9 @@ extern "C" { #include "lualib.h" } -using namespace uic; -using namespace uic::state; -using namespace uic::state::debugger; +using namespace qt3ds; +using namespace qt3ds::state; +using namespace qt3ds::state::debugger; namespace { diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.h b/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.h index b920bf40..d416f3f5 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.h +++ b/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.h @@ -37,7 +37,7 @@ struct lua_State; -namespace uic { +namespace qt3ds { namespace state { namespace debugger { diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebuggedInterpreter.cpp b/src/Runtime/Source/UICState/Debugger/UICStateDebuggedInterpreter.cpp index 1e92d3bb..2c32a1ba 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateDebuggedInterpreter.cpp +++ b/src/Runtime/Source/UICState/Debugger/UICStateDebuggedInterpreter.cpp @@ -33,8 +33,8 @@ #include "EASTL/set.h" #include "foundation/Qt3DSAtomic.h" -using namespace uic::state; -using namespace uic::state::debugger; +using namespace qt3ds::state; +using namespace qt3ds::state::debugger; namespace { diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebugger.cpp b/src/Runtime/Source/UICState/Debugger/UICStateDebugger.cpp index 8f7428c9..23ad1e90 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateDebugger.cpp +++ b/src/Runtime/Source/UICState/Debugger/UICStateDebugger.cpp @@ -33,8 +33,8 @@ #include "foundation/Qt3DSAtomic.h" #include "foundation/IOStreams.h" -using namespace uic::state::debugger; -using namespace uic::state; +using namespace qt3ds::state::debugger; +using namespace qt3ds::state; namespace { diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebugger.h b/src/Runtime/Source/UICState/Debugger/UICStateDebugger.h index c5d50faf..55b3608a 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateDebugger.h +++ b/src/Runtime/Source/UICState/Debugger/UICStateDebugger.h @@ -37,7 +37,7 @@ #include "foundation/IOStreams.h" #include "UICStateEditor.h" -namespace uic { +namespace qt3ds { namespace state { namespace debugger { using namespace editor; diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerListener.cpp b/src/Runtime/Source/UICState/Debugger/UICStateDebuggerListener.cpp index 603f8a5c..6b8abe3c 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerListener.cpp +++ b/src/Runtime/Source/UICState/Debugger/UICStateDebuggerListener.cpp @@ -34,8 +34,8 @@ #include "foundation/Qt3DSAtomic.h" #include "UICStateScriptContext.h" -using namespace uic::state; -using namespace uic::state::debugger; +using namespace qt3ds::state; +using namespace qt3ds::state::debugger; namespace { diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerProtocol.h b/src/Runtime/Source/UICState/Debugger/UICStateDebuggerProtocol.h index 95552cc6..18bda58c 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerProtocol.h +++ b/src/Runtime/Source/UICState/Debugger/UICStateDebuggerProtocol.h @@ -36,7 +36,7 @@ #include "foundation/Qt3DSTime.h" // Stream protocol, regardless of binary vs. text. -namespace uic { +namespace qt3ds { namespace state { namespace debugger { diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerValues.h b/src/Runtime/Source/UICState/Debugger/UICStateDebuggerValues.h index 65e25c5b..863110ee 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerValues.h +++ b/src/Runtime/Source/UICState/Debugger/UICStateDebuggerValues.h @@ -33,10 +33,10 @@ #include "UICStateDebugger.h" #include "foundation/Qt3DSDiscriminatedUnion.h" -namespace uic { +namespace qt3ds { namespace state { namespace debugger { - using namespace uic::state::editor; + using namespace qt3ds::state::editor; // Force compile error if unsupported datatype requested template <typename TDataType> @@ -504,34 +504,34 @@ namespace state { namespace qt3ds { namespace foundation { template <> - struct DestructTraits<uic::state::debugger::SNil> + struct DestructTraits<qt3ds::state::debugger::SNil> { - void destruct(uic::state::debugger::SNil &) {} + void destruct(qt3ds::state::debugger::SNil &) {} }; template <> - struct DestructTraits<uic::state::debugger::SDatamodelTable *> + struct DestructTraits<qt3ds::state::debugger::SDatamodelTable *> { - void destruct(uic::state::debugger::SDatamodelTable *) {} + void destruct(qt3ds::state::debugger::SDatamodelTable *) {} }; template <> - struct DestructTraits<uic::state::debugger::SDatamodelUserData *> + struct DestructTraits<qt3ds::state::debugger::SDatamodelUserData *> { - void destruct(uic::state::debugger::SDatamodelUserData *) {} + void destruct(qt3ds::state::debugger::SDatamodelUserData *) {} }; template <> - struct DestructTraits<uic::state::debugger::SDatamodelFunction *> + struct DestructTraits<qt3ds::state::debugger::SDatamodelFunction *> { - void destruct(uic::state::debugger::SDatamodelFunction *) {} + void destruct(qt3ds::state::debugger::SDatamodelFunction *) {} }; template <> - struct DestructTraits<uic::state::debugger::SDatamodelCFunction *> + struct DestructTraits<qt3ds::state::debugger::SDatamodelCFunction *> { - void destruct(uic::state::debugger::SDatamodelCFunction *) {} + void destruct(qt3ds::state::debugger::SDatamodelCFunction *) {} }; template <> - struct DestructTraits<uic::state::debugger::SDatamodelThread *> + struct DestructTraits<qt3ds::state::debugger::SDatamodelThread *> { - void destruct(uic::state::debugger::SDatamodelThread *) {} + void destruct(qt3ds::state::debugger::SDatamodelThread *) {} }; } } diff --git a/src/Runtime/Source/UICState/Debugger/UICStateLuaTest.cpp b/src/Runtime/Source/UICState/Debugger/UICStateLuaTest.cpp index 64983216..81755cae 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateLuaTest.cpp +++ b/src/Runtime/Source/UICState/Debugger/UICStateLuaTest.cpp @@ -37,8 +37,8 @@ extern "C" { #include "lualib.h" } -using namespace uic::state::test; -using namespace uic::state; +using namespace qt3ds::state::test; +using namespace qt3ds::state; namespace { diff --git a/src/Runtime/Source/UICState/Debugger/UICStateTest.h b/src/Runtime/Source/UICState/Debugger/UICStateTest.h index 8171ea4c..14cbe4eb 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateTest.h +++ b/src/Runtime/Source/UICState/Debugger/UICStateTest.h @@ -33,7 +33,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSOption.h" -namespace uic { +namespace qt3ds { namespace state { namespace test { diff --git a/src/Runtime/Source/UICState/Debugger/UICStateTestCommon.h b/src/Runtime/Source/UICState/Debugger/UICStateTestCommon.h index 37ab7591..293aaea8 100644 --- a/src/Runtime/Source/UICState/Debugger/UICStateTestCommon.h +++ b/src/Runtime/Source/UICState/Debugger/UICStateTestCommon.h @@ -45,7 +45,7 @@ extern "C" { #include "lualib.h" } -namespace uic { +namespace qt3ds { namespace state { namespace test { diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditor.h b/src/Runtime/Source/UICState/Editor/UICStateEditor.h index 9f089e93..ecd566a6 100644 --- a/src/Runtime/Source/UICState/Editor/UICStateEditor.h +++ b/src/Runtime/Source/UICState/Editor/UICStateEditor.h @@ -40,7 +40,7 @@ #include "foundation/Qt3DSVec3.h" #include "UICStateInterpreter.h" -namespace uic { +namespace qt3ds { namespace state { namespace editor { diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorFoundation.h b/src/Runtime/Source/UICState/Editor/UICStateEditorFoundation.h index a0d7467e..03fbd16f 100644 --- a/src/Runtime/Source/UICState/Editor/UICStateEditorFoundation.h +++ b/src/Runtime/Source/UICState/Editor/UICStateEditorFoundation.h @@ -40,7 +40,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "foundation/IOStreams.h" -namespace uic { +namespace qt3ds { namespace state { namespace editor { diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorValue.h b/src/Runtime/Source/UICState/Editor/UICStateEditorValue.h index 1a6acf6e..50b8f8f9 100644 --- a/src/Runtime/Source/UICState/Editor/UICStateEditorValue.h +++ b/src/Runtime/Source/UICState/Editor/UICStateEditorValue.h @@ -35,7 +35,7 @@ #include "foundation/Qt3DSDiscriminatedUnion.h" #include "foundation/Qt3DSVec3.h" -namespace uic { +namespace qt3ds { namespace state { namespace editor { @@ -193,7 +193,7 @@ namespace foundation { } #endif -namespace uic { +namespace qt3ds { namespace state { namespace editor { diff --git a/src/Runtime/Source/UICState/Editor/UICUIADatamodel.h b/src/Runtime/Source/UICState/Editor/UICUIADatamodel.h index e35a8a5e..5ef1cd89 100644 --- a/src/Runtime/Source/UICState/Editor/UICUIADatamodel.h +++ b/src/Runtime/Source/UICState/Editor/UICUIADatamodel.h @@ -35,10 +35,10 @@ #include "UICStateInterpreter.h" #include "UICStateEditorFoundation.h" -namespace uic { +namespace qt3ds { namespace app { - using namespace uic::state; - using namespace uic::state::editor; + using namespace qt3ds::state; + using namespace qt3ds::state::editor; typedef eastl::pair<Q3DStudio::ERuntimeDataModelDataType, Q3DStudio::ERuntimeAdditionalMetaDataType> @@ -158,11 +158,11 @@ namespace app { // inPath may either exist or not. You can pass in a uip file as well as a uia file. // application dir is so we can find the meta data. // inStream provides a way to load from memory, it will be used if it's not NULL. - static IDatamodel &Create(uic::state::editor::TFoundationPtr inFoundation, + static IDatamodel &Create(qt3ds::state::editor::TFoundationPtr inFoundation, const TEditorStr &inPath, const TEditorStr &inApplicationDir, IStateMachineEditorManager &inStateMachineEditorManager, IInStream *inStream = 0); - static IDatamodel &Create(uic::state::editor::TFoundationPtr inFoundation, + static IDatamodel &Create(qt3ds::state::editor::TFoundationPtr inFoundation, const TEditorStr &inPath, const TEditorStr &inApplicationDir, IStateMachineEditorManager &inStateMachineEditorManager, IStringTable &inStringTable, IInStream *inStream = 0); diff --git a/src/Runtime/Source/UICState/Editor/UICUIADatamodelValue.h b/src/Runtime/Source/UICState/Editor/UICUIADatamodelValue.h index 523c3bbb..5448da6e 100644 --- a/src/Runtime/Source/UICState/Editor/UICUIADatamodelValue.h +++ b/src/Runtime/Source/UICState/Editor/UICUIADatamodelValue.h @@ -32,7 +32,7 @@ #include "foundation/Qt3DSDiscriminatedUnion.h" #include "UICUIADatamodel.h" -namespace uic { +namespace qt3ds { namespace app { using namespace Q3DStudio; @@ -200,19 +200,19 @@ namespace qt3ds { namespace foundation { template <> - struct DestructTraits<uic::app::SGuid> + struct DestructTraits<qt3ds::app::SGuid> { - void destruct(uic::app::SGuid &) {} + void destruct(qt3ds::app::SGuid &) {} }; template <> - struct DestructTraits<uic::app::SObjectRef> + struct DestructTraits<qt3ds::app::SObjectRef> { - void destruct(uic::app::SObjectRef &) {} + void destruct(qt3ds::app::SObjectRef &) {} }; template <> - struct DestructTraits<uic::app::CStringOrInt> + struct DestructTraits<qt3ds::app::CStringOrInt> { - void destruct(uic::app::CStringOrInt &) {} + void destruct(qt3ds::app::CStringOrInt &) {} }; template <> struct DestructTraits<CRegisteredString> @@ -222,7 +222,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace app { typedef qt3ds::foundation:: diff --git a/src/Runtime/Source/UICState/Include/UICState.h b/src/Runtime/Source/UICState/Include/UICState.h index 64b23f8c..5db768cc 100644 --- a/src/Runtime/Source/UICState/Include/UICState.h +++ b/src/Runtime/Source/UICState/Include/UICState.h @@ -50,7 +50,7 @@ namespace intrinsics { } } -namespace uic { +namespace qt3ds { namespace state { using namespace qt3ds; diff --git a/src/Runtime/Source/UICState/Include/UICStateContext.h b/src/Runtime/Source/UICState/Include/UICStateContext.h index 4f74bbf9..aa70f001 100644 --- a/src/Runtime/Source/UICState/Include/UICStateContext.h +++ b/src/Runtime/Source/UICState/Include/UICStateContext.h @@ -32,7 +32,7 @@ #include "UICState.h" #include "UICStateTypes.h" -namespace uic { +namespace qt3ds { namespace state { // Thanks to the crazy world we live in, we have to store xml extension information diff --git a/src/Runtime/Source/UICState/Include/UICStateExecutionContext.h b/src/Runtime/Source/UICState/Include/UICStateExecutionContext.h index aa2de0b1..187eabb5 100644 --- a/src/Runtime/Source/UICState/Include/UICStateExecutionContext.h +++ b/src/Runtime/Source/UICState/Include/UICStateExecutionContext.h @@ -34,7 +34,7 @@ #include "UICStateTypes.h" #include "foundation/Qt3DSRefCounted.h" -namespace uic { +namespace qt3ds { namespace state { class IStateLogger : public NVRefCounted diff --git a/src/Runtime/Source/UICState/Include/UICStateExecutionTypes.h b/src/Runtime/Source/UICState/Include/UICStateExecutionTypes.h index 1c8c6b2f..433773bd 100644 --- a/src/Runtime/Source/UICState/Include/UICStateExecutionTypes.h +++ b/src/Runtime/Source/UICState/Include/UICStateExecutionTypes.h @@ -32,7 +32,7 @@ #pragma once #include "UICStateTypes.h" -namespace uic { +namespace qt3ds { namespace state { struct ExecutableContentTypes diff --git a/src/Runtime/Source/UICState/Include/UICStateIdValue.h b/src/Runtime/Source/UICState/Include/UICStateIdValue.h index 8d18da2b..d6da0fad 100644 --- a/src/Runtime/Source/UICState/Include/UICStateIdValue.h +++ b/src/Runtime/Source/UICState/Include/UICStateIdValue.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSDiscriminatedUnion.h" // Discriminated union to unify different things that may be identified by an id -namespace uic { +namespace qt3ds { namespace state { struct IdValueTypes @@ -116,19 +116,19 @@ namespace qt3ds { namespace foundation { template <> - struct DestructTraits<uic::state::SStateNode *> + struct DestructTraits<qt3ds::state::SStateNode *> { - void destruct(uic::state::SStateNode *) {} + void destruct(qt3ds::state::SStateNode *) {} }; template <> - struct DestructTraits<uic::state::SSend *> + struct DestructTraits<qt3ds::state::SSend *> { - void destruct(uic::state::SSend *) {} + void destruct(qt3ds::state::SSend *) {} }; } } -namespace uic { +namespace qt3ds { namespace state { typedef qt3ds::foundation:: diff --git a/src/Runtime/Source/UICState/Include/UICStateInterpreter.h b/src/Runtime/Source/UICState/Include/UICStateInterpreter.h index 8e489a80..656fc859 100644 --- a/src/Runtime/Source/UICState/Include/UICStateInterpreter.h +++ b/src/Runtime/Source/UICState/Include/UICStateInterpreter.h @@ -36,7 +36,7 @@ #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSDataRef.h" -namespace uic { +namespace qt3ds { namespace state { struct InterpreterEventTypes { diff --git a/src/Runtime/Source/UICState/Include/UICStateLuaScriptContext.h b/src/Runtime/Source/UICState/Include/UICStateLuaScriptContext.h index 224fec52..c21fcbc0 100644 --- a/src/Runtime/Source/UICState/Include/UICStateLuaScriptContext.h +++ b/src/Runtime/Source/UICState/Include/UICStateLuaScriptContext.h @@ -35,7 +35,7 @@ struct lua_State; -namespace uic { +namespace qt3ds { namespace state { class ILuaScriptContext : public IScriptContext diff --git a/src/Runtime/Source/UICState/Include/UICStateScriptContext.h b/src/Runtime/Source/UICState/Include/UICStateScriptContext.h index 8342eb00..8fda0be0 100644 --- a/src/Runtime/Source/UICState/Include/UICStateScriptContext.h +++ b/src/Runtime/Source/UICState/Include/UICStateScriptContext.h @@ -36,7 +36,7 @@ #include "foundation/Qt3DSOption.h" #include "foundation/StringTable.h" -namespace uic { +namespace qt3ds { namespace state { class IScriptEvent : public IEvent diff --git a/src/Runtime/Source/UICState/Include/UICStateSharedImpl.h b/src/Runtime/Source/UICState/Include/UICStateSharedImpl.h index cb04f3f6..f9c9acc9 100644 --- a/src/Runtime/Source/UICState/Include/UICStateSharedImpl.h +++ b/src/Runtime/Source/UICState/Include/UICStateSharedImpl.h @@ -32,7 +32,7 @@ #include "UICState.h" #include "foundation/Utils.h" -namespace uic { +namespace qt3ds { namespace state { namespace impl { diff --git a/src/Runtime/Source/UICState/Include/UICStateSignalConnection.h b/src/Runtime/Source/UICState/Include/UICStateSignalConnection.h index ebf6c2a0..c22278c8 100644 --- a/src/Runtime/Source/UICState/Include/UICStateSignalConnection.h +++ b/src/Runtime/Source/UICState/Include/UICStateSignalConnection.h @@ -32,7 +32,7 @@ #pragma once #include "UICState.h" #include "foundation/Qt3DSRefCounted.h" -namespace uic { +namespace qt3ds { namespace state { class IStateSignalConnection : public NVRefCounted diff --git a/src/Runtime/Source/UICState/Include/UICStateTypes.h b/src/Runtime/Source/UICState/Include/UICStateTypes.h index de2f7fb5..6f5489a5 100644 --- a/src/Runtime/Source/UICState/Include/UICStateTypes.h +++ b/src/Runtime/Source/UICState/Include/UICStateTypes.h @@ -44,7 +44,7 @@ #include "foundation/Utils.h" #include "UICStateIdValue.h" -namespace uic { +namespace qt3ds { namespace state { // Link list definitions. diff --git a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContext.h b/src/Runtime/Source/UICState/Include/UICStateVisualBindingContext.h index 016719bd..474df08f 100644 --- a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContext.h +++ b/src/Runtime/Source/UICState/Include/UICStateVisualBindingContext.h @@ -42,7 +42,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace state { struct SVisualStateCommand; diff --git a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextCommands.h b/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextCommands.h index 6e6b9c70..9774cc76 100644 --- a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextCommands.h +++ b/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextCommands.h @@ -33,7 +33,7 @@ #include "UICState.h" #include "foundation/StringTable.h" -namespace uic { +namespace qt3ds { namespace state { struct VisualStateCommandTypes diff --git a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextValues.h b/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextValues.h index 8b7c102d..073889dd 100644 --- a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextValues.h +++ b/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextValues.h @@ -34,7 +34,7 @@ #include "foundation/Qt3DSDiscriminatedUnion.h" #include "UICStateVisualBindingContextCommands.h" -namespace uic { +namespace qt3ds { namespace state { template <typename TDataType> @@ -213,39 +213,39 @@ namespace qt3ds { namespace foundation { template <> - struct DestructTraits<uic::state::SGotoSlide> + struct DestructTraits<qt3ds::state::SGotoSlide> { - void destruct(uic::state::SGotoSlide &) {} + void destruct(qt3ds::state::SGotoSlide &) {} }; template <> - struct DestructTraits<uic::state::SCallFunction> + struct DestructTraits<qt3ds::state::SCallFunction> { - void destruct(uic::state::SCallFunction &) {} + void destruct(qt3ds::state::SCallFunction &) {} }; template <> - struct DestructTraits<uic::state::SSetAttribute> + struct DestructTraits<qt3ds::state::SSetAttribute> { - void destruct(uic::state::SSetAttribute &) {} + void destruct(qt3ds::state::SSetAttribute &) {} }; template <> - struct DestructTraits<uic::state::SGotoSlideRelative> + struct DestructTraits<qt3ds::state::SGotoSlideRelative> { - void destruct(uic::state::SGotoSlideRelative &) {} + void destruct(qt3ds::state::SGotoSlideRelative &) {} }; template <> - struct DestructTraits<uic::state::SFireEvent> + struct DestructTraits<qt3ds::state::SFireEvent> { - void destruct(uic::state::SFireEvent &) {} + void destruct(qt3ds::state::SFireEvent &) {} }; template <> - struct DestructTraits<uic::state::SPresentationAttribute> + struct DestructTraits<qt3ds::state::SPresentationAttribute> { - void destruct(uic::state::SPresentationAttribute &) {} + void destruct(qt3ds::state::SPresentationAttribute &) {} }; template <> - struct DestructTraits<uic::state::SPlaySound> + struct DestructTraits<qt3ds::state::SPlaySound> { - void destruct(uic::state::SPlaySound &) {} + void destruct(qt3ds::state::SPlaySound &) {} }; } } diff --git a/src/Runtime/Source/UICState/Include/UICStateXMLIO.h b/src/Runtime/Source/UICState/Include/UICStateXMLIO.h index efa3296f..51422660 100644 --- a/src/Runtime/Source/UICState/Include/UICStateXMLIO.h +++ b/src/Runtime/Source/UICState/Include/UICStateXMLIO.h @@ -45,7 +45,7 @@ namespace foundation { } } -namespace uic { +namespace qt3ds { namespace state { struct SExecutableContent; diff --git a/src/Runtime/Source/UICState/Source/UICStateContext.cpp b/src/Runtime/Source/UICState/Source/UICStateContext.cpp index 256a98a3..63f4d010 100644 --- a/src/Runtime/Source/UICState/Source/UICStateContext.cpp +++ b/src/Runtime/Source/UICState/Source/UICStateContext.cpp @@ -33,7 +33,7 @@ #include "foundation/Qt3DSFoundation.h" #include "foundation/Qt3DSBroadcastingAllocator.h" -using namespace uic::state; +using namespace qt3ds::state; namespace { diff --git a/src/Runtime/Source/UICState/Source/UICStateExecutionContext.cpp b/src/Runtime/Source/UICState/Source/UICStateExecutionContext.cpp index 689fc92b..e16e4dd5 100644 --- a/src/Runtime/Source/UICState/Source/UICStateExecutionContext.cpp +++ b/src/Runtime/Source/UICState/Source/UICStateExecutionContext.cpp @@ -38,7 +38,7 @@ #include "foundation/Utils.h" #include "EASTL/string.h" -using namespace uic::state; +using namespace qt3ds::state; namespace { struct SExecContext : public IExecutionContext diff --git a/src/Runtime/Source/UICState/Source/UICStateInterpreter.cpp b/src/Runtime/Source/UICState/Source/UICStateInterpreter.cpp index 939525b2..9729206b 100644 --- a/src/Runtime/Source/UICState/Source/UICStateInterpreter.cpp +++ b/src/Runtime/Source/UICState/Source/UICStateInterpreter.cpp @@ -53,15 +53,15 @@ #include "UICStateContext.h" #include "foundation/FastAllocator.h" -using namespace uic::state; -using namespace uic::state::debugger; +using namespace qt3ds::state; +using namespace qt3ds::state::debugger; #ifdef _DEBUG #define UIC_LOG_ENTER_EXIT 1 #define UIC_LOG_ACTIVE_EVENT 1 #endif -namespace uic { +namespace qt3ds { namespace state { struct SInterpreterData { @@ -991,7 +991,7 @@ struct StateSystem : public IStateInterpreter if (m_Workspace.empty() == false) { CRegisteredString stateId = m_StringTable->RegisterStr(m_Workspace.c_str()); - uic::state::SStateNode *transitionNode = + qt3ds::state::SStateNode *transitionNode = m_Context->FindStateNode(stateId); if (!transitionNode) { m_TempNodeList.clear(); @@ -1575,7 +1575,7 @@ struct StateSystem : public IStateInterpreter STransition &theTransition = *iter->CastTo<STransition>(); if (IsTransitionValid(theTransition)) { if (theTransition.m_Event.IsValid()) { - if (uic::state::impl::NameMatches(theTransition.m_Event.c_str(), + if (qt3ds::state::impl::NameMatches(theTransition.m_Event.c_str(), inEvent.GetName().c_str())) { if (!isTrivial(theTransition.m_Condition)) { Option<bool> condResult = m_ScriptContext->ExecuteCondition( diff --git a/src/Runtime/Source/UICState/Source/UICStateLuaScriptContext.cpp b/src/Runtime/Source/UICState/Source/UICStateLuaScriptContext.cpp index bfaa7f5e..9e32fc72 100644 --- a/src/Runtime/Source/UICState/Source/UICStateLuaScriptContext.cpp +++ b/src/Runtime/Source/UICState/Source/UICStateLuaScriptContext.cpp @@ -56,8 +56,8 @@ extern "C" { #include "lualib.h" } -using namespace uic::state; -using namespace uic::state::debugger; +using namespace qt3ds::state; +using namespace qt3ds::state::debugger; namespace { struct STopScope diff --git a/src/Runtime/Source/UICState/Source/UICStateVisualBindingContext.cpp b/src/Runtime/Source/UICState/Source/UICStateVisualBindingContext.cpp index 4046272f..f8e45247 100644 --- a/src/Runtime/Source/UICState/Source/UICStateVisualBindingContext.cpp +++ b/src/Runtime/Source/UICState/Source/UICStateVisualBindingContext.cpp @@ -44,7 +44,7 @@ #include "foundation/SerializationTypes.h" #include "foundation/StringConversionImpl.h" -using namespace uic::state; +using namespace qt3ds::state; namespace { diff --git a/src/Runtime/Source/UICState/Source/UICStateXMLIO.cpp b/src/Runtime/Source/UICState/Source/UICStateXMLIO.cpp index f3bd7f08..a5258827 100644 --- a/src/Runtime/Source/UICState/Source/UICStateXMLIO.cpp +++ b/src/Runtime/Source/UICState/Source/UICStateXMLIO.cpp @@ -40,8 +40,8 @@ #include "UICStateEditor.h" #include "UICStateEditorValue.h" -using namespace uic::state; -using namespace uic::state::editor; +using namespace qt3ds::state; +using namespace qt3ds::state::editor; namespace { #define ITERATE_XML_ELEMENT_NAMES \ @@ -1778,7 +1778,7 @@ void GenerateUniqueIdT(TDataType &inNode, const char8_t *inStem, IStateContext & } } -namespace uic { +namespace qt3ds { namespace state { void CXMLIO::GenerateUniqueId(SStateNode &inNode, const char8_t *inStem, diff --git a/src/Runtime/Source/UIPParser/Include/UICIPresentation.h b/src/Runtime/Source/UIPParser/Include/UICIPresentation.h index 9b074102..446a1c06 100644 --- a/src/Runtime/Source/UIPParser/Include/UICIPresentation.h +++ b/src/Runtime/Source/UIPParser/Include/UICIPresentation.h @@ -35,7 +35,7 @@ //============================================================================== #include "UICEventCallbacks.h" -namespace uic { +namespace qt3ds { namespace runtime { class IApplication; class IActivityZone; @@ -66,10 +66,10 @@ class IScene; class IScriptBridge; class CPresentationFrameData; class CTimePolicy; -using uic::runtime::ISlideSystem; -using uic::runtime::IAnimationSystem; -using uic::runtime::ILogicSystem; -using uic::runtime::IParametersSystem; +using qt3ds::runtime::ISlideSystem; +using qt3ds::runtime::IAnimationSystem; +using qt3ds::runtime::ILogicSystem; +using qt3ds::runtime::IParametersSystem; //============================================================================== // Enumeration @@ -146,8 +146,8 @@ public: // Manager Access virtual IParametersSystem &GetParametersSystem() = 0; virtual qt3ds::foundation::IStringTable &GetStringTable() = 0; - virtual uic::runtime::IApplication &GetApplication() = 0; - virtual uic::runtime::IActivityZone *GetActivityZone() = 0; + virtual qt3ds::runtime::IApplication &GetApplication() = 0; + virtual qt3ds::runtime::IActivityZone *GetActivityZone() = 0; public: // Hooks and callbacks virtual void OnPresentationLoaded() = 0; diff --git a/src/Runtime/Source/UIPParser/Include/UICUIPParser.h b/src/Runtime/Source/UIPParser/Include/UICUIPParser.h index 17260760..f5a9b9a1 100644 --- a/src/Runtime/Source/UIPParser/Include/UICUIPParser.h +++ b/src/Runtime/Source/UIPParser/Include/UICUIPParser.h @@ -36,7 +36,7 @@ #include "foundation/StringTable.h" #include <EASTL/string.h> -namespace uic { +namespace qt3ds { namespace state { struct SSetAttribute; namespace debugger { @@ -45,7 +45,7 @@ namespace state { } } -namespace uic { +namespace qt3ds { namespace render { class IInputStreamFactory; } @@ -131,7 +131,7 @@ protected: public: // Parse UIP file virtual BOOL Load(IPresentation &inPresentation, NVConstDataRef<SElementAttributeReference> inStateReferences, - uic::state::debugger::ISceneGraphRuntimeDebugger &inDebugger) = 0; + qt3ds::state::debugger::ISceneGraphRuntimeDebugger &inDebugger) = 0; virtual UICDM::IDOMReader &GetDOMReader() = 0; virtual IRuntimeMetaData &GetMetaData() = 0; // Mapping back from file id to element id, needed to hook elements up to their respective @@ -146,7 +146,7 @@ public: // Parse UIP file // Creation function static IUIPParser &Create(const QString &inFileName, IRuntimeMetaData &inMetaData, - uic::render::IInputStreamFactory &inStreamFactory, + qt3ds::render::IInputStreamFactory &inStreamFactory, qt3ds::foundation::IStringTable &inStrTable); }; diff --git a/src/Runtime/Source/UIPParser/Include/UICUIPParserActionHelper.h b/src/Runtime/Source/UIPParser/Include/UICUIPParserActionHelper.h index a1b05b42..b7208483 100644 --- a/src/Runtime/Source/UIPParser/Include/UICUIPParserActionHelper.h +++ b/src/Runtime/Source/UIPParser/Include/UICUIPParserActionHelper.h @@ -35,7 +35,7 @@ //============================================================================== #include "UICUIPParserImpl.h" -namespace uic { +namespace qt3ds { namespace runtime { class IParametersSystem; } @@ -44,7 +44,7 @@ namespace runtime { // Namespace //============================================================================== namespace Q3DStudio { -using uic::runtime::IParametersSystem; +using qt3ds::runtime::IParametersSystem; //============================================================================== // Forwards //============================================================================== diff --git a/src/Runtime/Source/UIPParser/Include/UICUIPParserImpl.h b/src/Runtime/Source/UIPParser/Include/UICUIPParserImpl.h index f21a2077..f39b75f9 100644 --- a/src/Runtime/Source/UIPParser/Include/UICUIPParserImpl.h +++ b/src/Runtime/Source/UIPParser/Include/UICUIPParserImpl.h @@ -98,7 +98,7 @@ uip file data. #include "UICElementSystem.h" #include "UICSlideSystem.h" -namespace uic { +namespace qt3ds { namespace render { class IRefCountedInputStream; } @@ -126,13 +126,13 @@ class IRuntimeMetaData; class CUIPParserActionHelper; class CUIPParserObjectRefHelper; -typedef eastl::vector<uic::runtime::element::TPropertyDescAndValue> TPropertyDescAndValueList; +typedef eastl::vector<qt3ds::runtime::element::TPropertyDescAndValue> TPropertyDescAndValueList; -using uic::render::IInputStreamFactory; -using uic::render::IRefCountedInputStream; +using qt3ds::render::IInputStreamFactory; +using qt3ds::render::IRefCountedInputStream; typedef NVScopedRefCounted<IRefCountedInputStream> TInputStreamPtr; typedef qt3ds::foundation::CRegisteredString TStrType; -using uic::runtime::element::SElement; +using qt3ds::runtime::element::SElement; struct SElementPropertyInfo { @@ -232,7 +232,7 @@ struct SParseSlideActionEntry TStrType m_ActionId; qt3ds::QT3DSI32 m_ActionCount; bool m_Active; - uic::runtime::SSlideAnimAction *m_Actions[SElementPropertyInfo::MaxArity]; + qt3ds::runtime::SSlideAnimAction *m_Actions[SElementPropertyInfo::MaxArity]; SParseSlideActionEntry(TStrType inSlideId, TStrType inActionId, qt3ds::QT3DSI32 inActionCount, bool inActive) @@ -526,7 +526,7 @@ public: // Construction public: // Parse UIP file BOOL Load(IPresentation &inPresentation, NVConstDataRef<SElementAttributeReference> inStateReferences, - uic::state::debugger::ISceneGraphRuntimeDebugger &debugger) override; + qt3ds::state::debugger::ISceneGraphRuntimeDebugger &debugger) override; UICDM::IDOMReader &GetDOMReader() override; IRuntimeMetaData &GetMetaData() override; SElementAndType GetElementForID(const char *inStringId) override; @@ -541,7 +541,7 @@ protected: // Operation BOOL LoadClasses(IPresentation &inPresentation, UICDM::IDOMReader &inReader); BOOL LoadGraph(IPresentation &inPresentation, UICDM::IDOMReader &inReader); BOOL LoadSceneGraph(IPresentation &inPresentation, UICDM::IDOMReader &inReader, - uic::runtime::element::SElement *inNewStyleParent = NULL); + qt3ds::runtime::element::SElement *inNewStyleParent = NULL); BOOL LoadLogic(IPresentation &inPresentation, UICDM::IDOMReader &inReader); BOOL LoadStateGraph(IPresentation &inPresentation, UICDM::IDOMReader &inReader); @@ -568,7 +568,7 @@ protected: // Scene graph heler protected: // Slide helper BOOL LoadState(IPresentation &inPresentation, SElement *inComponent, INT32 inSlideIndex, UICDM::IDOMReader &inReader); - uic::runtime::SSlidePlayInformation GetPlayMode(UICDM::IDOMReader &inReader); + qt3ds::runtime::SSlidePlayInformation GetPlayMode(UICDM::IDOMReader &inReader); INT32 GetPlayThroughTo(INT32 inCurrentSlideIndex, UICDM::IDOMReader &inReader); eastl::string GetSlideName(UICDM::IDOMReader &inReader); eastl::string GetSlideId(UICDM::IDOMReader &inReader); diff --git a/src/Runtime/Source/UIPParser/Source/UICUIPParserImpl.cpp b/src/Runtime/Source/UIPParser/Source/UICUIPParserImpl.cpp index fe2835f5..b309219a 100644 --- a/src/Runtime/Source/UIPParser/Source/UICUIPParserImpl.cpp +++ b/src/Runtime/Source/UIPParser/Source/UICUIPParserImpl.cpp @@ -498,7 +498,7 @@ CUIPParserImpl::~CUIPParserImpl() */ BOOL CUIPParserImpl::Load(IPresentation &inPresentation, NVConstDataRef<SElementAttributeReference> inStateReferences, - uic::state::debugger::ISceneGraphRuntimeDebugger &debugger) + qt3ds::state::debugger::ISceneGraphRuntimeDebugger &debugger) { m_CurrentPresentation = &inPresentation; if (!m_DOMReader) { @@ -573,13 +573,13 @@ BOOL CUIPParserImpl::Load(IPresentation &inPresentation, if (theLoadResult) { // Register all element ids with the debugger - eastl::vector<uic::state::debugger::SGElemIdMap> elemMapBuffer; + eastl::vector<qt3ds::state::debugger::SGElemIdMap> elemMapBuffer; for (TIdElementMap::iterator iter = m_ParseElementManager.m_ElementMap.begin(), end = m_ParseElementManager.m_ElementMap.end(); iter != end; ++iter) { const SElementData &theData = iter->second; if (theData.m_Element) { - uic::state::debugger::SGElemIdMap mapEntry; + qt3ds::state::debugger::SGElemIdMap mapEntry; mapEntry.m_Elem = theData.m_Element; mapEntry.m_Id = iter->first.c_str(); elemMapBuffer.push_back(mapEntry); @@ -705,8 +705,8 @@ inline RuntimeVector3 Convert(const QT3DSVec3 &input) { return RuntimeVector3(input.x, input.y, input.z); } -using uic::runtime::element::SPropertyDesc; -using uic::runtime::element::TPropertyDescAndValue; +using qt3ds::runtime::element::SPropertyDesc; +using qt3ds::runtime::element::TPropertyDescAndValue; void CUIPParserImpl::GetMetaAttribute(IPresentation &inPresentation, TPropertyDescAndValueList &outDescList, TStrType inType, @@ -997,17 +997,17 @@ EElementType GetElementType(const char *inType) * @return a flag indicating whether or not we successfully loaded the file */ BOOL CUIPParserImpl::LoadSceneGraph(IPresentation &inPresentation, IDOMReader &inReader, - uic::runtime::element::SElement *inNewStyleParent) + qt3ds::runtime::element::SElement *inNewStyleParent) { IDOMReader::Scope __childScope(inReader); IScriptBridge *theScriptBridge = inPresentation.GetScriptBridge(); IScriptBridge *theScriptBridgeQml = inPresentation.GetScriptBridgeQml(); eastl::string theFileString; - uic::runtime::IApplication &theApp(inPresentation.GetApplication()); - uic::runtime::IElementAllocator &theElemAllocator(theApp.GetElementAllocator()); + qt3ds::runtime::IApplication &theApp(inPresentation.GetApplication()); + qt3ds::runtime::IElementAllocator &theElemAllocator(theApp.GetElementAllocator()); TPropertyDescAndValueList theProperties; - using uic::runtime::element::SPropertyDesc; + using qt3ds::runtime::element::SPropertyDesc; qt3ds::foundation::IStringTable &theStringTable(inPresentation.GetStringTable()); // build out the graph. for (bool success = inReader.MoveToFirstChild(); success; @@ -1098,7 +1098,7 @@ BOOL CUIPParserImpl::LoadSceneGraph(IPresentation &inPresentation, IDOMReader &i (void)theNumAtts; } } - uic::runtime::element::SElement &theNewElem = theElemAllocator.CreateElement( + qt3ds::runtime::element::SElement &theNewElem = theElemAllocator.CreateElement( theStringTable.RegisterStr(theName.c_str()), theStringTable.RegisterStr(theType), theStringTable.RegisterStr(theElementData.m_Class.c_str()), toConstDataRef(theProperties.data(), (QT3DSU32)theProperties.size()), &inPresentation, @@ -1603,7 +1603,7 @@ BOOL CUIPParserImpl::LoadState(IPresentation &inPresentation, SElement *inCompon eastl::string theSlideName = GetSlideName(inReader); - uic::runtime::SSlidePlayInformation thePlayMode = GetPlayMode(inReader); + qt3ds::runtime::SSlidePlayInformation thePlayMode = GetPlayMode(inReader); thePlayMode.m_PlayThroughTo = (QT3DSU8)GetPlayThroughTo(inSlideIndex, inReader); // Setup with the default value from the metadata INT32 theMinTime = m_MetaData.GetPropertyValueLong(m_MetaData.Register("Asset"), @@ -1811,11 +1811,11 @@ void CUIPParserImpl::DoRefSectionCount(UICDM::IDOMReader &inReader, INT32 inNumS outLogicCounter.m_PaddingCount += inNumSlideMultiplier; } -uic::runtime::SSlidePlayInformation CUIPParserImpl::GetPlayMode(UICDM::IDOMReader &inReader) +qt3ds::runtime::SSlidePlayInformation CUIPParserImpl::GetPlayMode(UICDM::IDOMReader &inReader) { - using uic::runtime::PlayMode; + using qt3ds::runtime::PlayMode; - uic::runtime::SSlidePlayInformation thePlayInformation; + qt3ds::runtime::SSlidePlayInformation thePlayInformation; // Setup with the default value from the metadata eastl::string thePlayMode = m_MetaData.GetPropertyValueString(m_MetaData.Register("Slide"), m_MetaData.Register("playmode")); @@ -1984,7 +1984,7 @@ BOOL CUIPParserImpl::LoadSlideElements(IPresentation &inPresentation, UICDM::IDO theActionIdStr.assign(theActionEntry.m_ActionId.c_str()); qt3ds::QT3DSI32 theActionIndex = m_ActionHelper->GetActionIndex(theActionIdStr); for (qt3ds::QT3DSI32 idx = 0; idx < theActionEntry.m_ActionCount; ++idx) { - uic::runtime::SSlideAnimAction *theSlideData = + qt3ds::runtime::SSlideAnimAction *theSlideData = theBuilder.AddSlideAnimAction(false, theActionIndex + idx, theActionEntry.m_Active && canActivateFlag); diff --git a/src/Runtime/Source/Viewer/UICViewerApp.cpp b/src/Runtime/Source/Viewer/UICViewerApp.cpp index e70c12fc..9172f180 100644 --- a/src/Runtime/Source/Viewer/UICViewerApp.cpp +++ b/src/Runtime/Source/Viewer/UICViewerApp.cpp @@ -338,7 +338,7 @@ void UICViewerApp::setOffscreenId(int offscreenID) bool UICViewerApp::InitializeApp(int winWidth, int winHeight, const QSurfaceFormat &format, int offscreenID, const QString &source, - uic::UICAssetVisitor *assetVisitor) + qt3ds::UICAssetVisitor *assetVisitor) { bool hasValidPresentationFile = !source.isEmpty(); diff --git a/src/Runtime/Source/Viewer/UICViewerApp.h b/src/Runtime/Source/Viewer/UICViewerApp.h index 68dccd95..bf134bd8 100644 --- a/src/Runtime/Source/Viewer/UICViewerApp.h +++ b/src/Runtime/Source/Viewer/UICViewerApp.h @@ -47,7 +47,7 @@ class IWindowSystem; class IAudioPlayer; } -namespace uic { +namespace qt3ds { class UICAssetVisitor { public: @@ -115,7 +115,7 @@ public: */ bool InitializeApp(int winWidth, int winHeight, const QSurfaceFormat& format, int offscreenID, const QString &source, - uic::UICAssetVisitor *assetVisitor = nullptr); + qt3ds::UICAssetVisitor *assetVisitor = nullptr); bool IsInitialised(void); void setOffscreenId(int offscreenID); diff --git a/src/Viewer/qmlviewer/Qt3DSRenderer.cpp b/src/Viewer/qmlviewer/Qt3DSRenderer.cpp index 51e2f9e9..255a7635 100644 --- a/src/Viewer/qmlviewer/Qt3DSRenderer.cpp +++ b/src/Viewer/qmlviewer/Qt3DSRenderer.cpp @@ -46,7 +46,7 @@ using namespace UICViewer; QT_BEGIN_NAMESPACE -Q3DSRenderer::Q3DSRenderer(bool visibleFlag, uic::UICAssetVisitor *assetVisitor) +Q3DSRenderer::Q3DSRenderer(bool visibleFlag, qt3ds::UICAssetVisitor *assetVisitor) : m_visibleFlag(visibleFlag) , m_initElements(false) , m_runtime(0) diff --git a/src/Viewer/qmlviewer/Qt3DSRenderer.h b/src/Viewer/qmlviewer/Qt3DSRenderer.h index 4f43c744..b9582547 100644 --- a/src/Viewer/qmlviewer/Qt3DSRenderer.h +++ b/src/Viewer/qmlviewer/Qt3DSRenderer.h @@ -48,7 +48,7 @@ class Q3DSRenderer : public QObject, Q_OBJECT public: - Q3DSRenderer(bool visibleFlag, uic::UICAssetVisitor *assetVisitor); + Q3DSRenderer(bool visibleFlag, qt3ds::UICAssetVisitor *assetVisitor); ~Q3DSRenderer(); QOpenGLFramebufferObject *createFramebufferObject(const QSize &size) override; @@ -78,7 +78,7 @@ protected: QQuickWindow *m_window; // Window associated with the plugin; needed to reset OpenGL state. bool m_initialized; // Has the runtime and OpenGL state been initialized? - uic::UICAssetVisitor *m_visitor; + qt3ds::UICAssetVisitor *m_visitor; Q3DSViewerSettings *m_settings; Q3DSPresentation *m_presentation; diff --git a/src/Viewer/studio3d/viewerqmlstreamproxy_p.h b/src/Viewer/studio3d/viewerqmlstreamproxy_p.h index c0e52d7a..aeb4c96e 100644 --- a/src/Viewer/studio3d/viewerqmlstreamproxy_p.h +++ b/src/Viewer/studio3d/viewerqmlstreamproxy_p.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE class Q_STUDIO3D_EXPORT ViewerQmlStreamProxy : public Q3DSQmlStreamProxy, - public uic::UICAssetVisitor + public qt3ds::UICAssetVisitor { public: ViewerQmlStreamProxy(QObject *parent = nullptr); diff --git a/tests/auto/runtime/Qt3DSRenderTestBase.cpp b/tests/auto/runtime/Qt3DSRenderTestBase.cpp index 99748916..84e83ed0 100644 --- a/tests/auto/runtime/Qt3DSRenderTestBase.cpp +++ b/tests/auto/runtime/Qt3DSRenderTestBase.cpp @@ -28,7 +28,7 @@ #include "Qt3DSRenderTestBase.h" -using namespace uic::render; +using namespace qt3ds::render; namespace qt3ds { namespace render { @@ -40,11 +40,11 @@ NVRenderTestBase::~NVRenderTestBase() bool NVRenderTestBase::initializeUICRenderer(QSurfaceFormat format) { - m_coreFactory = uic::render::IUICRenderFactoryCore::CreateRenderFactoryCore("", m_windowSystem, + m_coreFactory = qt3ds::render::IUICRenderFactoryCore::CreateRenderFactoryCore("", m_windowSystem, m_timeProvider); m_factory = m_coreFactory->CreateRenderFactory(format); m_rc = m_factory->GetUICRenderContext(); - m_renderImpl = new uic::render::CUICRendererImpl(*m_rc); + m_renderImpl = new qt3ds::render::CUICRendererImpl(*m_rc); QString versionString; switch ((QT3DSU32)m_rc->GetRenderContext().GetRenderContextType()) { diff --git a/tests/auto/runtime/Qt3DSRenderTestBase.h b/tests/auto/runtime/Qt3DSRenderTestBase.h index 40ac36fb..3bef8fd5 100644 --- a/tests/auto/runtime/Qt3DSRenderTestBase.h +++ b/tests/auto/runtime/Qt3DSRenderTestBase.h @@ -43,7 +43,7 @@ #include "UICRendererImpl.h" #include "UICMetadata.h" -namespace uic { +namespace qt3ds { namespace render { class IUICRenderer; class CUICRendererImpl; @@ -144,16 +144,16 @@ namespace render { } bool initializeUICRenderer(QSurfaceFormat format); - uic::render::CUICRendererImpl *uicRenderer(); + qt3ds::render::CUICRendererImpl *uicRenderer(); Q3DStudio::IRuntimeMetaData *NVRenderTestBase::metadata(); private: - NVScopedRefCounted<uic::render::IUICRenderFactoryCore> m_coreFactory; - NVScopedRefCounted<uic::render::IUICRenderFactory> m_factory; - NVScopedRefCounted<uic::render::IUICRenderContext> m_rc; + NVScopedRefCounted<qt3ds::render::IUICRenderFactoryCore> m_coreFactory; + NVScopedRefCounted<qt3ds::render::IUICRenderFactory> m_factory; + NVScopedRefCounted<qt3ds::render::IUICRenderContext> m_rc; qt3ds::foundation::NVScopedReleasable<Q3DStudio::IRuntimeMetaData> m_metaData; - uic::render::CUICRendererImpl *m_renderImpl; + qt3ds::render::CUICRendererImpl *m_renderImpl; SNullTimeProvider m_timeProvider; SNullWindowSystem m_windowSystem; diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp index 6e5dcf00..eaad4ff8 100644 --- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp +++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp @@ -54,7 +54,7 @@ #include <QString> #include <QTextStream> -using namespace uic::render; +using namespace qt3ds::render; #include <string> @@ -115,7 +115,7 @@ struct CustomTestParams Option<UICDM::SMetaDataCustomMaterial> metaMaterial; SImage dummyImages[SShaderDefaultMaterialKeyProperties::ImageMapCount]; eastl::vector<SRenderableImage*> renderableImages; - uic::render::CUICRendererImpl *render; + qt3ds::render::CUICRendererImpl *render; SImage iblLightProbe; NVRenderTexture2D *texture; @@ -230,7 +230,7 @@ static CustomTestKey randomizeTestKey() return *reinterpret_cast<CustomTestKey*>(&v); } -CustomTestParams *generateTest(uic::render::CUICRendererImpl *renderImpl, +CustomTestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl, NVRenderContext *context, CustomTestKey key, SCustomMaterial *material) { CustomTestParams *params = new CustomTestParams(*renderImpl); @@ -442,7 +442,7 @@ bool Qt3DSRenderTestCustomMaterialGenerator::run(NVRenderContext *context, metadata()->GetMaterialMetaDataBySourcePath("qrc:/copper.material"); if (metaMaterial.hasValue()) { - uic::render::IUIPLoader::CreateMaterialClassFromMetaMaterial( + qt3ds::render::IUIPLoader::CreateMaterialClassFromMetaMaterial( name, context->GetFoundation(), uicRenderer()->GetUICContext().GetCustomMaterialSystem(), *metaMaterial, context->GetStringTable()); diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp index 6e9be253..dbbee093 100644 --- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp +++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp @@ -44,7 +44,7 @@ #include <QTime> -using namespace uic::render; +using namespace qt3ds::render; #include <string> @@ -210,9 +210,9 @@ struct TestParams SImage dummyImages[SShaderDefaultMaterialKeyProperties::ImageMapCount]; NVRenderTexture2D *textures[4]; eastl::vector<SRenderableImage*> renderableImages; - uic::render::CUICRendererImpl *render; + qt3ds::render::CUICRendererImpl *render; - TestParams(NVRenderContext *context, uic::render::CUICRendererImpl *renderImpl) + TestParams(NVRenderContext *context, qt3ds::render::CUICRendererImpl *renderImpl) : subset(context->GetAllocator()) , modelContext(model, viewProjection) , images(NULL) @@ -272,7 +272,7 @@ TestKey randomizeTestKey() } -TestParams *generateTest(uic::render::CUICRendererImpl *renderImpl, +TestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl, NVRenderContext *context, TestKey key) { // TODO: light probes diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp index f779845c..33eb4e0f 100644 --- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp +++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp @@ -56,7 +56,7 @@ #include <string> -using namespace uic::render; +using namespace qt3ds::render; namespace qt3ds { namespace render { @@ -134,7 +134,7 @@ bool Qt3DSRenderTestEffectGenerator::run(NVRenderContext *context, userContextDa metadata()->GetEffectMetaDataBySourcePath(cname); if (metaEffect.hasValue()) { - uic::render::IUIPLoader::CreateEffectClassFromMetaEffect( + qt3ds::render::IUIPLoader::CreateEffectClassFromMetaEffect( name, context->GetFoundation(), uicRenderer()->GetUICContext().GetEffectSystem(), *metaEffect, context->GetStringTable()); |