diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2017-10-17 09:52:28 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-10-24 13:23:25 +0000 |
| commit | c588fe4e11a8e05becad3b5ef09ac6bc4e0fee7f (patch) | |
| tree | 0ecc096b5daca077c71ff755bfa87a002497fb7d | |
| parent | 0bc163ccbbd8fcd35aa0dc76eaabf6d5a0dde1d2 (diff) | |
Rename UIC macros and constants to QT3DS
Task-number: QT3DS-18
Change-Id: Iba01b0aa0b479e2487f447a9f3b479cee359614f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
175 files changed, 905 insertions, 906 deletions
diff --git a/src/Authoring/Studio/Render/StudioRendererImpl.h b/src/Authoring/Studio/Render/StudioRendererImpl.h index a9753334..08d813e9 100644 --- a/src/Authoring/Studio/Render/StudioRendererImpl.h +++ b/src/Authoring/Studio/Render/StudioRendererImpl.h @@ -26,8 +26,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STUDIO_RENDERER_IMPL_H -#define UIC_STUDIO_RENDERER_IMPL_H +#ifndef QT3DS_STUDIO_RENDERER_IMPL_H +#define QT3DS_STUDIO_RENDERER_IMPL_H #pragma once #include "IStudioRenderer.h" #include "WGLRenderContext.h" diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp index bb2f231a..d5dbe058 100644 --- a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp +++ b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp @@ -474,49 +474,49 @@ struct STranslatorUICDMParser #define SubPath_Closed m_SubPath.m_Closed // Fill in implementations for the actual parse tables. -#define HANDLE_UIC_RENDER_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_PROPERTY(type, name, dirty) \ theParser.ParseProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name); -#define HANDLE_UIC_RENDER_VEC3_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_VEC3_PROPERTY(type, name, dirty) \ theParser.ParseProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name); -#define HANDLE_UIC_RENDER_REAL_VEC2_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_REAL_VEC2_PROPERTY(type, name, dirty) \ theParser.ParseProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name); -#define HANDLE_UIC_RENDER_COLOR_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_COLOR_PROPERTY(type, name, dirty) \ theParser.ParseProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name); -#define HANDLE_UIC_RENDER_RADIAN_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_RADIAN_PROPERTY(type, name, dirty) \ theParser.ParseRadianProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name); -#define HANDLE_UIC_RENDER_VEC3_RADIAN_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_VEC3_RADIAN_PROPERTY(type, name, dirty) \ theParser.ParseRadianProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name); -#define HANDLE_UIC_RENDER_OPACITY_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_OPACITY_PROPERTY(type, name, dirty) \ theParser.ParseOpacityProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name); -#define HANDLE_UIC_ROTATION_ORDER_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_ROTATION_ORDER_PROPERTY(type, name, dirty) \ theParser.ParseRotationOrder(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name); -#define HANDLE_UIC_NODE_ORIENTATION_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_NODE_ORIENTATION_PROPERTY(type, name, dirty) \ theParser.ParseOrientation(inContext.m_ObjectDefinitions.type##_##name, theItem.m_Flags); -#define HANDLE_UIC_RENDER_DEPTH_TEST_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_DEPTH_TEST_PROPERTY(type, name, dirty) \ if (theParser.ParseProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_##name)) \ theItem.m_##name = !theItem.m_##name; -#define HANDLE_UIC_NODE_FLAGS_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_NODE_FLAGS_PROPERTY(type, name, dirty) \ theParser.ParseNodeFlagsProperty(inContext.m_ObjectDefinitions.type##_##name, theItem.m_Flags, \ qt3ds::render::NodeFlagValues::name); -#define HANDLE_UIC_NODE_FLAGS_INVERSE_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_NODE_FLAGS_INVERSE_PROPERTY(type, name, dirty) \ theParser.ParseNodeFlagsInverseProperty(inContext.m_ObjectDefinitions.type##_##name, \ theItem.m_Flags, qt3ds::render::NodeFlagValues::name); -#define HANDLE_UIC_RENDER_ENUM_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_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) \ +#define HANDLE_QT3DS_RENDER_SOURCEPATH_PROPERTY(type, name, dirty) \ theParser.ParseAndResolveSourcePath(inContext.m_ObjectDefinitions.type##_##name, \ theItem.m_##name); -#define HANDLE_UIC_RENDER_ARRAY_PROPERTY(type, name, index, dirty) \ +#define HANDLE_QT3DS_RENDER_ARRAY_PROPERTY(type, name, index, dirty) \ theParser.ParseProperty(inContext.m_ObjectDefinitions.type##_##name##_##index, \ theItem.m_##name[index]); -#define HANDLE_UIC_RENDER_VEC2_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_VEC2_PROPERTY(type, name, dirty) \ theParser.ParseProperty(inContext.m_ObjectDefinitions.type##_##name##_##X, \ theItem.m_##name.x); \ theParser.ParseProperty(inContext.m_ObjectDefinitions.type##_##name##_##Y, theItem.m_##name.y); -#define HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY( \ - type, name, dirty) // noop by intention already handled by HANDLE_UIC_RENDER_COLOR_PROPERTY -#define HANDLE_UIC_RENDER_TRANSFORM_VEC3_PROPERTY( \ - type, name, dirty) // noop by intention already handled by HANDLE_UIC_RENDER_VEC3_PROPERTY +#define HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY( \ + type, name, dirty) // noop by intention already handled by HANDLE_QT3DS_RENDER_COLOR_PROPERTY +#define HANDLE_QT3DS_RENDER_TRANSFORM_VEC3_PROPERTY( \ + type, name, dirty) // noop by intention already handled by HANDLE_QT3DS_RENDER_VEC3_PROPERTY struct SSceneTranslator : public SGraphObjectTranslator { @@ -529,7 +529,7 @@ struct SSceneTranslator : public SGraphObjectTranslator { SScene &theItem = static_cast<SScene &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_SCENE_PROPERTIES + ITERATE_QT3DS_RENDER_SCENE_PROPERTIES SLayer *theCurrentLayer = nullptr; theItem.m_FirstChild = nullptr; for (long idx = 0, end = inContext.m_AssetGraph.GetChildCount(GetInstanceHandle()); @@ -606,7 +606,7 @@ struct SNodeTranslator : public SGraphObjectTranslator SGraphObjectTranslator::PushTranslation(inContext); SNode &theItem = static_cast<SNode &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_NODE_PROPERTIES + ITERATE_QT3DS_RENDER_NODE_PROPERTIES theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Node.m_BoneId, theItem.m_SkeletonId); bool ignoresParent = false; @@ -661,7 +661,7 @@ struct SLayerTranslator : public SNodeTranslator SNodeTranslator::PushTranslation(inContext); SLayer &theItem = static_cast<SLayer &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_LAYER_PROPERTIES + ITERATE_QT3DS_RENDER_LAYER_PROPERTIES theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Layer.m_AoSamplerate, theItem.m_AoSamplerate); } @@ -707,7 +707,7 @@ struct SLightTranslator : public SNodeTranslator SNodeTranslator::PushTranslation(inContext); SLight &theItem = static_cast<SLight &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_LIGHT_PROPERTIES + ITERATE_QT3DS_RENDER_LIGHT_PROPERTIES theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Light.m_ShadowMapRes, theItem.m_ShadowMapRes); } @@ -725,7 +725,7 @@ struct SCameraTranslator : public SNodeTranslator SNodeTranslator::PushTranslation(inContext); SCamera &theItem = static_cast<SCamera &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_CAMERA_PROPERTIES + ITERATE_QT3DS_RENDER_CAMERA_PROPERTIES } }; struct SModelTranslator : public SNodeTranslator @@ -739,7 +739,7 @@ struct SModelTranslator : public SNodeTranslator SNodeTranslator::PushTranslation(inContext); SModel &theItem = static_cast<SModel &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_MODEL_PROPERTIES + ITERATE_QT3DS_RENDER_MODEL_PROPERTIES theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Model.m_PoseRoot, theItem.m_SkeletonRoot); @@ -809,7 +809,7 @@ struct SPathSubPathTranslator : public SGraphObjectTranslator { SPathSubPath &theItem = static_cast<SPathSubPath &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_PATH_SUBPATH_PROPERTIES + ITERATE_QT3DS_RENDER_PATH_SUBPATH_PROPERTIES m_PathBuffer.clear(); Q3DStudio::IDocumentReader &theReader(inContext.m_Doc.GetDocumentReader()); QT3DSU32 anchorCount = 0; @@ -891,7 +891,7 @@ struct SPathTranslator : public SNodeTranslator SNodeTranslator::PushTranslation(inContext); SPath &theItem = static_cast<SPath &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_PATH_PROPERTIES + ITERATE_QT3DS_RENDER_PATH_PROPERTIES } }; @@ -908,7 +908,7 @@ struct SDefaultMaterialTranslator : public SGraphObjectTranslator SGraphObjectTranslator::PushTranslation(inContext); SDefaultMaterial &theItem = static_cast<SDefaultMaterial &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_MATERIAL_PROPERTIES + ITERATE_QT3DS_RENDER_MATERIAL_PROPERTIES // qt3dsdm::CUICDMInstanceHandle parent = inContext.m_AssetGraph.GetParent( // GetInstanceHandle() ); @@ -938,7 +938,7 @@ struct SImageTranslator : public SGraphObjectTranslator SGraphObjectTranslator::PushTranslation(inContext); SImage &theItem = static_cast<SImage &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_IMAGE_PROPERTIES + ITERATE_QT3DS_RENDER_IMAGE_PROPERTIES theItem.m_Flags.SetDirty(true); theItem.m_Flags.SetTransformDirty(true); @@ -970,7 +970,7 @@ struct STextTranslator : public SNodeTranslator SNodeTranslator::PushTranslation(inContext); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); SText &theItem = static_cast<SText &>(GetGraphObject()); - ITERATE_UIC_RENDER_TEXT_PROPERTIES + ITERATE_QT3DS_RENDER_TEXT_PROPERTIES theItem.m_Flags.SetTextDirty(true); } }; @@ -1141,7 +1141,7 @@ struct SCustomMaterialTranslator : public SDynamicObjectTranslator SDynamicObjectTranslator::PushTranslation(inContext); SCustomMaterial &theItem = static_cast<SCustomMaterial &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_CUSTOM_MATERIAL_PROPERTIES + ITERATE_QT3DS_RENDER_CUSTOM_MATERIAL_PROPERTIES theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Lightmaps.m_LightmapIndirect, theItem.m_Lightmaps.m_LightmapIndirect); @@ -1174,7 +1174,7 @@ struct SReferencedMaterialTranslator : public SGraphObjectTranslator SGraphObjectTranslator::PushTranslation(inContext); SReferencedMaterial &theItem = static_cast<SReferencedMaterial &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, GetInstanceHandle()); - ITERATE_UIC_RENDER_REFERENCED_MATERIAL_PROPERTIES + ITERATE_QT3DS_RENDER_REFERENCED_MATERIAL_PROPERTIES theItem.m_Dirty.SetDirty(); if (theItem.m_ReferencedMaterial == &theItem) { @@ -1474,7 +1474,7 @@ struct SAliasTranslator : public SGraphObjectTranslator { SNode &theItem = static_cast<SNode &>(GetGraphObject()); STranslatorUICDMParser theParser(inContext, m_InstanceHandle); - ITERATE_UIC_RENDER_NODE_PROPERTIES + ITERATE_QT3DS_RENDER_NODE_PROPERTIES theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Node.m_BoneId, theItem.m_SkeletonId); bool ignoresParent = false; diff --git a/src/Runtime/Source/Engine/Include/Qt3DSEGLInfo.h b/src/Runtime/Source/Engine/Include/Qt3DSEGLInfo.h index c8ffcf2f..558271cf 100644 --- a/src/Runtime/Source/Engine/Include/Qt3DSEGLInfo.h +++ b/src/Runtime/Source/Engine/Include/Qt3DSEGLInfo.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_EGLINFO_H -#define UIC_EGLINFO_H +#ifndef QT3DS_EGLINFO_H +#define QT3DS_EGLINFO_H #include <EGL/egl.h> namespace Q3DStudio { diff --git a/src/Runtime/Source/Engine/Include/Qt3DSEGLWindowSystem.h b/src/Runtime/Source/Engine/Include/Qt3DSEGLWindowSystem.h index 8b5a7577..c7ed2548 100644 --- a/src/Runtime/Source/Engine/Include/Qt3DSEGLWindowSystem.h +++ b/src/Runtime/Source/Engine/Include/Qt3DSEGLWindowSystem.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_EGL_WINDOW_SYSTEM_H -#define UIC_EGL_WINDOW_SYSTEM_H +#ifndef QT3DS_EGL_WINDOW_SYSTEM_H +#define QT3DS_EGL_WINDOW_SYSTEM_H #include "Qt3DSEGLInfo.h" #include "UICWindowSystem.h" #include "nv_main/nv_main.h" diff --git a/src/Runtime/Source/Engine/Include/Qt3DSWindowSystem.h b/src/Runtime/Source/Engine/Include/Qt3DSWindowSystem.h index 25f5bf71..8a719937 100644 --- a/src/Runtime/Source/Engine/Include/Qt3DSWindowSystem.h +++ b/src/Runtime/Source/Engine/Include/Qt3DSWindowSystem.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_WINDOW_SYSTEM_H -#define UIC_WINDOW_SYSTEM_H +#ifndef QT3DS_WINDOW_SYSTEM_H +#define QT3DS_WINDOW_SYSTEM_H namespace Q3DStudio { struct SSize diff --git a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp index 540664c8..af5ca40e 100644 --- a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp +++ b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp @@ -644,12 +644,12 @@ struct SRuntimePropertyParser #define SubPath_Closed ATTRIBUTE_CLOSED // Fill in implementations for the actual parse tables. -#define HANDLE_UIC_RENDER_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name); \ break; -#define HANDLE_UIC_RENDER_VEC3_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_VEC3_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name##_X: \ inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x); \ break; \ @@ -660,7 +660,7 @@ struct SRuntimePropertyParser inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.z); \ break; -#define HANDLE_UIC_RENDER_REAL_VEC2_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_REAL_VEC2_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name##_X: \ inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x); \ break; \ @@ -668,7 +668,7 @@ struct SRuntimePropertyParser inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.y); \ break; -#define HANDLE_UIC_RENDER_COLOR_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_COLOR_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name##_R: \ inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x); \ break; \ @@ -679,23 +679,23 @@ struct SRuntimePropertyParser inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.z); \ break; -#define HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name); \ break; -#define HANDLE_UIC_RENDER_TRANSFORM_VEC3_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_TRANSFORM_VEC3_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name); \ break; -#define HANDLE_UIC_RENDER_RADIAN_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_RADIAN_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseRadianProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name); \ break; // The runtime converts rotations for us. -#define HANDLE_UIC_RENDER_VEC3_RADIAN_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_VEC3_RADIAN_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name##_X: \ inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x); \ break; \ @@ -706,54 +706,54 @@ struct SRuntimePropertyParser inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.z); \ break; -#define HANDLE_UIC_RENDER_OPACITY_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_OPACITY_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseOpacityProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name); \ break; -#define HANDLE_UIC_ROTATION_ORDER_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_ROTATION_ORDER_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseRotationOrder<UICRenderDirtyFlags::dirty>(theItem.m_##name); \ break; -#define HANDLE_UIC_NODE_ORIENTATION_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_NODE_ORIENTATION_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseOrientation<UICRenderDirtyFlags::dirty>(theItem.m_Flags); \ break; -#define HANDLE_UIC_RENDER_DEPTH_TEST_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_DEPTH_TEST_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseInverseBoolean<UICRenderDirtyFlags::dirty>(theItem.m_##name); \ break; -#define HANDLE_UIC_NODE_FLAGS_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_NODE_FLAGS_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseNodeFlagsProperty<UICRenderDirtyFlags::dirty>(theItem.m_Flags, \ NodeFlagValues::name); \ break; -#define HANDLE_UIC_NODE_FLAGS_INVERSE_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_NODE_FLAGS_INVERSE_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseNodeFlagsInverseProperty<UICRenderDirtyFlags::dirty>(theItem.m_Flags, \ NodeFlagValues::name); \ break; -#define HANDLE_UIC_RENDER_ENUM_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_ENUM_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseEnumProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name); \ break; -#define HANDLE_UIC_RENDER_SOURCEPATH_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_SOURCEPATH_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name: \ inParser.ParseAndResolveSourcePath<UICRenderDirtyFlags::dirty>(theItem.m_##name); \ break; -#define HANDLE_UIC_RENDER_ARRAY_PROPERTY(type, name, index, dirty) \ +#define HANDLE_QT3DS_RENDER_ARRAY_PROPERTY(type, name, index, dirty) \ case Q3DStudio::type##_##name##_##index: \ inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name[index]); \ break; -#define HANDLE_UIC_RENDER_VEC2_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_VEC2_PROPERTY(type, name, dirty) \ case Q3DStudio::type##_##name##_X: \ inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x); \ break; \ @@ -777,7 +777,7 @@ struct SSceneTranslator : public CUICTranslator SScene &theItem = *static_cast<SScene *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_SCENE_PROPERTIES + ITERATE_QT3DS_RENDER_SCENE_PROPERTIES // These are ignored by the renderer case Q3DStudio::ATTRIBUTE_NAME: case Q3DStudio::ATTRIBUTE_STARTTIME: @@ -816,7 +816,7 @@ struct SNodeTranslator : public CUICTranslator { SNode &theItem = *static_cast<SNode *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_NODE_PROPERTIES + ITERATE_QT3DS_RENDER_NODE_PROPERTIES case Q3DStudio::ATTRIBUTE_NAME: case Q3DStudio::ATTRIBUTE_STARTTIME: case Q3DStudio::ATTRIBUTE_ENDTIME: @@ -864,7 +864,7 @@ struct SLayerTranslator : public SNodeTranslator (void)propName; SLayer &theItem = *static_cast<SLayer *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_LAYER_PROPERTIES + ITERATE_QT3DS_RENDER_LAYER_PROPERTIES // Ignored default: SNodeTranslator::OnSpecificPropertyChange(inParser); @@ -885,7 +885,7 @@ struct SLightTranslator : public SNodeTranslator SLight &theItem = *static_cast<SLight *>(m_RenderObject); // I guess there is no switching of light type in the runtime right now. switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_LIGHT_PROPERTIES + ITERATE_QT3DS_RENDER_LIGHT_PROPERTIES default: SNodeTranslator::OnSpecificPropertyChange(inParser); break; @@ -903,7 +903,7 @@ struct SCameraTranslator : public SNodeTranslator { SCamera &theItem = *static_cast<SCamera *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_CAMERA_PROPERTIES + ITERATE_QT3DS_RENDER_CAMERA_PROPERTIES default: SNodeTranslator::OnSpecificPropertyChange(inParser); break; @@ -922,7 +922,7 @@ struct SModelTranslator : public SNodeTranslator { SModel &theItem = *static_cast<SModel *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_MODEL_PROPERTIES + ITERATE_QT3DS_RENDER_MODEL_PROPERTIES default: SNodeTranslator::OnSpecificPropertyChange(inParser); break; @@ -942,7 +942,7 @@ struct SPathTranslator : public SNodeTranslator { SPath &theItem = *static_cast<SPath *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_PATH_PROPERTIES + ITERATE_QT3DS_RENDER_PATH_PROPERTIES default: SNodeTranslator::OnSpecificPropertyChange(inParser); break; @@ -964,7 +964,7 @@ struct SPathSubPathTranslator : public CUICTranslator { SPathSubPath &theItem = *static_cast<SPathSubPath *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_PATH_SUBPATH_PROPERTIES + ITERATE_QT3DS_RENDER_PATH_SUBPATH_PROPERTIES default: break; } @@ -1046,7 +1046,7 @@ struct SDefaultMaterialTranslator : public CUICTranslator SDefaultMaterial &theItem = *static_cast<SDefaultMaterial *>(m_RenderObject); // There is no render-time caching on a material, so the dirty flag doesn't do much. switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_MATERIAL_PROPERTIES + ITERATE_QT3DS_RENDER_MATERIAL_PROPERTIES case Q3DStudio::ATTRIBUTE_NAME: case Q3DStudio::ATTRIBUTE_STARTTIME: @@ -1081,7 +1081,7 @@ struct SImageTranslator : public CUICTranslator { SImage &theItem = *static_cast<SImage *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_IMAGE_PROPERTIES + ITERATE_QT3DS_RENDER_IMAGE_PROPERTIES case Q3DStudio::ATTRIBUTE_STARTTIME: case Q3DStudio::ATTRIBUTE_ENDTIME: case Q3DStudio::ATTRIBUTE_NAME: @@ -1115,7 +1115,7 @@ struct SReferencedMaterialTranslator : public CUICTranslator { TNodeType &theItem = *static_cast<TNodeType *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_REFERENCED_MATERIAL_PROPERTIES + ITERATE_QT3DS_RENDER_REFERENCED_MATERIAL_PROPERTIES case Q3DStudio::ATTRIBUTE_STARTTIME: case Q3DStudio::ATTRIBUTE_ENDTIME: case Q3DStudio::ATTRIBUTE_NAME: @@ -1146,7 +1146,7 @@ struct STextTranslator : public SNodeTranslator { SText &theItem = *static_cast<SText *>(m_RenderObject); switch (inParser.m_PropertyName) { - ITERATE_UIC_RENDER_TEXT_PROPERTIES + ITERATE_QT3DS_RENDER_TEXT_PROPERTIES case Q3DStudio::ATTRIBUTE_TEXTTYPE: case Q3DStudio::ATTRIBUTE_RENDERSTYLE: case Q3DStudio::ATTRIBUTE_WORDWRAP: @@ -1710,13 +1710,13 @@ CUICTranslator *CUICTranslator::CreateTranslatorForElement(Q3DStudio::TElement & { CUICTranslator *theTranslator = NULL; switch (inObject.m_Type) { -#define UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ +#define QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ case GraphObjectTypes::type: \ theTranslator = \ STranslatorCreator<S##type##Translator>::Create(inElement, inObject, inAlloc); \ break; - UIC_RENDER_ITERATE_GRAPH_OBJECT_TYPES -#undef UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE + QT3DS_RENDER_ITERATE_GRAPH_OBJECT_TYPES +#undef QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE default: QT3DS_ASSERT(false); break; @@ -1729,13 +1729,13 @@ void CUICTranslator::OnElementChanged(SPresentation &inPresentation, Q3DStudio::IPresentation &inStudioPresentation) { switch (m_RenderObject->m_Type) { -#define UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ +#define QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ case GraphObjectTypes::type: \ STranslatorCreator<S##type##Translator>::OnElementChanged( \ *this, inPresentation, inRenderContext, inStudioPresentation); \ break; - UIC_RENDER_ITERATE_GRAPH_OBJECT_TYPES -#undef UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE + QT3DS_RENDER_ITERATE_GRAPH_OBJECT_TYPES +#undef QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE default: QT3DS_ASSERT(false); break; @@ -1760,13 +1760,13 @@ CUICTranslator *CUICTranslator::LoadTranslator(SDataReader &inReader, size_t inE *graphObjPtr += sgSectionStart; // Call actual constructor to initialize vtable. switch (theTranslator->RenderObject().m_Type) { -#define UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ +#define QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ case GraphObjectTypes::type: \ STranslatorCreator<S##type##Translator>::InitializeTranslator(*theTranslator, \ inAllocator); \ break; - UIC_RENDER_ITERATE_GRAPH_OBJECT_TYPES -#undef UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE + QT3DS_RENDER_ITERATE_GRAPH_OBJECT_TYPES +#undef QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE default: QT3DS_ASSERT(false); break; diff --git a/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp b/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp index 8e0bfd44..4b9b3018 100644 --- a/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp +++ b/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp @@ -703,7 +703,7 @@ CTegraApplication::~CTegraApplication() KDint CTegraApplication::BeginLoad(const QString &sourcePath) { -#ifndef UIC_NO_SEARCH_PATH +#ifndef QT3DS_NO_SEARCH_PATH // We need these later on in case we try to load any files // such as images NvFSAppendSearchPath("/res"); diff --git a/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h b/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h index fed6b8d9..cec621e9 100644 --- a/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h +++ b/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_EVENT_SYSTEM_C_H -#define UIC_EVENT_SYSTEM_C_H +#ifndef QT3DS_EVENT_SYSTEM_C_H +#define QT3DS_EVENT_SYSTEM_C_H #include <stddef.h> //size_t // Interface we expect plugins to use in order to interace with the event system. diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSSystem.cpp b/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSSystem.cpp index 73b03084..e87a25ea 100644 --- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSSystem.cpp +++ b/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSSystem.cpp @@ -83,15 +83,15 @@ const char *qt3ds::foundation::System::g_FloatingPointModel = "softfp"; #endif #if defined(QT3DS_ARM) -#if defined(UIC_GRAPHICS_API_GLES2) +#if defined(QT3DS_GRAPHICS_API_GLES2) const char *qt3ds::foundation::System::g_GPUType = "gles2"; -#elif defined(UIC_GRAPHICS_API_GL) +#elif defined(QT3DS_GRAPHICS_API_GL) const char *qt3ds::foundation::System::g_GPUType = "gl"; -#elif defined(UIC_GRAPHICS_API_GLES3) +#elif defined(QT3DS_GRAPHICS_API_GLES3) const char *qt3ds::foundation::System::g_GPUType = "gles3"; #else #error \ - "Must define a GPU type for arm platforms (UIC_GRAPHICS_API_GLES2, UIC_GRAPHICS_API_GLES3, UIC_GRAPHICS_API_GL)" + "Must define a GPU type for arm platforms (QT3DS_GRAPHICS_API_GLES2, QT3DS_GRAPHICS_API_GLES3, QT3DS_GRAPHICS_API_GL)" #endif #elif defined(QT3DS_X86) const char *qt3ds::foundation::System::g_GPUType = ""; diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h index 8942f56f..3939276e 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_CAMERA_H -#define UIC_RENDER_CAMERA_H +#ifndef QT3DS_RENDER_CAMERA_H +#define QT3DS_RENDER_CAMERA_H #include "Qt3DSRenderNode.h" #include "Qt3DSRenderRay.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h index f6eabf5e..593c7573 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_CUSTOM_MATERIAL_H -#define UIC_RENDER_CUSTOM_MATERIAL_H +#ifndef QT3DS_RENDER_CUSTOM_MATERIAL_H +#define QT3DS_RENDER_CUSTOM_MATERIAL_H #include "Qt3DSRender.h" #include "Qt3DSRenderDynamicObject.h" #include "Qt3DSRenderImage.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h index 88600b9a..03b739e4 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_DEFAULT_MATERIAL_H -#define UIC_RENDER_DEFAULT_MATERIAL_H +#ifndef QT3DS_RENDER_DEFAULT_MATERIAL_H +#define QT3DS_RENDER_DEFAULT_MATERIAL_H #include "Qt3DSRender.h" #include "Qt3DSRenderGraphObject.h" #include "foundation/Qt3DSFlags.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h index cdaa7615..a275e572 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_DYNAMIC_OBJECT_H -#define UIC_RENDER_DYNAMIC_OBJECT_H +#ifndef QT3DS_RENDER_DYNAMIC_OBJECT_H +#define QT3DS_RENDER_DYNAMIC_OBJECT_H #include "Qt3DSRender.h" #include "Qt3DSRenderGraphObject.h" #include "Qt3DSRenderNode.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h index 0989a506..a4b55541 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_EFFECT_H -#define UIC_RENDER_EFFECT_H +#ifndef QT3DS_RENDER_EFFECT_H +#define QT3DS_RENDER_EFFECT_H #include "Qt3DSRender.h" #include "Qt3DSRenderGraphObject.h" #include "Qt3DSRenderNode.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h index 3df286e9..a97a9eb4 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_GRAPH_OBJECT_H -#define UIC_RENDER_GRAPH_OBJECT_H +#ifndef QT3DS_RENDER_GRAPH_OBJECT_H +#define QT3DS_RENDER_GRAPH_OBJECT_H #include "Qt3DSRender.h" #include "Qt3DSRenderTaggedPointer.h" #include "Qt3DSRenderGraphObjectTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h index d8f665c1..6ef485e2 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_IMAGE_H -#define UIC_RENDER_IMAGE_H +#ifndef QT3DS_RENDER_IMAGE_H +#define QT3DS_RENDER_IMAGE_H #include "Qt3DSRender.h" #include "Qt3DSRenderGraphObject.h" #include "foundation/StringTable.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h index a836cbf6..f410db06 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_LAYER_H -#define UIC_RENDER_LAYER_H +#ifndef QT3DS_RENDER_LAYER_H +#define QT3DS_RENDER_LAYER_H #include "Qt3DSRender.h" #include "Qt3DSRenderNode.h" #include "foundation/Qt3DSContainers.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h index 6e48ef1a..9be8469c 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_LIGHT_H -#define UIC_RENDER_LIGHT_H +#ifndef QT3DS_RENDER_LIGHT_H +#define QT3DS_RENDER_LIGHT_H #include "Qt3DSRenderNode.h" namespace qt3ds { diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h index e0d01f4b..3f3eca11 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h @@ -29,8 +29,8 @@ ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_LIGHTMAPS_H -#define UIC_RENDER_LIGHTMAPS_H +#ifndef QT3DS_RENDER_LIGHTMAPS_H +#define QT3DS_RENDER_LIGHTMAPS_H #include "Qt3DSRender.h" #include "Qt3DSRenderGraphObject.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h index def29fa8..c04c1b6b 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_MATERIAL_DIRTY_H -#define UIC_RENDER_MATERIAL_DIRTY_H +#ifndef QT3DS_RENDER_MATERIAL_DIRTY_H +#define QT3DS_RENDER_MATERIAL_DIRTY_H namespace qt3ds { namespace render { @@ -58,4 +58,4 @@ namespace render { } } -#endif // UIC_RENDER_MATERIAL_DIRTY_H +#endif // QT3DS_RENDER_MATERIAL_DIRTY_H diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h index 4a545850..28f59c80 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_MODEL_H -#define UIC_RENDER_MODEL_H +#ifndef QT3DS_RENDER_MODEL_H +#define QT3DS_RENDER_MODEL_H #include "Qt3DSRenderNode.h" #include "foundation/StringTable.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h index fff1fa4b..d4c3f7ff 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_NODE_H -#define UIC_RENDER_NODE_H +#ifndef QT3DS_RENDER_NODE_H +#define QT3DS_RENDER_NODE_H #include "Qt3DSRender.h" #include "Qt3DSRenderGraphObject.h" #include "foundation/Qt3DSMat44.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h index 3a083a2c..ed1f9beb 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PATH_SEGMENT_H -#define UIC_RENDER_PATH_SEGMENT_H +#ifndef QT3DS_RENDER_PATH_SEGMENT_H +#define QT3DS_RENDER_PATH_SEGMENT_H #include "Qt3DSRender.h" #include "Qt3DSRenderGraphObject.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h index b963b5d9..9d1d83f9 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PRESENTATION_H -#define UIC_RENDER_PRESENTATION_H +#ifndef QT3DS_RENDER_PRESENTATION_H +#define QT3DS_RENDER_PRESENTATION_H #include "foundation/StringTable.h" #include "Qt3DSRenderGraphObject.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h index 29cca9d5..d2043f0d 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_REFERENCED_MATERIAL_H -#define UIC_RENDER_REFERENCED_MATERIAL_H +#ifndef QT3DS_RENDER_REFERENCED_MATERIAL_H +#define QT3DS_RENDER_REFERENCED_MATERIAL_H #include "Qt3DSRender.h" #include "Qt3DSRenderGraphObject.h" #include "Qt3DSRenderMaterialDirty.h" @@ -60,4 +60,4 @@ namespace render { } } -#endif // UIC_RENDER_REFERENCED_MATERIAL_H +#endif // QT3DS_RENDER_REFERENCED_MATERIAL_H diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h index cac87888..aa7e0b74 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_SCENE_H -#define UIC_RENDER_SCENE_H +#ifndef QT3DS_RENDER_SCENE_H +#define QT3DS_RENDER_SCENE_H #include "Qt3DSRender.h" #include "foundation/Qt3DSVec3.h" #include "Qt3DSRenderGraphObject.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h index db6f3107..ea8fb850 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_TEXT_H -#define UIC_RENDER_TEXT_H +#ifndef QT3DS_RENDER_TEXT_H +#define QT3DS_RENDER_TEXT_H #include "Qt3DSRender.h" #include "Qt3DSRenderNode.h" #include "Qt3DSRenderTextTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h index fd12f850..cc5d077c 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_LINUX_DYNAMIC_LIB_LOADER_H -#define UIC_LINUX_DYNAMIC_LIB_LOADER_H +#ifndef QT3DS_LINUX_DYNAMIC_LIB_LOADER_H +#define QT3DS_LINUX_DYNAMIC_LIB_LOADER_H #include <dlfcn.h> #include "foundation/Qt3DSFoundation.h" #include "foundation/Qt3DSBroadcastingAllocator.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h index 7a2cb486..555c2689 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_OFFSCREEN_RENDER_KEY_H -#define UIC_OFFSCREEN_RENDER_KEY_H +#ifndef QT3DS_OFFSCREEN_RENDER_KEY_H +#define QT3DS_OFFSCREEN_RENDER_KEY_H #include "Qt3DSRender.h" #include "foundation/StringTable.h" #include "foundation/Qt3DSDiscriminatedUnion.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h index 00cf1f11..ea86e65d 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_OFFSCREEN_RENDER_MANAGER_H -#define UIC_OFFSCREEN_RENDER_MANAGER_H +#ifndef QT3DS_OFFSCREEN_RENDER_MANAGER_H +#define QT3DS_OFFSCREEN_RENDER_MANAGER_H #include "Qt3DSRender.h" #include "foundation/Qt3DSSimpleTypes.h" #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h index abf365a8..0d474cb0 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_OLD_N_BUSTED_RENDER_PLUGIN_H -#define UIC_OLD_N_BUSTED_RENDER_PLUGIN_H +#ifndef QT3DS_OLD_N_BUSTED_RENDER_PLUGIN_H +#define QT3DS_OLD_N_BUSTED_RENDER_PLUGIN_H #include "Qt3DSOffscreenRenderManager.h" #include "Qt3DSRenderContextCore.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h index fde46c0b..7563bc4b 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_H -#define UIC_RENDER_H +#ifndef QT3DS_RENDER_H +#define QT3DS_RENDER_H namespace qt3ds { class NVAllocatorCallback; diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h index 31c77174..b788ad24 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_CLIPPING_PLANE_H -#define UIC_RENDER_CLIPPING_PLANE_H +#ifndef QT3DS_RENDER_CLIPPING_PLANE_H +#define QT3DS_RENDER_CLIPPING_PLANE_H #include "Qt3DSRender.h" #include "foundation/Qt3DSPlane.h" #include "foundation/Qt3DSFlags.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h index 9963e3b2..1da509bf 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_CONTEXT_H -#define UIC_RENDER_CONTEXT_H +#ifndef QT3DS_RENDER_CONTEXT_CORE_H +#define QT3DS_RENDER_CONTEXT_CORE_H #include "Qt3DSRender.h" #include "foundation/Qt3DSAllocatorCallback.h" #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h index bedecd23..4a815a41 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_CUSTOM_MATERIAL_RENDER_CONTEXT_H -#define UIC_RENDER_CUSTOM_MATERIAL_RENDER_CONTEXT_H +#ifndef QT3DS_RENDER_CUSTOM_MATERIAL_RENDER_CONTEXT_H +#define QT3DS_RENDER_CUSTOM_MATERIAL_RENDER_CONTEXT_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSMat44.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h index 329e29d2..f114fa15 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_CUSTOM_MATERIAL_SHADER_GENERATOR_H -#define UIC_RENDER_CUSTOM_MATERIAL_SHADER_GENERATOR_H +#ifndef QT3DS_RENDER_CUSTOM_MATERIAL_SHADER_GENERATOR_H +#define QT3DS_RENDER_CUSTOM_MATERIAL_SHADER_GENERATOR_H #include "Qt3DSRenderMaterialShaderGenerator.h" namespace qt3ds { diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h index eb9d94ca..6b2fa7d0 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_CUSTOM_MATERIAL_SYSTEM_H -#define UIC_RENDER_CUSTOM_MATERIAL_SYSTEM_H +#ifndef QT3DS_RENDER_CUSTOM_MATERIAL_SYSTEM_H +#define QT3DS_RENDER_CUSTOM_MATERIAL_SYSTEM_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "Qt3DSRenderDynamicObjectSystem.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h index a45b3d82..6ec567d5 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_DEFAULT_MATERIAL_SHADER_GENERATOR_H -#define UIC_RENDER_DEFAULT_MATERIAL_SHADER_GENERATOR_H +#ifndef QT3DS_RENDER_DEFAULT_MATERIAL_SHADER_GENERATOR_H +#define QT3DS_RENDER_DEFAULT_MATERIAL_SHADER_GENERATOR_H #include "Qt3DSRenderMaterialShaderGenerator.h" namespace qt3ds { diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h index 217bff97..668a638f 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_DYNAMIC_OBJECT_SYSTEM_H -#define UIC_RENDER_DYNAMIC_OBJECT_SYSTEM_H +#ifndef QT3DS_RENDER_DYNAMIC_OBJECT_SYSTEM_H +#define QT3DS_RENDER_DYNAMIC_OBJECT_SYSTEM_H #include "Qt3DSRender.h" #include "foundation/Qt3DSSimpleTypes.h" #include "render/Qt3DSRenderBaseTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h index e344b58b..38204e8c 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_EFFECT_SYSTEM_COMMANDS_H -#define UIC_RENDER_EFFECT_SYSTEM_COMMANDS_H +#ifndef QT3DS_RENDER_EFFECT_SYSTEM_COMMANDS_H +#define QT3DS_RENDER_EFFECT_SYSTEM_COMMANDS_H #include "Qt3DSRender.h" #include "foundation/StringTable.h" #include "render/Qt3DSRenderBaseTypes.h" @@ -67,25 +67,25 @@ namespace render { }; }; -#define UIC_RENDER_EFFECTS_ITERATE_COMMAND_TYPES \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(AllocateBuffer) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(BindTarget) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(BindBuffer) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(BindShader) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyInstanceValue) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyBufferValue) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyDepthValue) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(Render) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyBlending) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyRenderState) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyBlitFramebuffer) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyValue) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(DepthStencil) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(LuaCommand) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(AllocateImage) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyImageValue) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(AllocateDataBuffer) \ - UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyDataBufferValue) +#define QT3DS_RENDER_EFFECTS_ITERATE_COMMAND_TYPES \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(AllocateBuffer) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(BindTarget) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(BindBuffer) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(BindShader) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyInstanceValue) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyBufferValue) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyDepthValue) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(Render) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyBlending) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyRenderState) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyBlitFramebuffer) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyValue) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(DepthStencil) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(LuaCommand) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(AllocateImage) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyImageValue) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(AllocateDataBuffer) \ + QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(ApplyDataBufferValue) // All commands need at least two constructors. One for when they are created that should // setup diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h index 3df26b24..79c8962e 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_DYNAMIC_OBJECT_SYSTEM_UTIL_H -#define UIC_RENDER_DYNAMIC_OBJECT_SYSTEM_UTIL_H +#ifndef QT3DS_RENDER_DYNAMIC_OBJECT_SYSTEM_UTIL_H +#define QT3DS_RENDER_DYNAMIC_OBJECT_SYSTEM_UTIL_H #include "Qt3DSRender.h" #include "foundation/StringTable.h" #include "foundation/Qt3DSAllocatorCallback.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h index 9c0c7e89..bdabe21b 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_EFFECT_SYSTEM_H -#define UIC_RENDER_EFFECT_SYSTEM_H +#ifndef QT3DS_RENDER_EFFECT_SYSTEM_H +#define QT3DS_RENDER_EFFECT_SYSTEM_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "render/Qt3DSRenderBaseTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h index 51c24090..757f1579 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_GRAPH_OBJECT_PICK_QUERY_H -#define UIC_RENDER_GRAPH_OBJECT_PICK_QUERY_H +#ifndef QT3DS_RENDER_GRAPH_OBJECT_PICK_QUERY_H +#define QT3DS_RENDER_GRAPH_OBJECT_PICK_QUERY_H #include "Qt3DSRender.h" #include "foundation/Qt3DSVec2.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h index 7a63ce22..8f8420c1 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_GRAPH_OBJECT_SERIALZER_H -#define UIC_RENDER_GRAPH_OBJECT_SERIALZER_H +#ifndef QT3DS_RENDER_GRAPH_OBJECT_SERIALZER_H +#define QT3DS_RENDER_GRAPH_OBJECT_SERIALZER_H #include "Qt3DSRender.h" #include "foundation/Qt3DSDataRef.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h index 8cbe8c46..221f51ef 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_GRAPH_OBJECT_TYPES_H -#define UIC_RENDER_GRAPH_OBJECT_TYPES_H +#ifndef QT3DS_RENDER_GRAPH_OBJECT_TYPES_H +#define QT3DS_RENDER_GRAPH_OBJECT_TYPES_H #include "Qt3DSRender.h" #include "foundation/Qt3DSAssert.h" @@ -38,23 +38,23 @@ namespace render { // If you need a generic switch statement, then these macros will ensure // you get all the types the first time. -#define UIC_RENDER_ITERATE_GRAPH_OBJECT_TYPES \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Presentation) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Scene) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Node) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Layer) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Light) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Camera) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Model) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(DefaultMaterial) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Image) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Text) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Effect) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(RenderPlugin) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(CustomMaterial) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(ReferencedMaterial) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(Path) \ - UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(PathSubPath) +#define QT3DS_RENDER_ITERATE_GRAPH_OBJECT_TYPES \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Presentation) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Scene) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Node) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Layer) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Light) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Camera) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Model) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(DefaultMaterial) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Image) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Text) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Effect) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(RenderPlugin) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(CustomMaterial) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(ReferencedMaterial) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(Path) \ + QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(PathSubPath) struct GraphObjectTypes { @@ -148,11 +148,11 @@ namespace render { static const char *GetObjectTypeName(Enum inType) { switch (inType) { -#define UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ +#define QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ case type: \ return #type; - UIC_RENDER_ITERATE_GRAPH_OBJECT_TYPES -#undef UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE + QT3DS_RENDER_ITERATE_GRAPH_OBJECT_TYPES +#undef QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE default: break; } diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h index 5e69c9ec..f1c38954 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_IMAGE_TEXTURE_DATA_H -#define UIC_RENDER_IMAGE_TEXTURE_DATA_H +#ifndef QT3DS_RENDER_IMAGE_TEXTURE_DATA_H +#define QT3DS_RENDER_IMAGE_TEXTURE_DATA_H #include "Qt3DSRender.h" #include "foundation/Qt3DSFlags.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h index cd88d398..e82134b8 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_INPUT_STREAM_FACTORY_H -#define UIC_RENDER_INPUT_STREAM_FACTORY_H +#ifndef QT3DS_RENDER_INPUT_STREAM_FACTORY_H +#define QT3DS_RENDER_INPUT_STREAM_FACTORY_H #include "Qt3DSRender.h" #include "foundation/IOStreams.h" #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h index 62e8ba37..afb799e7 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_MATERIAL_HELPERS_H -#define UIC_RENDER_MATERIAL_HELPERS_H +#ifndef QT3DS_RENDER_MATERIAL_HELPERS_H +#define QT3DS_RENDER_MATERIAL_HELPERS_H #include "Qt3DSRenderCustomMaterial.h" #include "Qt3DSRenderDefaultMaterial.h" #include "Qt3DSRenderReferencedMaterial.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h index cd796bfe..4eaf696a 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_MATERIAL_SHADER_GENERATOR_H -#define UIC_RENDER_MATERIAL_SHADER_GENERATOR_H +#ifndef QT3DS_RENDER_MATERIAL_SHADER_GENERATOR_H +#define QT3DS_RENDER_MATERIAL_SHADER_GENERATOR_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "Qt3DSRenderShaderKeys.h" @@ -40,8 +40,8 @@ namespace qt3ds { namespace render { // these are our current shader limits -#define UIC_MAX_NUM_LIGHTS 16 -#define UIC_MAX_NUM_SHADOWS 8 +#define QT3DS_MAX_NUM_LIGHTS 16 +#define QT3DS_MAX_NUM_SHADOWS 8 // note this struct must exactly match the memory layout of the // struct sampleLight.glsllib and sampleArea.glsllib. If you make changes here you need diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h index f4b180d6..d6959ec8 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_MESH_H -#define UIC_RENDER_MESH_H +#ifndef QT3DS_RENDER_MESH_H +#define QT3DS_RENDER_MESH_H #include "Qt3DSRender.h" #include "render/Qt3DSRenderVertexBuffer.h" #include "render/Qt3DSRenderIndexBuffer.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h index 3dbc924b..d255f984 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PATH_MANAGER_H -#define UIC_RENDER_PATH_MANAGER_H +#ifndef QT3DS_RENDER_PATH_MANAGER_H +#define QT3DS_RENDER_PATH_MANAGER_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "foundation/StringTable.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h index cbbb28f3..e9eb2220 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_RENDER_PATH_MATH_H -#define UIC_RENDER_PATH_MATH_H +#ifndef QT3DS_RENDER_PATH_MATH_H +#define QT3DS_RENDER_PATH_MATH_H #include "Qt3DSRender.h" #include "foundation/Qt3DSVec2.h" #include "foundation/Qt3DSVec3.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h index 0234fbe4..deeea281 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PATH_RENDER_CONTEXT_H -#define UIC_RENDER_PATH_RENDER_CONTEXT_H +#ifndef QT3DS_RENDER_PATH_RENDER_CONTEXT_H +#define QT3DS_RENDER_PATH_RENDER_CONTEXT_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "foundation/StringTable.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h index 4b50b0b6..e4b67d6b 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PIXEL_GRAPHICS_RENDERER_H -#define UIC_RENDER_PIXEL_GRAPHICS_RENDERER_H +#ifndef QT3DS_RENDER_PIXEL_GRAPHICS_RENDERER_H +#define QT3DS_RENDER_PIXEL_GRAPHICS_RENDERER_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSDataRef.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h index f9f3cea3..2c154c18 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PIXEL_GRAPHICS_TYPES_H -#define UIC_RENDER_PIXEL_GRAPHICS_TYPES_H +#ifndef QT3DS_RENDER_PIXEL_GRAPHICS_TYPES_H +#define QT3DS_RENDER_PIXEL_GRAPHICS_TYPES_H #include "Qt3DSRender.h" #include "foundation/Qt3DSVec2.h" #include "foundation/Qt3DSVec4.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h index bc45fba1..b983229f 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PLUGIN_H -#define UIC_RENDER_PLUGIN_H +#ifndef QT3DS_RENDER_PLUGIN_H +#define QT3DS_RENDER_PLUGIN_H #include "Qt3DSRender.h" #include "Qt3DSRenderPluginCInterface.h" #include "Qt3DSOffscreenRenderManager.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h index 61a6710c..711f31d6 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_OBJECT_RENDER_PLUGIN_H -#define UIC_OBJECT_RENDER_PLUGIN_H +#ifndef QT3DS_OBJECT_RENDER_PLUGIN_H +#define QT3DS_OBJECT_RENDER_PLUGIN_H /* * Below are the definitions required in order to write a render plugin for UIComposer. @@ -82,7 +82,7 @@ typedef long TUICBOOL; #define UICTRUE 1 #define UICFALSE 0 -#define UIC_CURRENT_RENDER_PLUGIN_API_VERSION 2 +#define QT3DS_CURRENT_RENDER_PLUGIN_API_VERSION 2 typedef void *TRenderPluginInstancePtr; typedef void *TRenderPluginClassPtr; @@ -244,7 +244,7 @@ typedef void (*TReleaseInstanceFunction)(TRenderPluginClassPtr cls, /* * Get the plugin API version. This allows the runtime to account for API changes over time or - * refuse to load the plugin. Plugins should return UIC_CURRENT_RENDER_PLUGIN_API_VERSION + * refuse to load the plugin. Plugins should return QT3DS_CURRENT_RENDER_PLUGIN_API_VERSION * * Required API function. */ @@ -296,7 +296,7 @@ typedef struct _RenderPluginClass } TRenderPluginClass; // We look for this function name in the shared library -#define UIC_RENDER_PLUGIN_CREATE_CLASS_FUNCION_NAME "CreateRenderPlugin" +#define QT3DS_RENDER_PLUGIN_CREATE_CLASS_FUNCION_NAME "CreateRenderPlugin" /* * Function signature we expect mapped to "CreateRenderPlugin". Example code: diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h index 7552e311..c0ea66b4 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PLUGIN_GRAPH_OBJECT_H -#define UIC_RENDER_PLUGIN_GRAPH_OBJECT_H +#ifndef QT3DS_RENDER_PLUGIN_GRAPH_OBJECT_H +#define QT3DS_RENDER_PLUGIN_GRAPH_OBJECT_H #include "Qt3DSRender.h" #include "Qt3DSRenderGraphObject.h" namespace qt3ds { diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h index 0f3e901b..a266e8d3 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PLUGIN_PROPERTY_VALUE_H -#define UIC_RENDER_PLUGIN_PROPERTY_VALUE_H +#ifndef QT3DS_RENDER_PLUGIN_PROPERTY_VALUE_H +#define QT3DS_RENDER_PLUGIN_PROPERTY_VALUE_H #include "Qt3DSRender.h" #include "foundation/StringTable.h" #include "foundation/Qt3DSDiscriminatedUnion.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h index 4cce67d0..d7d2e4a4 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PROFILER_H -#define UIC_RENDER_PROFILER_H +#ifndef QT3DS_RENDER_PROFILER_H +#define QT3DS_RENDER_PROFILER_H #include "Qt3DSRender.h" #include "EASTL/string.h" #include "foundation/StringTable.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h index 52cb66f5..705f7089 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_RAY_H -#define UIC_RENDER_RAY_H +#ifndef QT3DS_RENDER_RAY_H +#define QT3DS_RENDER_RAY_H #include "Qt3DSRender.h" #include "foundation/Qt3DSVec2.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h index cb69e08d..dce9a95a 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_RENDER_LIST_H -#define UIC_RENDER_RENDER_LIST_H +#ifndef QT3DS_RENDER_RENDER_LIST_H +#define QT3DS_RENDER_RENDER_LIST_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "render/Qt3DSRenderBaseTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h index d4d0641d..19ba8eb7 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_ROTATION_HELPER_H -#define UIC_RENDER_ROTATION_HELPER_H +#ifndef QT3DS_RENDER_ROTATION_HELPER_H +#define QT3DS_RENDER_ROTATION_HELPER_H #include "Qt3DSRender.h" #include "Qt3DSRenderNode.h" #include "EASTL/utility.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h index 6fbf7981..09996bf2 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_SHADER_CACHE_H -#define UIC_RENDER_SHADER_CACHE_H +#ifndef QT3DS_RENDER_SHADER_CACHE_H +#define QT3DS_RENDER_SHADER_CACHE_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSFlags.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h index f7c7829f..80cbaaae 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_SHADER_CODE_GENERATOR_H -#define UIC_RENDER_SHADER_CODE_GENERATOR_H +#ifndef QT3DS_RENDER_SHADER_CODE_GENERATOR_H +#define QT3DS_RENDER_SHADER_CODE_GENERATOR_H #include "Qt3DSRender.h" #include "foundation/Qt3DSContainers.h" #include "EASTL/string.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h index f6f7471d..7dc46cee 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_SHADER_CODE_GENERATOR_V2_H -#define UIC_RENDER_SHADER_CODE_GENERATOR_V2_H +#ifndef QT3DS_RENDER_SHADER_CODE_GENERATOR_V2_H +#define QT3DS_RENDER_SHADER_CODE_GENERATOR_V2_H #include "Qt3DSRenderShaderCodeGenerator.h" #include "Qt3DSRenderShaderCache.h" #include "foundation/Qt3DSFlags.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h index 8d9af357..8bb3bd4b 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_SHADER_KEY_H -#define UIC_RENDER_SHADER_KEY_H +#ifndef QT3DS_RENDER_SHADER_KEY_H +#define QT3DS_RENDER_SHADER_KEY_H #include "Qt3DSRender.h" #include "foundation/Qt3DSSimpleTypes.h" #include "foundation/Qt3DSDataRef.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h index 08a1ae8f..2f0f32b5 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_SHADOW_MAP_H -#define UIC_RENDER_SHADOW_MAP_H +#ifndef QT3DS_RENDER_SHADOW_MAP_H +#define QT3DS_RENDER_SHADOW_MAP_H #include "Qt3DSRenderContextCore.h" #include "foundation/Qt3DSAtomic.h" #include "foundation/Qt3DSMat44.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h index 3dcd1987..8d831c20 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_STRING_H -#define UIC_RENDER_STRING_H +#ifndef QT3DS_RENDER_STRING_H +#define QT3DS_RENDER_STRING_H #include "Qt3DSRender.h" #include <string> diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h index b509e67c..1c5d66e5 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_SUB_PRESENTATION_HELPER_H -#define UIC_RENDER_SUB_PRESENTATION_HELPER_H +#ifndef QT3DS_RENDER_SUB_PRESENTATION_HELPER_H +#define QT3DS_RENDER_SUB_PRESENTATION_HELPER_H #include "Qt3DSRenderContextCore.h" #include "Qt3DSRenderer.h" #include "render/Qt3DSRenderContext.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h index 00d98c47..3d4b2384 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_SUBPRESENTATION_H -#define UIC_RENDER_SUBPRESENTATION_H +#ifndef QT3DS_RENDER_SUBPRESENTATION_H +#define QT3DS_RENDER_SUBPRESENTATION_H #include "Qt3DSOffscreenRenderManager.h" #include "Qt3DSRenderSubPresentationHelper.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h index 74e59c99..8dd8bdd0 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_TAGGED_POINTER_H -#define UIC_RENDER_TAGGED_POINTER_H +#ifndef QT3DS_RENDER_TAGGED_POINTER_H +#define QT3DS_RENDER_TAGGED_POINTER_H #include "Qt3DSRender.h" #include "foundation/StringTable.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h index e01a9247..15ea03c9 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_TESS_MODE_VALUES_H -#define UIC_RENDER_TESS_MODE_VALUES_H +#ifndef QT3DS_RENDER_TESS_MODE_VALUES_H +#define QT3DS_RENDER_TESS_MODE_VALUES_H #include "Qt3DSRender.h" namespace qt3ds { diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h index fcd6862a..7a3f1215 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_TEXT_TEXTURE_ATLAS_H -#define UIC_RENDER_TEXT_TEXTURE_ATLAS_H +#ifndef QT3DS_RENDER_TEXT_TEXTURE_ATLAS_H +#define QT3DS_RENDER_TEXT_TEXTURE_ATLAS_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "Qt3DSRenderText.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h index 67662966..45d40217 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_TEXT_TEXTURE_CACHE_H -#define UIC_RENDER_TEXT_TEXTURE_CACHE_H +#ifndef QT3DS_RENDER_TEXT_TEXTURE_CACHE_H +#define QT3DS_RENDER_TEXT_TEXTURE_CACHE_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "Qt3DSRenderText.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h index c7a65070..e0487fff 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_TEXT_TYPES_H -#define UIC_RENDER_TEXT_TYPES_H +#ifndef QT3DS_RENDER_TEXT_TYPES_H +#define QT3DS_RENDER_TEXT_TYPES_H #include "Qt3DSRender.h" #include "foundation/Qt3DSSimpleTypes.h" #include "foundation/Qt3DSDataRef.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h index 026f90bc..46f7bdb5 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_TEXTURE_ATLAS_H -#define UIC_RENDER_TEXTURE_ATLAS_H +#ifndef QT3DS_RENDER_TEXTURE_ATLAS_H +#define QT3DS_RENDER_TEXTURE_ATLAS_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "render/Qt3DSRenderBaseTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h index 014f9e0b..d39f226f 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_THREAD_POOL_H -#define UIC_RENDER_THREAD_POOL_H +#ifndef QT3DS_RENDER_THREAD_POOL_H +#define QT3DS_RENDER_THREAD_POOL_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h index 9e435234..a59a6a6e 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h @@ -28,10 +28,10 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_UIP_LOADER_H -#define UIC_RENDER_UIP_LOADER_H +#ifndef QT3DS_RENDER_UIP_LOADER_H +#define QT3DS_RENDER_UIP_LOADER_H -#ifdef UIC_RENDER_ENABLE_LOAD_UIP +#ifdef QT3DS_RENDER_ENABLE_LOAD_UIP #include "Qt3DSRender.h" #include "foundation/StringTable.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h index d952b46b..d65ad7d6 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_UIP_SHARED_TRANSLATION_H -#define UIC_RENDER_UIP_SHARED_TRANSLATION_H +#ifndef QT3DS_RENDER_UIP_SHARED_TRANSLATION_H +#define QT3DS_RENDER_UIP_SHARED_TRANSLATION_H #include "Qt3DSRenderLight.h" #include "Qt3DSRenderCamera.h" #include "Qt3DSRenderDefaultMaterial.h" @@ -180,38 +180,38 @@ namespace render { static SEnumNameMap *GetMap(); }; -#define UIC_RENDER_WCHAR_T_XYZs L"XYZ" -#define UIC_RENDER_WCHAR_T_YZXs L"YZX" -#define UIC_RENDER_WCHAR_T_ZXYs L"ZXY" -#define UIC_RENDER_WCHAR_T_XZYs L"XZY" -#define UIC_RENDER_WCHAR_T_YXZs L"YXZ" -#define UIC_RENDER_WCHAR_T_ZYXs L"ZYX" - -#define UIC_RENDER_WCHAR_T_XYZr L"XYZr" -#define UIC_RENDER_WCHAR_T_YZXr L"YZXr" -#define UIC_RENDER_WCHAR_T_ZXYr L"ZXYr" -#define UIC_RENDER_WCHAR_T_XZYr L"XZYr" -#define UIC_RENDER_WCHAR_T_YXZr L"YXZr" -#define UIC_RENDER_WCHAR_T_ZYXr L"ZYXr" - -#define UIC_RENDER_CHAR_T_XYZs "XYZ" -#define UIC_RENDER_CHAR_T_YZXs "YZX" -#define UIC_RENDER_CHAR_T_ZXYs "ZXY" -#define UIC_RENDER_CHAR_T_XZYs "XZY" -#define UIC_RENDER_CHAR_T_YXZs "YXZ" -#define UIC_RENDER_CHAR_T_ZYXs "ZYX" - -#define UIC_RENDER_CHAR_T_XYZr "XYZr" -#define UIC_RENDER_CHAR_T_YZXr "YZXr" -#define UIC_RENDER_CHAR_T_ZXYr "ZXYr" -#define UIC_RENDER_CHAR_T_XZYr "XZYr" -#define UIC_RENDER_CHAR_T_YXZr "YXZr" -#define UIC_RENDER_CHAR_T_ZYXr "ZYXr" +#define QT3DS_RENDER_WCHAR_T_XYZs L"XYZ" +#define QT3DS_RENDER_WCHAR_T_YZXs L"YZX" +#define QT3DS_RENDER_WCHAR_T_ZXYs L"ZXY" +#define QT3DS_RENDER_WCHAR_T_XZYs L"XZY" +#define QT3DS_RENDER_WCHAR_T_YXZs L"YXZ" +#define QT3DS_RENDER_WCHAR_T_ZYXs L"ZYX" + +#define QT3DS_RENDER_WCHAR_T_XYZr L"XYZr" +#define QT3DS_RENDER_WCHAR_T_YZXr L"YZXr" +#define QT3DS_RENDER_WCHAR_T_ZXYr L"ZXYr" +#define QT3DS_RENDER_WCHAR_T_XZYr L"XZYr" +#define QT3DS_RENDER_WCHAR_T_YXZr L"YXZr" +#define QT3DS_RENDER_WCHAR_T_ZYXr L"ZYXr" + +#define QT3DS_RENDER_CHAR_T_XYZs "XYZ" +#define QT3DS_RENDER_CHAR_T_YZXs "YZX" +#define QT3DS_RENDER_CHAR_T_ZXYs "ZXY" +#define QT3DS_RENDER_CHAR_T_XZYs "XZY" +#define QT3DS_RENDER_CHAR_T_YXZs "YXZ" +#define QT3DS_RENDER_CHAR_T_ZYXs "ZYX" + +#define QT3DS_RENDER_CHAR_T_XYZr "XYZr" +#define QT3DS_RENDER_CHAR_T_YZXr "YZXr" +#define QT3DS_RENDER_CHAR_T_ZXYr "ZXYr" +#define QT3DS_RENDER_CHAR_T_XZYr "XZYr" +#define QT3DS_RENDER_CHAR_T_YXZr "YXZr" +#define QT3DS_RENDER_CHAR_T_ZYXr "ZYXr" inline QT3DSU32 MapRotationOrder(const wchar_t *inOrderStr) { #define MAP_ROTATION_ORDER(name, postfix) \ - if (wcscmp(inOrderStr, UIC_RENDER_WCHAR_T_##name##postfix) == 0) { \ + if (wcscmp(inOrderStr, QT3DS_RENDER_WCHAR_T_##name##postfix) == 0) { \ return EulOrd##name##postfix; \ } MAP_ROTATION_ORDER(XYZ, s); @@ -233,7 +233,7 @@ namespace render { inline QT3DSU32 MapRotationOrder(const char8_t *inOrderStr) { #define MAP_ROTATION_ORDER(name, postfix) \ - if (strcmp(inOrderStr, UIC_RENDER_CHAR_T_##name##postfix) == 0) { \ + if (strcmp(inOrderStr, QT3DS_RENDER_CHAR_T_##name##postfix) == 0) { \ return EulOrd##name##postfix; \ } MAP_ROTATION_ORDER(XYZ, s); @@ -274,188 +274,190 @@ namespace render { // on each struct that we care about. We will fill in these macros with implementation later. // Each macro will list the property name along with what dirty operation should get marked // Global parse tables that list every property used by the system. -#define ITERATE_UIC_RENDER_SCENE_PROPERTIES \ - HANDLE_UIC_RENDER_COLOR_PROPERTY(Scene, ClearColor, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Scene, UseClearColor, Dirty) - -#define ITERATE_UIC_RENDER_NODE_PROPERTIES \ - HANDLE_UIC_RENDER_TRANSFORM_VEC3_PROPERTY(Node, Rotation, TransformDirty) \ - HANDLE_UIC_RENDER_VEC3_RADIAN_PROPERTY(Node, Rotation, TransformDirty) \ - HANDLE_UIC_RENDER_TRANSFORM_VEC3_PROPERTY(Node, Position, TransformDirty) \ - HANDLE_UIC_RENDER_VEC3_PROPERTY(Node, Position, TransformDirty) \ - HANDLE_UIC_RENDER_TRANSFORM_VEC3_PROPERTY(Node, Scale, TransformDirty) \ - HANDLE_UIC_RENDER_VEC3_PROPERTY(Node, Scale, TransformDirty) \ - HANDLE_UIC_RENDER_TRANSFORM_VEC3_PROPERTY(Node, Pivot, TransformDirty) \ - HANDLE_UIC_RENDER_VEC3_PROPERTY(Node, Pivot, TransformDirty) \ - HANDLE_UIC_RENDER_OPACITY_PROPERTY(Node, LocalOpacity, TransformDirty) \ - HANDLE_UIC_ROTATION_ORDER_PROPERTY(Node, RotationOrder, TransformDirty) \ - HANDLE_UIC_NODE_ORIENTATION_PROPERTY(Node, LeftHanded, TransformDirty) - -#define ITERATE_UIC_RENDER_LAYER_PROPERTIES \ - HANDLE_UIC_NODE_FLAGS_INVERSE_PROPERTY(Layer, LayerEnableDepthTest, Dirty) \ - HANDLE_UIC_NODE_FLAGS_INVERSE_PROPERTY(Layer, LayerEnableDepthPrePass, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, ProgressiveAAMode, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, MultisampleAAMode, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, TemporalAAEnabled, Dirty) \ - HANDLE_UIC_RENDER_COLOR_PROPERTY(Layer, ClearColor, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, BlendType, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, Background, Dirty) \ - HANDLE_UIC_RENDER_SOURCEPATH_PROPERTY(Layer, TexturePath, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, HorizontalFieldValues, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, Left, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, LeftUnits, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, Width, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, WidthUnits, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, Right, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, RightUnits, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, VerticalFieldValues, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, Top, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, TopUnits, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, Height, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, HeightUnits, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, Bottom, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Layer, BottomUnits, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, AoStrength, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, AoDistance, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, AoSoftness, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, AoBias, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, AoDither, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, ShadowStrength, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, ShadowDist, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, ShadowSoftness, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, ShadowBias, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, LightProbe, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, ProbeBright, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, FastIbl, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, ProbeHorizon, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, ProbeFov, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, LightProbe2, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, Probe2Fade, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, Probe2Window, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Layer, Probe2Pos, Dirty) - -#define ITERATE_UIC_RENDER_CAMERA_PROPERTIES \ - HANDLE_UIC_RENDER_PROPERTY(Camera, ClipNear, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Camera, ClipFar, Dirty) \ - HANDLE_UIC_RENDER_RADIAN_PROPERTY(Camera, FOV, Dirty) \ - HANDLE_UIC_NODE_FLAGS_PROPERTY(Camera, Orthographic, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Camera, ScaleMode, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Camera, ScaleAnchor, Dirty) - -#define ITERATE_UIC_RENDER_LIGHT_PROPERTIES \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Light, LightType, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, Scope, Dirty) \ - HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY(Light, DiffuseColor, Dirty) \ - HANDLE_UIC_RENDER_COLOR_PROPERTY(Light, DiffuseColor, Dirty) \ - HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY(Light, SpecularColor, Dirty) \ - HANDLE_UIC_RENDER_COLOR_PROPERTY(Light, SpecularColor, Dirty) \ - HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY(Light, AmbientColor, Dirty) \ - HANDLE_UIC_RENDER_COLOR_PROPERTY(Light, AmbientColor, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, Brightness, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, LinearFade, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, ExponentialFade, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, AreaWidth, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, AreaHeight, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, CastShadow, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, ShadowBias, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, ShadowFactor, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, ShadowMapFar, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, ShadowMapFov, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Light, ShadowFilter, Dirty) - -#define ITERATE_UIC_RENDER_MODEL_PROPERTIES \ - HANDLE_UIC_RENDER_SOURCEPATH_PROPERTY(Model, MeshPath, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Model, TessellationMode, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Model, EdgeTess, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Model, InnerTess, Dirty) - -#define ITERATE_UIC_RENDER_CUSTOM_MATERIAL_PROPERTIES \ - HANDLE_UIC_RENDER_PROPERTY(MaterialBase, IblProbe, Dirty) - -#define ITERATE_UIC_RENDER_LIGHTMAP_PROPERTIES \ - HANDLE_UIC_RENDER_PROPERTY(Lightmaps, LightmapIndirect, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Lightmaps, LightmapRadiosity, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Lightmaps, LightmapShadow, Dirty) - -#define ITERATE_UIC_RENDER_MATERIAL_PROPERTIES \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Material, Lighting, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Material, BlendMode, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(MaterialBase, IblProbe, Dirty) \ - HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY(Material, DiffuseColor, Dirty) \ - HANDLE_UIC_RENDER_COLOR_PROPERTY(Material, DiffuseColor, Dirty) \ - HANDLE_UIC_RENDER_ARRAY_PROPERTY(Material, DiffuseMaps, 0, Dirty) \ - HANDLE_UIC_RENDER_ARRAY_PROPERTY(Material, DiffuseMaps, 1, Dirty) \ - HANDLE_UIC_RENDER_ARRAY_PROPERTY(Material, DiffuseMaps, 2, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, EmissivePower, Dirty) \ - HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY(Material, EmissiveColor, Dirty) \ - HANDLE_UIC_RENDER_COLOR_PROPERTY(Material, EmissiveColor, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, EmissiveMap, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, EmissiveMap2, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, SpecularReflection, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, SpecularMap, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Material, SpecularModel, Dirty) \ - HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY(Material, SpecularTint, Dirty) \ - HANDLE_UIC_RENDER_COLOR_PROPERTY(Material, SpecularTint, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, FresnelPower, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, IOR, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, SpecularAmount, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, SpecularRoughness, Dirty) \ - HANDLE_UIC_RENDER_OPACITY_PROPERTY(Material, Opacity, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, OpacityMap, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, BumpMap, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, BumpAmount, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, NormalMap, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, DisplacementMap, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, DisplaceAmount, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, TranslucencyMap, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, TranslucentFalloff, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Material, DiffuseLightWrap, Dirty) - -#define ITERATE_UIC_RENDER_REFERENCED_MATERIAL_PROPERTIES \ - HANDLE_UIC_RENDER_PROPERTY(Material, ReferencedMaterial, Dirty) - -#define ITERATE_UIC_RENDER_IMAGE_PROPERTIES \ - HANDLE_UIC_RENDER_SOURCEPATH_PROPERTY(Image, ImagePath, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Image, OffscreenRendererId, Dirty) \ - HANDLE_UIC_RENDER_VEC2_PROPERTY(Image, Scale, TransformDirty) \ - HANDLE_UIC_RENDER_VEC2_PROPERTY(Image, Pivot, TransformDirty) \ - HANDLE_UIC_RENDER_RADIAN_PROPERTY(Image, Rotation, TransformDirty) \ - HANDLE_UIC_RENDER_VEC2_PROPERTY(Image, Position, TransformDirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Image, MappingMode, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Image, HorizontalTilingMode, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Image, VerticalTilingMode, Dirty) - -#define ITERATE_UIC_RENDER_TEXT_PROPERTIES \ - HANDLE_UIC_RENDER_PROPERTY(Text, Text, TextDirty) \ - HANDLE_UIC_RENDER_PROPERTY(Text, Font, TextDirty) \ - HANDLE_UIC_RENDER_PROPERTY(Text, FontSize, TextDirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Text, HorizontalAlignment, TextDirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Text, VerticalAlignment, TextDirty) \ - HANDLE_UIC_RENDER_PROPERTY(Text, Leading, TextDirty) \ - HANDLE_UIC_RENDER_PROPERTY(Text, Tracking, TextDirty) \ - HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY(Text, TextColor, Dirty) \ - HANDLE_UIC_RENDER_COLOR_PROPERTY(Text, TextColor, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Text, EnableAcceleratedFont, Dirty) - -#define ITERATE_UIC_RENDER_PATH_PROPERTIES \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Path, PathType, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, Width, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, LinearError, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, EdgeTessAmount, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, InnerTessAmount, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Path, BeginCapping, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, BeginCapOffset, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, BeginCapOpacity, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, BeginCapWidth, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Path, EndCapping, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, EndCapOffset, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, EndCapOpacity, Dirty) \ - HANDLE_UIC_RENDER_PROPERTY(Path, EndCapWidth, Dirty) \ - HANDLE_UIC_RENDER_ENUM_PROPERTY(Path, PaintStyle, Dirty) \ - HANDLE_UIC_RENDER_SOURCEPATH_PROPERTY(Path, PathBuffer, Dirty) - -#define ITERATE_UIC_RENDER_PATH_SUBPATH_PROPERTIES \ - HANDLE_UIC_RENDER_PROPERTY(SubPath, Closed, Dirty) + +#define ITERATE_QT3DS_RENDER_SCENE_PROPERTIES \ + HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Scene, ClearColor, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Scene, UseClearColor, Dirty) + +#define ITERATE_QT3DS_RENDER_NODE_PROPERTIES \ + HANDLE_QT3DS_RENDER_TRANSFORM_VEC3_PROPERTY(Node, Rotation, TransformDirty) \ + HANDLE_QT3DS_RENDER_VEC3_RADIAN_PROPERTY(Node, Rotation, TransformDirty) \ + HANDLE_QT3DS_RENDER_TRANSFORM_VEC3_PROPERTY(Node, Position, TransformDirty) \ + HANDLE_QT3DS_RENDER_VEC3_PROPERTY(Node, Position, TransformDirty) \ + HANDLE_QT3DS_RENDER_TRANSFORM_VEC3_PROPERTY(Node, Scale, TransformDirty) \ + HANDLE_QT3DS_RENDER_VEC3_PROPERTY(Node, Scale, TransformDirty) \ + HANDLE_QT3DS_RENDER_TRANSFORM_VEC3_PROPERTY(Node, Pivot, TransformDirty) \ + HANDLE_QT3DS_RENDER_VEC3_PROPERTY(Node, Pivot, TransformDirty) \ + HANDLE_QT3DS_RENDER_OPACITY_PROPERTY(Node, LocalOpacity, TransformDirty) \ + HANDLE_QT3DS_ROTATION_ORDER_PROPERTY(Node, RotationOrder, TransformDirty) \ + HANDLE_QT3DS_NODE_ORIENTATION_PROPERTY(Node, LeftHanded, TransformDirty) + +#define ITERATE_QT3DS_RENDER_LAYER_PROPERTIES \ + HANDLE_QT3DS_NODE_FLAGS_INVERSE_PROPERTY(Layer, LayerEnableDepthTest, Dirty) \ + HANDLE_QT3DS_NODE_FLAGS_INVERSE_PROPERTY(Layer, LayerEnableDepthPrePass, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, ProgressiveAAMode, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, MultisampleAAMode, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, TemporalAAEnabled, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Layer, ClearColor, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, BlendType, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, Background, Dirty) \ + HANDLE_QT3DS_RENDER_SOURCEPATH_PROPERTY(Layer, TexturePath, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, HorizontalFieldValues, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, Left, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, LeftUnits, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, Width, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, WidthUnits, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, Right, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, RightUnits, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, VerticalFieldValues, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, Top, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, TopUnits, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, Height, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, HeightUnits, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, Bottom, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Layer, BottomUnits, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, AoStrength, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, AoDistance, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, AoSoftness, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, AoBias, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, AoDither, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, ShadowStrength, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, ShadowDist, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, ShadowSoftness, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, ShadowBias, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, LightProbe, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, ProbeBright, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, FastIbl, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, ProbeHorizon, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, ProbeFov, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, LightProbe2, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, Probe2Fade, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, Probe2Window, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Layer, Probe2Pos, Dirty) + +#define ITERATE_QT3DS_RENDER_CAMERA_PROPERTIES \ + HANDLE_QT3DS_RENDER_PROPERTY(Camera, ClipNear, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Camera, ClipFar, Dirty) \ + HANDLE_QT3DS_RENDER_RADIAN_PROPERTY(Camera, FOV, Dirty) \ + HANDLE_QT3DS_NODE_FLAGS_PROPERTY(Camera, Orthographic, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Camera, ScaleMode, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Camera, ScaleAnchor, Dirty) + +#define ITERATE_QT3DS_RENDER_LIGHT_PROPERTIES \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Light, LightType, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, Scope, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(Light, DiffuseColor, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Light, DiffuseColor, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(Light, SpecularColor, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Light, SpecularColor, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(Light, AmbientColor, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Light, AmbientColor, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, Brightness, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, LinearFade, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, ExponentialFade, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, AreaWidth, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, AreaHeight, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, CastShadow, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, ShadowBias, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, ShadowFactor, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, ShadowMapFar, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, ShadowMapFov, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Light, ShadowFilter, Dirty) + +#define ITERATE_QT3DS_RENDER_MODEL_PROPERTIES \ + HANDLE_QT3DS_RENDER_SOURCEPATH_PROPERTY(Model, MeshPath, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Model, TessellationMode, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Model, EdgeTess, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Model, InnerTess, Dirty) + +#define ITERATE_QT3DS_RENDER_CUSTOM_MATERIAL_PROPERTIES \ + HANDLE_QT3DS_RENDER_PROPERTY(MaterialBase, IblProbe, Dirty) + +#define ITERATE_QT3DS_RENDER_LIGHTMAP_PROPERTIES \ + HANDLE_QT3DS_RENDER_PROPERTY(Lightmaps, LightmapIndirect, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Lightmaps, LightmapRadiosity, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Lightmaps, LightmapShadow, Dirty) + +#define ITERATE_QT3DS_RENDER_MATERIAL_PROPERTIES \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Material, Lighting, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Material, BlendMode, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(MaterialBase, IblProbe, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(Material, DiffuseColor, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Material, DiffuseColor, Dirty) \ + HANDLE_QT3DS_RENDER_ARRAY_PROPERTY(Material, DiffuseMaps, 0, Dirty) \ + HANDLE_QT3DS_RENDER_ARRAY_PROPERTY(Material, DiffuseMaps, 1, Dirty) \ + HANDLE_QT3DS_RENDER_ARRAY_PROPERTY(Material, DiffuseMaps, 2, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, EmissivePower, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(Material, EmissiveColor, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Material, EmissiveColor, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, EmissiveMap, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, EmissiveMap2, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, SpecularReflection, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, SpecularMap, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Material, SpecularModel, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(Material, SpecularTint, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Material, SpecularTint, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, FresnelPower, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, IOR, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, SpecularAmount, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, SpecularRoughness, Dirty) \ + HANDLE_QT3DS_RENDER_OPACITY_PROPERTY(Material, Opacity, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, OpacityMap, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, BumpMap, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, BumpAmount, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, NormalMap, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, DisplacementMap, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, DisplaceAmount, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, TranslucencyMap, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, TranslucentFalloff, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, DiffuseLightWrap, Dirty) + +#define ITERATE_QT3DS_RENDER_REFERENCED_MATERIAL_PROPERTIES \ + HANDLE_QT3DS_RENDER_PROPERTY(Material, ReferencedMaterial, Dirty) + +#define ITERATE_QT3DS_RENDER_IMAGE_PROPERTIES \ + HANDLE_QT3DS_RENDER_SOURCEPATH_PROPERTY(Image, ImagePath, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Image, OffscreenRendererId, Dirty) \ + HANDLE_QT3DS_RENDER_VEC2_PROPERTY(Image, Scale, TransformDirty) \ + HANDLE_QT3DS_RENDER_VEC2_PROPERTY(Image, Pivot, TransformDirty) \ + HANDLE_QT3DS_RENDER_RADIAN_PROPERTY(Image, Rotation, TransformDirty) \ + HANDLE_QT3DS_RENDER_VEC2_PROPERTY(Image, Position, TransformDirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Image, MappingMode, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Image, HorizontalTilingMode, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Image, VerticalTilingMode, Dirty) + +#define ITERATE_QT3DS_RENDER_TEXT_PROPERTIES \ + HANDLE_QT3DS_RENDER_PROPERTY(Text, Text, TextDirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Text, Font, TextDirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Text, FontSize, TextDirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Text, HorizontalAlignment, TextDirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Text, VerticalAlignment, TextDirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Text, Leading, TextDirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Text, Tracking, TextDirty) \ + HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(Text, TextColor, Dirty) \ + HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Text, TextColor, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Text, EnableAcceleratedFont, Dirty) + +#define ITERATE_QT3DS_RENDER_PATH_PROPERTIES \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Path, PathType, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, Width, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, LinearError, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, EdgeTessAmount, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, InnerTessAmount, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Path, BeginCapping, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, BeginCapOffset, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, BeginCapOpacity, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, BeginCapWidth, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Path, EndCapping, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, EndCapOffset, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, EndCapOpacity, Dirty) \ + HANDLE_QT3DS_RENDER_PROPERTY(Path, EndCapWidth, Dirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Path, PaintStyle, Dirty) \ + HANDLE_QT3DS_RENDER_SOURCEPATH_PROPERTY(Path, PathBuffer, Dirty) + +#define ITERATE_QT3DS_RENDER_PATH_SUBPATH_PROPERTIES \ + HANDLE_QT3DS_RENDER_PROPERTY(SubPath, Closed, Dirty) + } } #endif diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h index e3344ba8..28cb3322 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_WIDGETS_H -#define UIC_RENDER_WIDGETS_H +#ifndef QT3DS_RENDER_WIDGETS_H +#define QT3DS_RENDER_WIDGETS_H #include "Qt3DSRender.h" #include "foundation/Qt3DSOption.h" #include "foundation/Qt3DSMat44.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWindowDimensions.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWindowDimensions.h index 1d7beb2a..179e351f 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWindowDimensions.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWindowDimensions.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_WINDOW_DIMENSIONS_H -#define UIC_RENDER_WINDOW_DIMENSIONS_H +#ifndef QT3DS_RENDER_WINDOW_DIMENSIONS_H +#define QT3DS_RENDER_WINDOW_DIMENSIONS_H #include "Qt3DSRender.h" #include "foundation/Qt3DSSimpleTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h index bf897699..f3485eb9 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDERABLE_IMAGE_H -#define UIC_RENDERABLE_IMAGE_H +#ifndef QT3DS_RENDERABLE_IMAGE_H +#define QT3DS_RENDERABLE_IMAGE_H #include "Qt3DSRender.h" namespace qt3ds { diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h index 4a8a42f3..f8a524be 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDERER_H -#define UIC_RENDERER_H +#ifndef QT3DS_RENDERER_H +#define QT3DS_RENDERER_H #include "Qt3DSRender.h" #include "foundation/Qt3DSDataRef.h" #include "foundation/Qt3DSFlags.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h index 1810d7ac..96f36426 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDERER_UTIL_H -#define UIC_RENDERER_UTIL_H +#ifndef QT3DS_RENDERER_UTIL_H +#define QT3DS_RENDERER_UTIL_H #include "Qt3DSRender.h" #include "render/Qt3DSRenderBaseTypes.h" namespace qt3ds { diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h index a2710cac..756c3a90 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_TEXT_RENDERER_H -#define UIC_TEXT_RENDERER_H +#ifndef QT3DS_TEXT_RENDERER_H +#define QT3DS_TEXT_RENDERER_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "render/Qt3DSRenderBaseTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h index c8f0dbc8..09b028bc 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_WINDOWS_DYNAMIC_LIB_LOADER_H -#define UIC_WINDOWS_DYNAMIC_LIB_LOADER_H +#ifndef QT3DS_WINDOWS_DYNAMIC_LIB_LOADER_H +#define QT3DS_WINDOWS_DYNAMIC_LIB_LOADER_H #include "foundation/Qt3DSFoundation.h" #include "foundation/Qt3DSBroadcastingAllocator.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h index 52b06614..527e030f 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_IMPL_RENDERABLE_OBJECTS_H -#define UIC_RENDER_IMPL_RENDERABLE_OBJECTS_H +#ifndef QT3DS_RENDER_IMPL_RENDERABLE_OBJECTS_H +#define QT3DS_RENDER_IMPL_RENDERABLE_OBJECTS_H #include "Qt3DSRender.h" #include "foundation/Qt3DSFlags.h" #include "Qt3DSRenderModel.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp index d1e141e9..33d40f88 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp @@ -65,14 +65,14 @@ // Quick tests you can run to find performance problems -//#define UIC_RENDER_DISABLE_HARDWARE_BLENDING 1 -//#define UIC_RENDER_DISABLE_LIGHTING 1 -//#define UIC_RENDER_DISABLE_TEXTURING 1 -//#define UIC_RENDER_DISABLE_TRANSPARENCY 1 -//#define UIC_RENDER_DISABLE_FRUSTUM_CULLING 1 +//#define QT3DS_RENDER_DISABLE_HARDWARE_BLENDING 1 +//#define QT3DS_RENDER_DISABLE_LIGHTING 1 +//#define QT3DS_RENDER_DISABLE_TEXTURING 1 +//#define QT3DS_RENDER_DISABLE_TRANSPARENCY 1 +//#define QT3DS_RENDER_DISABLE_FRUSTUM_CULLING 1 // If you are fillrate bound then sorting opaque objects can help in some circumstances -//#define UIC_RENDER_DISABLE_OPAQUE_SORT 1 +//#define QT3DS_RENDER_DISABLE_OPAQUE_SORT 1 using qt3ds::foundation::CRegisteredString; diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h index 964f46ca..d05d940d 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_SHADER_GENERATOR_IMPL_H -#define UIC_RENDER_SHADER_GENERATOR_IMPL_H +#ifndef QT3DS_RENDER_SHADER_GENERATOR_IMPL_H +#define QT3DS_RENDER_SHADER_GENERATOR_IMPL_H #include "Qt3DSRender.h" #include "Qt3DSRenderer.h" #include "Qt3DSRenderableObjects.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp index c063a543..c0a78a09 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp @@ -63,7 +63,7 @@ #pragma warning(disable : 4355) #endif -#define UIC_CACHED_POST_EFFECT +#define QT3DS_CACHED_POST_EFFECT const float UIC3D_DEGREES_TO_RADIANS = 0.0174532925199f; namespace qt3ds { @@ -817,11 +817,11 @@ namespace render { SCustomMaterialRenderable &theObject = static_cast<SCustomMaterialRenderable &>(inObject); if (!inData.m_Layer.m_LightProbe && theObject.m_Material.m_IblProbe) - inData.SetShaderFeature("UIC_ENABLE_LIGHT_PROBE", + inData.SetShaderFeature("QT3DS_ENABLE_LIGHT_PROBE", theObject.m_Material.m_IblProbe->m_TextureData.m_Texture != NULL); else if (inData.m_Layer.m_LightProbe) - inData.SetShaderFeature("UIC_ENABLE_LIGHT_PROBE", + inData.SetShaderFeature("QT3DS_ENABLE_LIGHT_PROBE", inData.m_Layer.m_LightProbe->m_TextureData.m_Texture != NULL); @@ -1597,7 +1597,7 @@ namespace render { ++m_ProgressiveAAPassIndex; // now we render all post effects -#ifdef UIC_CACHED_POST_EFFECT +#ifdef QT3DS_CACHED_POST_EFFECT ApplyLayerPostEffects(); #endif @@ -1715,7 +1715,7 @@ namespace render { } else { // First, render the layer along with whatever progressive AA is appropriate. // The render graph should have taken care of the render to texture step. -#ifdef UIC_CACHED_POST_EFFECT +#ifdef QT3DS_CACHED_POST_EFFECT NVRenderTexture2D *theLayerColorTexture = (m_LayerCachedTexture) ? m_LayerCachedTexture : m_LayerTexture; #else @@ -1860,7 +1860,7 @@ namespace render { // Remember the camera we used so we can get a valid pick ray m_SceneCamera = theTempCamera; theContext.SetDepthTestEnabled(false); -#ifndef UIC_CACHED_POST_EFFECT +#ifndef QT3DS_CACHED_POST_EFFECT if (thePrepResult.m_LastEffect && m_Camera) { StartProfiling(thePrepResult.m_LastEffect->m_ClassName, false); // inUseLayerMPV is true then we are rendering directly to the scene and thus we diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h index 7c4cfcd2..0a69976d 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDERER_IMPL_LAYER_RENDER_DATA_H -#define UIC_RENDERER_IMPL_LAYER_RENDER_DATA_H +#ifndef QT3DS_RENDERER_IMPL_LAYER_RENDER_DATA_H +#define QT3DS_RENDERER_IMPL_LAYER_RENDER_DATA_H #include "Qt3DSRender.h" #include "Qt3DSRendererImplLayerRenderPreparationData.h" #include "Qt3DSRenderResourceBufferObjects.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp index b3177d42..cf835ab5 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp @@ -136,7 +136,7 @@ namespace render { , m_ModelContexts(inRenderer.GetContext().GetAllocator(), "SLayerRenderPreparationData::m_ModelContexts") , m_CGLightingFeatureName( - inRenderer.GetContext().GetStringTable().RegisterStr("UIC_ENABLE_CG_LIGHTING")) + inRenderer.GetContext().GetStringTable().RegisterStr("QT3DS_ENABLE_CG_LIGHTING")) , m_FeaturesDirty(true) , m_FeatureSetHash(0) , m_TooManyLightsError(false) @@ -313,7 +313,7 @@ namespace render { #define RENDER_FRAME_NEW(type) QT3DS_NEW(m_Renderer.GetPerFrameAllocator(), type) -#define UIC_RENDER_MINIMUM_RENDER_OPACITY .01f +#define QT3DS_RENDER_MINIMUM_RENDER_OPACITY .01f SShaderDefaultMaterialKey SLayerRenderPreparationData::GenerateLightingKey(DefaultMaterialLighting::Enum inLightingType) @@ -445,7 +445,7 @@ namespace render { inPath.CalculateMVPAndNormalMatrix(inViewProjection, theMVP, theNormalMatrix); NVBounds3 theBounds(this->m_Renderer.GetUICContext().GetPathManager().GetBounds(inPath)); - if (inPath.m_GlobalOpacity >= UIC_RENDER_MINIMUM_RENDER_OPACITY + if (inPath.m_GlobalOpacity >= QT3DS_RENDER_MINIMUM_RENDER_OPACITY && inClipFrustum.hasValue()) { // Check bounding box against the clipping planes NVBounds3 theGlobalBounds = theBounds; @@ -667,14 +667,14 @@ namespace render { if (!m_Renderer.DefaultMaterialShaderKeyProperties().m_HasIbl.GetValue(theGeneratedKey)) { bool lightProbeValid = HasValidLightProbe(theMaterial->m_IblProbe); - SetShaderFeature("UIC_ENABLE_LIGHT_PROBE", lightProbeValid); + SetShaderFeature("QT3DS_ENABLE_LIGHT_PROBE", lightProbeValid); m_Renderer.DefaultMaterialShaderKeyProperties().m_HasIbl.SetValue(theGeneratedKey, lightProbeValid); - // SetShaderFeature( "UIC_ENABLE_IBL_FOV", + // SetShaderFeature( "QT3DS_ENABLE_IBL_FOV", // m_Renderer.GetLayerRenderData()->m_Layer.m_ProbeFov < 180.0f ); } - if (subsetOpacity >= UIC_RENDER_MINIMUM_RENDER_OPACITY) { + if (subsetOpacity >= QT3DS_RENDER_MINIMUM_RENDER_OPACITY) { if (theMaterial->m_BlendMode != DefaultMaterialBlendMode::Normal || theMaterial->m_OpacityMap) { @@ -739,7 +739,7 @@ namespace render { } #undef CHECK_IMAGE_AND_PREPARE - if (subsetOpacity < UIC_RENDER_MINIMUM_RENDER_OPACITY) { + if (subsetOpacity < QT3DS_RENDER_MINIMUM_RENDER_OPACITY) { subsetOpacity = 0.0f; // You can still pick against completely transparent objects(or rather their bounding // box) @@ -772,7 +772,7 @@ namespace render { m_Renderer.DefaultMaterialShaderKeyProperties().m_WireframeMode.SetValue( theGeneratedKey, m_Renderer.GetUICContext().GetWireframeMode()); - if (subsetOpacity < UIC_RENDER_MINIMUM_RENDER_OPACITY) { + if (subsetOpacity < QT3DS_RENDER_MINIMUM_RENDER_OPACITY) { subsetOpacity = 0.0f; // You can still pick against completely transparent objects(or rather their bounding // box) @@ -840,7 +840,7 @@ namespace render { QT3DSVec3 theModelCenter(theSubset.m_Bounds.getCenter()); theModelCenter = inModel.m_GlobalTransform.transform(theModelCenter); - if (subsetOpacity >= UIC_RENDER_MINIMUM_RENDER_OPACITY + if (subsetOpacity >= QT3DS_RENDER_MINIMUM_RENDER_OPACITY && inClipFrustum.hasValue()) { // Check bounding box against the clipping planes NVBounds3 theGlobalBounds = theSubset.m_Bounds; @@ -1124,10 +1124,10 @@ namespace render { bool SSAOEnabled = (m_Layer.m_AoStrength > 0.0f && m_Layer.m_AoDistance > 0.0f); bool SSDOEnabled = (m_Layer.m_ShadowStrength > 0.0f && m_Layer.m_ShadowDist > 0.0f); - SetShaderFeature("UIC_ENABLE_SSAO", SSAOEnabled); - SetShaderFeature("UIC_ENABLE_SSDO", SSDOEnabled); + SetShaderFeature("QT3DS_ENABLE_SSAO", SSAOEnabled); + SetShaderFeature("QT3DS_ENABLE_SSDO", SSDOEnabled); bool requiresDepthPrepass = (hasOffscreenRenderer == false) && (SSAOEnabled || SSDOEnabled); - SetShaderFeature("UIC_ENABLE_SSM", false); // by default no shadow map generation + SetShaderFeature("QT3DS_ENABLE_SSM", false); // by default no shadow map generation if (m_Layer.m_Flags.IsActive()) { // Get the layer's width and height. @@ -1184,8 +1184,8 @@ namespace render { bool lightProbeValid = HasValidLightProbe(m_Layer.m_LightProbe); - SetShaderFeature("UIC_ENABLE_LIGHT_PROBE", lightProbeValid); - SetShaderFeature("UIC_ENABLE_IBL_FOV", m_Layer.m_ProbeFov < 180.0f); + SetShaderFeature("QT3DS_ENABLE_LIGHT_PROBE", lightProbeValid); + SetShaderFeature("QT3DS_ENABLE_IBL_FOV", m_Layer.m_ProbeFov < 180.0f); if (lightProbeValid && m_Layer.m_LightProbe2 && CheckLightProbeDirty(*m_Layer.m_LightProbe2)) { @@ -1193,7 +1193,7 @@ namespace render { wasDataDirty = true; } - SetShaderFeature("UIC_ENABLE_LIGHT_PROBE_2", + SetShaderFeature("QT3DS_ENABLE_LIGHT_PROBE_2", lightProbeValid && HasValidLightProbe(m_Layer.m_LightProbe2)); // Push nodes in reverse depth first order @@ -1266,7 +1266,7 @@ namespace render { NVRenderTextureFormats::R16, 1, mapMode, ShadowFilterValues::NONE); thePrepResult.m_Flags.SetRequiresShadowMapPass(true); - SetShaderFeature("UIC_ENABLE_SSM", true); + SetShaderFeature("QT3DS_ENABLE_SSM", true); } } TLightToNodeMap::iterator iter = diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h index 2f679c87..a18ec63f 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDERER_IMPL_LAYER_RENDER_PREPARATION_DATA_H -#define UIC_RENDERER_IMPL_LAYER_RENDER_PREPARATION_DATA_H +#ifndef QT3DS_RENDERER_IMPL_LAYER_RENDER_PREPARATION_DATA_H +#define QT3DS_RENDERER_IMPL_LAYER_RENDER_PREPARATION_DATA_H #include "Qt3DSRender.h" #include "foundation/Qt3DSFlags.h" #include "Qt3DSRendererImplLayerRenderHelper.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp index 7d45ea69..551f822c 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp @@ -40,7 +40,7 @@ // This adds support for the depth buffers in the shader so we can do depth // texture-based effects. -#define UIC_RENDER_SUPPORT_DEPTH_TEXTURE 1 +#define QT3DS_RENDER_SUPPORT_DEPTH_TEXTURE 1 namespace qt3ds { namespace render { diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h index 045a8751..1ac85dbf 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDERER_IMPL_SHADERS_H -#define UIC_RENDERER_IMPL_SHADERS_H +#ifndef QT3DS_RENDERER_IMPL_SHADERS_H +#define QT3DS_RENDERER_IMPL_SHADERS_H #include "Qt3DSRender.h" #include "render/Qt3DSRenderShaderProgram.h" #include "render/Qt3DSRenderProgramPipeline.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h index a63d3323..2e039d3e 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_VERTEX_PIPELINE_IMPL_H -#define UIC_VERTEX_PIPELINE_IMPL_H +#ifndef QT3DS_VERTEX_PIPELINE_IMPL_H +#define QT3DS_VERTEX_PIPELINE_IMPL_H #include "Qt3DSRenderDefaultMaterialShaderGenerator.h" namespace qt3ds { diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h index 0595dbf1..8d75e259 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_BUFFER_LOADED_H -#define UIC_RENDER_BUFFER_LOADED_H +#ifndef QT3DS_RENDER_BUFFER_LOADED_H +#define QT3DS_RENDER_BUFFER_LOADED_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp index 5047e7e9..5848d5ae 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp @@ -611,7 +611,7 @@ struct SBufferManager : public IBufferManager // format. Either way it isn't going to happen here and it isn't going to happen this way but this // is a working // example of using the technique. -#ifdef UIC_RENDER_GENERATE_SUB_SUBSETS +#ifdef QT3DS_RENDER_GENERATE_SUB_SUBSETS Option<qt3ds::render::NVRenderVertexBufferEntry> thePosAttrOpt = theVertexBuffer->GetEntryByName("attr_pos"); bool hasPosAttr = thePosAttrOpt.hasValue() diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h index 8ef4f638..cd9e3d33 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_BUFFER_MANAGER_H -#define UIC_RENDER_BUFFER_MANAGER_H +#ifndef QT3DS_RENDER_BUFFER_MANAGER_H +#define QT3DS_RENDER_BUFFER_MANAGER_H #include "Qt3DSRender.h" #include "EASTL/utility.h" //pair #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h index 9c2c8ab5..940dde00 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_THREADED_IMAGE_LOADER_H -#define UIC_RENDER_THREADED_IMAGE_LOADER_H +#ifndef QT3DS_RENDER_THREADED_IMAGE_LOADER_H +#define QT3DS_RENDER_THREADED_IMAGE_LOADER_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSDataRef.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h index 979e0873..6777577e 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_LOADED_TEXTURE_H -#define UIC_RENDER_LOADED_TEXTURE_H +#ifndef QT3DS_RENDER_LOADED_TEXTURE_H +#define QT3DS_RENDER_LOADED_TEXTURE_H #include "Qt3DSRender.h" #include "foundation/Qt3DSSimpleTypes.h" #include "render/Qt3DSRenderBaseTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp index 8000854e..279962da 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp @@ -575,7 +575,7 @@ namespace render { image->height = ddsh.dwHeight; image->numMipmaps = ddsh.dwFlags & DDS_MIPMAPCOUNT ? ddsh.dwMipMapCount : 1; - if (image->numMipmaps > UIC_DDS_MAX_MIPMAPS) { + if (image->numMipmaps > QT3DS_DDS_MAX_MIPMAPS) { throw "Too many mipmaps: max 16"; } diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h index 8eb00c68..61b56232 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h @@ -29,17 +29,17 @@ ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_LOAD_DDS_H -#define UIC_RENDER_LOAD_DDS_H +#ifndef QT3DS_RENDER_LOAD_DDS_H +#define QT3DS_RENDER_LOAD_DDS_H namespace qt3ds { namespace render { /** The maximum number of mipmap levels (per texture or per cubemap face) */ -#define UIC_DDS_MAX_MIPMAPS (16) +#define QT3DS_DDS_MAX_MIPMAPS (16) /** The number of cubemap faces that must exist in a cubemap-bearing DDS file */ -#define UIC_DDS_NUM_CUBEMAP_FACES (6) +#define QT3DS_DDS_NUM_CUBEMAP_FACES (6) /** The master DDS structure for loading and saving @@ -72,13 +72,13 @@ namespace render { /** Base of the allocated block of all texel data */ void *dataBlock; /** Pointers to the mipmap levels for the texture or each cubemap face */ - void *data[UIC_DDS_MAX_MIPMAPS * UIC_DDS_NUM_CUBEMAP_FACES]; + void *data[QT3DS_DDS_MAX_MIPMAPS * QT3DS_DDS_NUM_CUBEMAP_FACES]; /** Array of sizes of the mipmap levels for the texture or each cubemap face */ - int size[UIC_DDS_MAX_MIPMAPS * UIC_DDS_NUM_CUBEMAP_FACES]; + int size[QT3DS_DDS_MAX_MIPMAPS * QT3DS_DDS_NUM_CUBEMAP_FACES]; /** Array of widths of the mipmap levels for the texture or each cubemap face */ - int mipwidth[UIC_DDS_MAX_MIPMAPS * UIC_DDS_NUM_CUBEMAP_FACES]; + int mipwidth[QT3DS_DDS_MAX_MIPMAPS * QT3DS_DDS_NUM_CUBEMAP_FACES]; /** Array of heights of the mipmap levels for the texture or each cubemap face */ - int mipheight[UIC_DDS_MAX_MIPMAPS * UIC_DDS_NUM_CUBEMAP_FACES]; + int mipheight[QT3DS_DDS_MAX_MIPMAPS * QT3DS_DDS_NUM_CUBEMAP_FACES]; }; } } diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h index c5a740b4..13f317bd 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_LOADED_TEXTURE_FREEIMAGE_COMPAT_H -#define UIC_RENDER_LOADED_TEXTURE_FREEIMAGE_COMPAT_H +#ifndef QT3DS_RENDER_LOADED_TEXTURE_FREEIMAGE_COMPAT_H +#define QT3DS_RENDER_LOADED_TEXTURE_FREEIMAGE_COMPAT_H #include "foundation/IOStreams.h" #include "foundation/Qt3DSFoundation.h" #include "foundation/Qt3DSBroadcastingAllocator.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h index 296a13d4..fc72e2fd 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_PREFILTER_TEXTURE_H -#define UIC_RENDER_PREFILTER_TEXTURE_H +#ifndef QT3DS_RENDER_PREFILTER_TEXTURE_H +#define QT3DS_RENDER_PREFILTER_TEXTURE_H #include "foundation/Qt3DSAtomic.h" #include "render/Qt3DSRenderTexture2D.h" #include "Qt3DSRender.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h index cf76763b..fb54c4dc 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_RESOURCE_BUFFER_OBJECTS_H -#define UIC_RENDER_RESOURCE_BUFFER_OBJECTS_H +#ifndef QT3DS_RENDER_RESOURCE_BUFFER_OBJECTS_H +#define QT3DS_RENDER_RESOURCE_BUFFER_OBJECTS_H #include "Qt3DSRender.h" #include "render/Qt3DSRenderContext.h" #include "Qt3DSRenderResourceManager.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h index 8df635c4..675d644c 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_RESOURCE_MANAGER_H -#define UIC_RENDER_RESOURCE_MANAGER_H +#ifndef QT3DS_RENDER_RESOURCE_MANAGER_H +#define QT3DS_RENDER_RESOURCE_MANAGER_H #include "Qt3DSRender.h" #include "foundation/Qt3DSRefCounted.h" #include "render/Qt3DSRenderBaseTypes.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h index 816dbe1b..eb54713a 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_RENDER_RESOURCE_TEXTURE_2D_H -#define UIC_RENDER_RESOURCE_TEXTURE_2D_H +#ifndef QT3DS_RENDER_RESOURCE_TEXTURE_2D_H +#define QT3DS_RENDER_RESOURCE_TEXTURE_2D_H #include "Qt3DSRender.h" #include "render/Qt3DSRenderContext.h" #include "render/Qt3DSRenderTexture2D.h" diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp index 64c01565..88a4edb0 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#define UIC_RENDER_ONSCREEN_TEXT -#ifdef UIC_RENDER_ONSCREEN_TEXT +#define QT3DS_RENDER_ONSCREEN_TEXT +#ifdef QT3DS_RENDER_ONSCREEN_TEXT #include "Qt3DSTextRenderer.h" #include "Qt3DSRenderTextureAtlas.h" @@ -418,4 +418,4 @@ ITextRendererCore &ITextRendererCore::CreateOnscreenTextRenderer(NVFoundationBas return *QT3DS_NEW(inFnd.getAllocator(), UICOnscreenTextRenderer)(inFnd); } -#endif // UIC_RENDER_ONSCREEN_TEXT +#endif // QT3DS_RENDER_ONSCREEN_TEXT diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp index 97d7fc7b..4569407a 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp @@ -422,12 +422,12 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator if (!pCB) { // create with size of all structures + int for light count - SLightSourceShader s[UIC_MAX_NUM_LIGHTS]; - NVDataRef<QT3DSU8> cBuffer((QT3DSU8 *)&s, (sizeof(SLightSourceShader) * UIC_MAX_NUM_LIGHTS) + SLightSourceShader s[QT3DS_MAX_NUM_LIGHTS]; + NVDataRef<QT3DSU8> cBuffer((QT3DSU8 *)&s, (sizeof(SLightSourceShader) * QT3DS_MAX_NUM_LIGHTS) + (4 * sizeof(QT3DSI32))); pCB = theContext.CreateConstantBuffer( name, qt3ds::render::NVRenderBufferUsageType::Static, - (sizeof(SLightSourceShader) * UIC_MAX_NUM_LIGHTS) + (4 * sizeof(QT3DSI32)), cBuffer); + (sizeof(SLightSourceShader) * QT3DS_MAX_NUM_LIGHTS) + (4 * sizeof(QT3DSI32)), cBuffer); if (!pCB) { QT3DS_ASSERT(false); return NULL; @@ -523,7 +523,7 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator { if (inShadow) { eastl::string shadowName; - if (inShadow->m_DepthCube && (numShadowCubes < UIC_MAX_NUM_SHADOWS)) { + if (inShadow->m_DepthCube && (numShadowCubes < QT3DS_MAX_NUM_SHADOWS)) { shadowName = "shadowCubes"; char buf[16]; _snprintf(buf, 16, "[%d]", numShadowCubes); @@ -535,7 +535,7 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator m_ShadowCubeEntries.push_back(eastl::make_pair(numShadowCubes, theNewEntry)); ++numShadowCubes; - } else if (inShadow->m_DepthMap && (numShadowMaps < UIC_MAX_NUM_SHADOWS)) { + } else if (inShadow->m_DepthMap && (numShadowMaps < QT3DS_MAX_NUM_SHADOWS)) { shadowName = "shadowMaps"; char buf[16]; _snprintf(buf, 16, "[%d]", numShadowMaps); @@ -961,7 +961,7 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator else fragmentShader << "#define MATERIAL_IS_NON_DIELECTRIC 0\n\n"; - fragmentShader << "#define UIC_ENABLE_RNM 0\n\n"; + fragmentShader << "#define QT3DS_ENABLE_RNM 0\n\n"; fragmentShader << fragSource << Endl; diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp index c2d29610..15e25052 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp @@ -942,12 +942,12 @@ struct SShaderGenerator : public IDefaultMaterialShaderGenerator if (!pCB) { // create - SLightSourceShader s[UIC_MAX_NUM_LIGHTS]; - NVDataRef<QT3DSU8> cBuffer((QT3DSU8 *)&s, (sizeof(SLightSourceShader) * UIC_MAX_NUM_LIGHTS) + SLightSourceShader s[QT3DS_MAX_NUM_LIGHTS]; + NVDataRef<QT3DSU8> cBuffer((QT3DSU8 *)&s, (sizeof(SLightSourceShader) * QT3DS_MAX_NUM_LIGHTS) + (4 * sizeof(QT3DSI32))); pCB = theContext.CreateConstantBuffer( theName, qt3ds::render::NVRenderBufferUsageType::Static, - (sizeof(SLightSourceShader) * UIC_MAX_NUM_LIGHTS) + (4 * sizeof(QT3DSI32)), cBuffer); + (sizeof(SLightSourceShader) * QT3DS_MAX_NUM_LIGHTS) + (4 * sizeof(QT3DSI32)), cBuffer); if (!pCB) { QT3DS_ASSERT(false); return NULL; @@ -1123,11 +1123,11 @@ struct SShaderGenerator : public IDefaultMaterialShaderGenerator for (QT3DSU32 idx = 0; idx < FeatureSet().size(); ++idx) { eastl::string name(FeatureSet()[idx].m_Name.c_str()); - if (name == "UIC_ENABLE_SSAO") + if (name == "QT3DS_ENABLE_SSAO") enableSSAO = FeatureSet()[idx].m_Enabled; - else if (name == "UIC_ENABLE_SSDO") + else if (name == "QT3DS_ENABLE_SSDO") enableSSDO = FeatureSet()[idx].m_Enabled; - else if (name == "UIC_ENABLE_SSM") + else if (name == "QT3DS_ENABLE_SSM") enableShadowMaps = FeatureSet()[idx].m_Enabled; } @@ -1723,13 +1723,13 @@ struct SShaderGenerator : public IDefaultMaterialShaderGenerator size_t numShaderLights = shader.m_Lights.size(); size_t numShadowLights = shader.m_ShadowMaps.size(); for (QT3DSU32 lightIdx = 0, shadowMapIdx = 0, lightEnd = inLights.size(); - lightIdx < lightEnd && lightIdx < UIC_MAX_NUM_LIGHTS; ++lightIdx) { + lightIdx < lightEnd && lightIdx < QT3DS_MAX_NUM_LIGHTS; ++lightIdx) { SLight *theLight(inLights[lightIdx]); if (lightIdx >= numShaderLights) { shader.m_Lights.push_back(SShaderLightProperties()); ++numShaderLights; } - if (shadowMapIdx >= numShadowLights && numShadowLights < UIC_MAX_NUM_SHADOWS) { + if (shadowMapIdx >= numShadowLights && numShadowLights < QT3DS_MAX_NUM_SHADOWS) { if (theLight->m_Scope == NULL && theLight->m_CastShadow) { // PKC TODO : Fix multiple shadow issues. // Need to know when the list of lights changes order, and clear shadow maps diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp index acc931b4..a656ce24 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp @@ -466,13 +466,13 @@ struct SDynamicObjClassImpl : public IDynamicObjectClass static void RemapCommand(SCommand &inCommand, TRemapperType &inRemapper) { switch (inCommand.m_Type) { -#define UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(type) \ +#define QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES(type) \ case CommandTypes::type: \ SCommandRemapping<S##type>::RemapCommandData(static_cast<S##type &>(inCommand), \ inRemapper); \ break; - UIC_RENDER_EFFECTS_ITERATE_COMMAND_TYPES -#undef UIC_RENDER_EFFECTS_HANDLE_COMMAND_TYPES + QT3DS_RENDER_EFFECTS_ITERATE_COMMAND_TYPES +#undef QT3DS_RENDER_EFFECTS_HANDLE_COMMAND_TYPES default: QT3DS_ASSERT(false); break; diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp index f1118341..c2d43e86 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp @@ -504,13 +504,13 @@ void WriteGraphObject(const SGraphObject &inObject, SSerializerWriteContext &out { SGraphObject *newObject = NULL; switch (inObject.m_Type) { -#define UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ +#define QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ case GraphObjectTypes::type: \ newObject = SGraphObjectSerializerImpl<S##type>::Write( \ static_cast<const S##type &>(inObject), outSavedBuffer); \ break; - UIC_RENDER_ITERATE_GRAPH_OBJECT_TYPES -#undef UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE + QT3DS_RENDER_ITERATE_GRAPH_OBJECT_TYPES +#undef QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE default: QT3DS_ASSERT(false); break; @@ -539,12 +539,12 @@ SGraphObject *ReadGraphObject(SSerializerReadContext &inContext) if (inContext.m_CurrentPtr + sizeof(SGraphObject) < inContext.m_EndPtr) { SGraphObject *theObject = reinterpret_cast<SGraphObject *>(inContext.m_CurrentPtr); switch (theObject->m_Type) { -#define UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ +#define QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ case GraphObjectTypes::type: \ SGraphObjectSerializerImpl<S##type>::Read(inContext); \ break; - UIC_RENDER_ITERATE_GRAPH_OBJECT_TYPES -#undef UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE + QT3DS_RENDER_ITERATE_GRAPH_OBJECT_TYPES +#undef QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE default: QT3DS_ASSERT(false); theObject = NULL; @@ -617,13 +617,13 @@ void SGraphObjectSerializer::Save(NVFoundationBase &inFoundation, QT3DSU8 *theDataPtr = outSavedData.begin() + theDataSectionStart + theIter->second; SGraphObject *theGraphObj = reinterpret_cast<SGraphObject *>(theDataPtr); switch (theGraphObj->m_Type) { -#define UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ +#define QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(type) \ case GraphObjectTypes::type: \ SGraphObjectSerializerImpl<S##type>::Remap(static_cast<S##type &>(*theGraphObj), \ theWriteContext); \ break; - UIC_RENDER_ITERATE_GRAPH_OBJECT_TYPES -#undef UIC_RENDER_HANDL_GRAPH_OBJECT_TYPE + QT3DS_RENDER_ITERATE_GRAPH_OBJECT_TYPES +#undef QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE default: QT3DS_ASSERT(false); break; diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp index c7c50142..e69ef2ac 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp @@ -78,7 +78,7 @@ void CImageScaler::Scale(EScaleMethod inScaleMethod, unsigned char *inOldBuffer, break; default: - // UIC_THROW( RENDER_E_ILLEGALPARAMETER ) + // QT3DS_THROW( RENDER_E_ILLEGALPARAMETER ) break; } } @@ -116,7 +116,7 @@ void CImageScaler::FastScale(EScaleMethod inScaleMethod, unsigned char *inOldBuf break; default: - // UIC_THROW( RENDER_E_ILLEGALPARAMETER ) + // QT3DS_THROW( RENDER_E_ILLEGALPARAMETER ) break; } } @@ -142,8 +142,8 @@ void CImageScaler::Crop(unsigned char *inOldBuffer, unsigned long inOldWidth, { long theMinWidth = NVMin(inOldWidth, inNewWidth); - // UIC_THROWFALSE( inNewWidth <= inOldWidth, RENDER_E_SCALERNOEXPAND ) - // UIC_THROWFALSE( inNewHeight <= inOldHeight, RENDER_E_SCALERNOEXPAND ) + // QT3DS_THROWFALSE( inNewWidth <= inOldWidth, RENDER_E_SCALERNOEXPAND ) + // QT3DS_THROWFALSE( inNewHeight <= inOldHeight, RENDER_E_SCALERNOEXPAND ) outNewBuffer = new unsigned char[inNewWidth * inNewHeight * inPlanes]; ::memset(outNewBuffer, 0, inNewWidth * inNewHeight * inPlanes); @@ -175,7 +175,7 @@ void CImageScaler::Bilinear(unsigned char *inOldBuffer, unsigned long inOldWidth unsigned long inNewWidth, unsigned long inNewHeight, unsigned long inPlanes) { - // UIC_THROWFALSE( inPlanes > 0, RENDER_E_SCALERBADTYPE ) + // QT3DS_THROWFALSE( inPlanes > 0, RENDER_E_SCALERBADTYPE ) outNewBuffer = new unsigned char[inNewWidth * inNewHeight * inPlanes]; CImageScaler::Resize(inOldBuffer, inOldWidth, inOldHeight, outNewBuffer, inNewWidth, @@ -328,7 +328,7 @@ void CImageScaler::FastPointSample(unsigned char *inOldBuffer, unsigned long inO } break; default: - // UIC_THROW( RENDER_E_ILLEGALPARAMETER ) + // QT3DS_THROW( RENDER_E_ILLEGALPARAMETER ) break; } } @@ -371,7 +371,7 @@ void CImageScaler::Resize(unsigned char *inOldBuffer, unsigned long inOldWidth, unsigned long inNewWidth, unsigned long inNewHeight, unsigned long inPlanes) { - // UIC_THROWFALSE( inPlanes == 4, RENDER_E_ILLEGALPARAMETER ); + // QT3DS_THROWFALSE( inPlanes == 4, RENDER_E_ILLEGALPARAMETER ); // only do the temporary allocation if necessary if (inOldWidth < inNewWidth || inOldHeight < inNewHeight) { @@ -380,7 +380,7 @@ void CImageScaler::Resize(unsigned char *inOldBuffer, unsigned long inOldWidth, return; } else { // The downsampling algorithms *do* assume four planes. - // UIC_THROWFALSE( inPlanes == 4, RENDER_E_ILLEGALPARAMETER ); + // QT3DS_THROWFALSE( inPlanes == 4, RENDER_E_ILLEGALPARAMETER ); if (inOldWidth > inNewWidth && inOldHeight > inNewHeight) { MemoryBuffer<> theBuffer(ForwardingAllocator(m_Allocator, "ImageScaler::TempBuffer")); theBuffer.reserve(inNewWidth * inOldHeight * 4); diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp index e393cbcf..7d3bbdc1 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp @@ -27,7 +27,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifdef UIC_RENDER_ENABLE_LOAD_UIP +#ifdef QT3DS_RENDER_ENABLE_LOAD_UIP #include "Qt3DSRenderUIPLoader.h" #include "Qt3DSRenderPresentation.h" @@ -809,58 +809,58 @@ struct SRenderUIPLoader : public IDOMReferenceResolver #define SubPath_Closed "closed" // Fill in implementations for the actual parse tables. -#define HANDLE_UIC_RENDER_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_PROPERTY(type, name, dirty) \ ParseProperty(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_RENDER_REAL_VEC2_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_REAL_VEC2_PROPERTY(type, name, dirty) \ ParseProperty(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_RENDER_VEC3_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_VEC3_PROPERTY(type, name, dirty) \ ParseProperty(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_RENDER_COLOR_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_COLOR_PROPERTY(type, name, dirty) \ ParseProperty(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_RENDER_RADIAN_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_RADIAN_PROPERTY(type, name, dirty) \ ParseRadianProperty(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_RENDER_VEC3_RADIAN_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_VEC3_RADIAN_PROPERTY(type, name, dirty) \ ParseRadianProperty(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_RENDER_OPACITY_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_OPACITY_PROPERTY(type, name, dirty) \ ParseOpacityProperty(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_ROTATION_ORDER_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_ROTATION_ORDER_PROPERTY(type, name, dirty) \ ParseRotationOrder(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_NODE_ORIENTATION_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_NODE_ORIENTATION_PROPERTY(type, name, dirty) \ ParseOrientation(inParser, type##_##name, inItem.m_Flags); -#define HANDLE_UIC_RENDER_DEPTH_TEST_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_DEPTH_TEST_PROPERTY(type, name, dirty) \ if (ParseProperty(inParser, type##_##name, inItem.m_##name)) \ inItem.m_##name = !inItem.m_##name; -#define HANDLE_UIC_NODE_FLAGS_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_NODE_FLAGS_PROPERTY(type, name, dirty) \ ParseNodeFlagsProperty(inParser, type##_##name, inItem.m_Flags, \ qt3ds::render::NodeFlagValues::name); -#define HANDLE_UIC_NODE_FLAGS_INVERSE_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_NODE_FLAGS_INVERSE_PROPERTY(type, name, dirty) \ ParseNodeFlagsInverseProperty(inParser, type##_##name, inItem.m_Flags, \ qt3ds::render::NodeFlagValues::name); -#define HANDLE_UIC_RENDER_ENUM_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_ENUM_PROPERTY(type, name, dirty) \ ParseEnumProperty(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_RENDER_SOURCEPATH_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_SOURCEPATH_PROPERTY(type, name, dirty) \ ParseAndResolveSourcePath(inParser, type##_##name, inItem.m_##name); -#define HANDLE_UIC_RENDER_ARRAY_PROPERTY(type, name, index, dirty) \ +#define HANDLE_QT3DS_RENDER_ARRAY_PROPERTY(type, name, index, dirty) \ ParseProperty(inParser, type##_##name##_##index, inItem.m_##name[index]); -#define HANDLE_UIC_RENDER_VEC2_PROPERTY(type, name, dirty) \ +#define HANDLE_QT3DS_RENDER_VEC2_PROPERTY(type, name, dirty) \ ParseProperty(inParser, type##_##name##_##X, inItem.m_##name.x); \ ParseProperty(inParser, type##_##name##_##Y, inItem.m_##name.y); -#define HANDLE_UIC_RENDER_COLOR_VEC3_PROPERTY( \ - type, name, dirty) // noop by intention already handled by HANDLE_UIC_RENDER_COLOR_PROPERTY -#define HANDLE_UIC_RENDER_TRANSFORM_VEC3_PROPERTY( \ - type, name, dirty) // noop by intention already handled by HANDLE_UIC_RENDER_VEC3_PROPERTY +#define HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY( \ + type, name, dirty) // noop by intention already handled by HANDLE_QT3DS_RENDER_COLOR_PROPERTY +#define HANDLE_QT3DS_RENDER_TRANSFORM_VEC3_PROPERTY( \ + type, name, dirty) // noop by intention already handled by HANDLE_QT3DS_RENDER_VEC3_PROPERTY // Call the correct parser functions. void ParseProperties(SScene &inItem, IPropertyParser &inParser) { - ITERATE_UIC_RENDER_SCENE_PROPERTIES + ITERATE_QT3DS_RENDER_SCENE_PROPERTIES } void ParseProperties(SNode &inItem, IPropertyParser &inParser) { bool eyeball; if (ParseProperty(inParser, "eyeball", eyeball)) inItem.m_Flags.SetActive(eyeball); - ITERATE_UIC_RENDER_NODE_PROPERTIES + ITERATE_QT3DS_RENDER_NODE_PROPERTIES ParseProperty(inParser, "boneid", inItem.m_SkeletonId); bool ignoreParent = false; if (ParseProperty(inParser, "ignoresparent", ignoreParent)) @@ -869,44 +869,44 @@ struct SRenderUIPLoader : public IDOMReferenceResolver void ParseProperties(SLayer &inItem, IPropertyParser &inParser) { ParseProperties(static_cast<SNode &>(inItem), inParser); - ITERATE_UIC_RENDER_LAYER_PROPERTIES + ITERATE_QT3DS_RENDER_LAYER_PROPERTIES ParseProperty(inParser, "aosamplerate", inItem.m_AoSamplerate); } void ParseProperties(SCamera &inItem, IPropertyParser &inParser) { ParseProperties(static_cast<SNode &>(inItem), inParser); - ITERATE_UIC_RENDER_CAMERA_PROPERTIES + ITERATE_QT3DS_RENDER_CAMERA_PROPERTIES } void ParseProperties(SLight &inItem, IPropertyParser &inParser) { ParseProperties(static_cast<SNode &>(inItem), inParser); - ITERATE_UIC_RENDER_LIGHT_PROPERTIES + ITERATE_QT3DS_RENDER_LIGHT_PROPERTIES ParseProperty(inParser, "shdwmapres", inItem.m_ShadowMapRes); } void ParseProperties(SModel &inItem, IPropertyParser &inParser) { ParseProperties(static_cast<SNode &>(inItem), inParser); - ITERATE_UIC_RENDER_MODEL_PROPERTIES + ITERATE_QT3DS_RENDER_MODEL_PROPERTIES ParseProperty(inParser, "poseroot", inItem.m_SkeletonRoot); } void ParseProperties(SText &inItem, IPropertyParser &inParser) { ParseProperties(static_cast<SNode &>(inItem), inParser); - ITERATE_UIC_RENDER_TEXT_PROPERTIES + ITERATE_QT3DS_RENDER_TEXT_PROPERTIES } void ParseProperties(SLightmaps &inItem, IPropertyParser &inParser) { - ITERATE_UIC_RENDER_LIGHTMAP_PROPERTIES + ITERATE_QT3DS_RENDER_LIGHTMAP_PROPERTIES } void ParseProperties(SDefaultMaterial &inItem, IPropertyParser &inParser) { - ITERATE_UIC_RENDER_MATERIAL_PROPERTIES + ITERATE_QT3DS_RENDER_MATERIAL_PROPERTIES ParseProperties(inItem.m_Lightmaps, inParser); } void ParseProperties(SReferencedMaterial &inItem, IPropertyParser &inParser) { - ITERATE_UIC_RENDER_REFERENCED_MATERIAL_PROPERTIES + ITERATE_QT3DS_RENDER_REFERENCED_MATERIAL_PROPERTIES // Propagate lightmaps if (inItem.m_ReferencedMaterial && inItem.m_ReferencedMaterial->m_Type == GraphObjectTypes::DefaultMaterial) @@ -920,7 +920,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver } void ParseProperties(SImage &inItem, IPropertyParser &inParser) { - ITERATE_UIC_RENDER_IMAGE_PROPERTIES + ITERATE_QT3DS_RENDER_IMAGE_PROPERTIES } template <typename TDataType> void SetDynamicObjectProperty(SDynamicObject &inEffect, @@ -942,7 +942,7 @@ struct SRenderUIPLoader : public IDOMReferenceResolver { ParseProperties(static_cast<SDynamicObject &>(inItem), inParser); ParseProperties(inItem.m_Lightmaps, inParser); - ITERATE_UIC_RENDER_CUSTOM_MATERIAL_PROPERTIES + ITERATE_QT3DS_RENDER_CUSTOM_MATERIAL_PROPERTIES } void ParseProperties(SDynamicObject &inDynamicObject, IPropertyParser &inParser) { @@ -1008,11 +1008,11 @@ struct SRenderUIPLoader : public IDOMReferenceResolver void ParseProperties(SPath &inItem, IPropertyParser &inParser) { ParseProperties(static_cast<SNode &>(inItem), inParser); - ITERATE_UIC_RENDER_PATH_PROPERTIES + ITERATE_QT3DS_RENDER_PATH_PROPERTIES } void ParseProperties(SPathSubPath &inItem, IPropertyParser &inParser) { - ITERATE_UIC_RENDER_PATH_SUBPATH_PROPERTIES + ITERATE_QT3DS_RENDER_PATH_SUBPATH_PROPERTIES } void AddPluginPropertyUpdate(eastl::vector<qt3ds::render::SRenderPropertyValueUpdate> &ioUpdates, @@ -1138,17 +1138,17 @@ struct SRenderUIPLoader : public IDOMReferenceResolver } } -#undef HANDLE_UIC_RENDER_PROPERTY -#undef HANDLE_UIC_RENDER_ENUM_PROPERTY -#undef HANDLE_UIC_RENDER_RADIAN_PROPERTY -#undef HANDLE_UIC_RENDER_SOURCEPATH_PROPERTY -#undef HANDLE_UIC_RENDER_ARRAY_PROPERTY -#undef HANDLE_UIC_NODE_FLAGS_PROPERTY -#undef HANDLE_UIC_ROTATION_ORDER_PROPERTY -#undef HANDLE_UIC_RENDER_OPACITY_PROPERTY -#undef HANDLE_UIC_NODE_ORIENTATION_PROPERTY -#undef HANDLE_UIC_RENDER_DEPTH_TEST_PROPERTY -#undef HANDLE_UIC_RENDER_VEC2_PROPERTY +#undef HANDLE_QT3DS_RENDER_PROPERTY +#undef HANDLE_QT3DS_RENDER_ENUM_PROPERTY +#undef HANDLE_QT3DS_RENDER_RADIAN_PROPERTY +#undef HANDLE_QT3DS_RENDER_SOURCEPATH_PROPERTY +#undef HANDLE_QT3DS_RENDER_ARRAY_PROPERTY +#undef HANDLE_QT3DS_NODE_FLAGS_PROPERTY +#undef HANDLE_QT3DS_ROTATION_ORDER_PROPERTY +#undef HANDLE_QT3DS_RENDER_OPACITY_PROPERTY +#undef HANDLE_QT3DS_NODE_ORIENTATION_PROPERTY +#undef HANDLE_QT3DS_RENDER_DEPTH_TEST_PROPERTY +#undef HANDLE_QT3DS_RENDER_VEC2_PROPERTY void ParseGraphPass1(SGraphObject *inParent) { diff --git a/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h b/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h index 50d02dd2..0f228d10 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_APPLICATION_H -#define UIC_STATE_APPLICATION_H +#ifndef QT3DS_STATE_APPLICATION_H +#define QT3DS_STATE_APPLICATION_H #include "EASTL/string.h" #include <QtCore/qvector.h> diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDatamodelCache.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDatamodelCache.cpp index 95ce6d88..984dcfe7 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDatamodelCache.cpp +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDatamodelCache.cpp @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_LUA_DATAMODLE_CACHE_H -#define UIC_LUA_DATAMODLE_CACHE_H +#ifndef QT3DS_LUA_DATAMODLE_CACHE_H +#define QT3DS_LUA_DATAMODLE_CACHE_H #include "Qt3DSLuaDebugger.h" #include "Qt3DSLuaDebuggerProtocol.h" #include "foundation/Qt3DSFoundation.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebugger.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebugger.h index 516d660a..01351944 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebugger.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebugger.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_LUA_DEBUGGER_H -#define UIC_LUA_DEBUGGER_H +#ifndef QT3DS_LUA_DEBUGGER_H +#define QT3DS_LUA_DEBUGGER_H #include "Qt3DSStateDebugger.h" #include "Qt3DSStateDebuggerValues.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerImpl.h index 1f6e00f6..fc3eeeeb 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerImpl.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerImpl.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_LUA_DEBUGGER_IMPL_H -#define UIC_LUA_DEBUGGER_IMPL_H +#ifndef QT3DS_LUA_DEBUGGER_IMPL_H +#define QT3DS_LUA_DEBUGGER_IMPL_H #include "Qt3DSLuaDebugger.h" #include "EASTL/hash_map.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerProtocol.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerProtocol.h index 647efde6..a2070173 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerProtocol.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerProtocol.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_LUA_DEBUGGER_PROTOCOL_H -#define UIC_LUA_DEBUGGER_PROTOCOL_H +#ifndef QT3DS_LUA_DEBUGGER_PROTOCOL_H +#define QT3DS_LUA_DEBUGGER_PROTOCOL_H #include "Qt3DSLuaDebugger.h" #include "foundation/Qt3DSTime.h" #include "foundation/Qt3DSMemoryBuffer.h" @@ -39,40 +39,40 @@ namespace state { namespace debugger { namespace lua { -#define UIC_LUA_DEBUGGER_ITERATE_PROTOCOL_MESSAGES \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(Initialization) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(SetBreakpoint) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RequestBreak) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RequestAllBreakpoints) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(AllBreakpoints) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(ClearBreakpoint) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(ClearAllBreakpoints) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(Continue) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(OnBreak) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(UpdateTable) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(UpdateFunction) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RequestStackTrace) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StackTrace) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StepInto) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StepOver) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StepOut) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(AddWatch) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RemoveWatch) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(WatchUpdated) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(ExecuteStatement) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StatementExecuted) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RequestPointerValue) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(UnknownPointerValue) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(EndPointerRequest) \ - UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(BeginCacheUpdate) +#define QT3DS_LUA_DEBUGGER_ITERATE_PROTOCOL_MESSAGES \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(Initialization) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(SetBreakpoint) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RequestBreak) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RequestAllBreakpoints) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(AllBreakpoints) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(ClearBreakpoint) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(ClearAllBreakpoints) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(Continue) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(OnBreak) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(UpdateTable) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(UpdateFunction) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RequestStackTrace) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StackTrace) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StepInto) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StepOver) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StepOut) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(AddWatch) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RemoveWatch) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(WatchUpdated) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(ExecuteStatement) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(StatementExecuted) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(RequestPointerValue) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(UnknownPointerValue) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(EndPointerRequest) \ + QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(BeginCacheUpdate) struct SProtocolMessageNames { enum Enum { UnknownMessageName = 0, -#define UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(name) name, - UIC_LUA_DEBUGGER_ITERATE_PROTOCOL_MESSAGES -#undef UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE +#define QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(name) name, + QT3DS_LUA_DEBUGGER_ITERATE_PROTOCOL_MESSAGES +#undef QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE }; }; @@ -199,7 +199,7 @@ namespace state { } }; -#define UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(msgName) \ +#define QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(msgName) \ struct S##msgName \ { \ S##msgName() {} \ @@ -216,7 +216,7 @@ namespace state { enum { MessageName = SProtocolMessageNames::msgName }; \ }; -#define UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(msgName, ptype, pname) \ +#define QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(msgName, ptype, pname) \ struct S##msgName \ { \ ptype m_##pname; \ @@ -238,35 +238,35 @@ namespace state { enum { MessageName = SProtocolMessageNames::msgName }; \ }; - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(Initialization, QT3DSU32, Version); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(SetBreakpoint, SLuaBreakpoint, Breakpoint); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(RequestAllBreakpoints); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(RequestBreak); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(AllBreakpoints, TBreakpointList, + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(Initialization, QT3DSU32, Version); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(SetBreakpoint, SLuaBreakpoint, Breakpoint); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(RequestAllBreakpoints); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(RequestBreak); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(AllBreakpoints, TBreakpointList, Breakpoints); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(ClearBreakpoint, SLuaBreakpoint, + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(ClearBreakpoint, SLuaBreakpoint, Breakpoint); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(ClearAllBreakpoints); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(Continue); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(OnBreak, SFileAndLine, Position); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(UpdateTable, STableData, Data); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(UpdateFunction, SFunctionInfo, Data); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(RequestStackTrace); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(StackTrace, SStackTraceData, Data); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(StepInto); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(StepOver); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(StepOut); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(AddWatch, CRegisteredString, Expression); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(RemoveWatch, CRegisteredString, Expression); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(WatchUpdated, SWatchUpdateData, Data); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(ExecuteStatement, CRegisteredString, + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(ClearAllBreakpoints); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(Continue); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(OnBreak, SFileAndLine, Position); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(UpdateTable, STableData, Data); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(UpdateFunction, SFunctionInfo, Data); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(RequestStackTrace); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(StackTrace, SStackTraceData, Data); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(StepInto); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(StepOver); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(StepOut); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(AddWatch, CRegisteredString, Expression); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(RemoveWatch, CRegisteredString, Expression); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(WatchUpdated, SWatchUpdateData, Data); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(ExecuteStatement, CRegisteredString, Expression); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(StatementExecuted, SStatementExecuteData, + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(StatementExecuted, SStatementExecuteData, Data); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(RequestPointerValue, SDatamodelValue, Data); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(UnknownPointerValue); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(EndPointerRequest); - UIC_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(BeginCacheUpdate); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_MESSAGE_1(RequestPointerValue, SDatamodelValue, Data); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(UnknownPointerValue); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(EndPointerRequest); + QT3DS_LUA_DEBUGGER_PROTOCOL_DECLARE_TRIVIAL_MESSAGE(BeginCacheUpdate); struct SLuaDebuggerProtocolWriter { diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaSideDebugger.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaSideDebugger.cpp index 961c8099..c5217dc1 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaSideDebugger.cpp +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaSideDebugger.cpp @@ -454,12 +454,12 @@ struct SLuaSideDebugger : public ILuaDebugger, public IDebugStreamListener m_DataCache->HandleCacheMessage(m_BrokenState, inReader, inMessage); } else { switch (inMessage.m_MessageName) { -#define UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(name) \ +#define QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(name) \ case SProtocolMessageNames::name: \ Handle##name(inReader); \ break; - UIC_LUA_DEBUGGER_ITERATE_PROTOCOL_MESSAGES -#undef UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE + QT3DS_LUA_DEBUGGER_ITERATE_PROTOCOL_MESSAGES +#undef QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE default: QT3DS_ASSERT(false); break; @@ -467,26 +467,26 @@ struct SLuaSideDebugger : public ILuaDebugger, public IDebugStreamListener } } -#define UIC_LUA_IGNORE_MESSAGE(name) \ +#define QT3DS_LUA_IGNORE_MESSAGE(name) \ void Handle##name(SLuaDebuggerProtocolReader &) { QT3DS_ASSERT(false); } - UIC_LUA_IGNORE_MESSAGE(Initialization) - UIC_LUA_IGNORE_MESSAGE(AllBreakpoints) - UIC_LUA_IGNORE_MESSAGE(Continue) - UIC_LUA_IGNORE_MESSAGE(OnBreak) - UIC_LUA_IGNORE_MESSAGE(OnClientConnect) - UIC_LUA_IGNORE_MESSAGE(UpdateTable) - UIC_LUA_IGNORE_MESSAGE(UpdateFunction) - UIC_LUA_IGNORE_MESSAGE(RequestStackTrace) - UIC_LUA_IGNORE_MESSAGE(StackTrace) - UIC_LUA_IGNORE_MESSAGE(StepInto) - UIC_LUA_IGNORE_MESSAGE(StepOver) - UIC_LUA_IGNORE_MESSAGE(StepOut) - UIC_LUA_IGNORE_MESSAGE(WatchUpdated) - UIC_LUA_IGNORE_MESSAGE(StatementExecuted) - UIC_LUA_IGNORE_MESSAGE(RequestPointerValue) - UIC_LUA_IGNORE_MESSAGE(UnknownPointerValue) - UIC_LUA_IGNORE_MESSAGE(EndPointerRequest) - UIC_LUA_IGNORE_MESSAGE(BeginCacheUpdate) + QT3DS_LUA_IGNORE_MESSAGE(Initialization) + QT3DS_LUA_IGNORE_MESSAGE(AllBreakpoints) + QT3DS_LUA_IGNORE_MESSAGE(Continue) + QT3DS_LUA_IGNORE_MESSAGE(OnBreak) + QT3DS_LUA_IGNORE_MESSAGE(OnClientConnect) + QT3DS_LUA_IGNORE_MESSAGE(UpdateTable) + QT3DS_LUA_IGNORE_MESSAGE(UpdateFunction) + QT3DS_LUA_IGNORE_MESSAGE(RequestStackTrace) + QT3DS_LUA_IGNORE_MESSAGE(StackTrace) + QT3DS_LUA_IGNORE_MESSAGE(StepInto) + QT3DS_LUA_IGNORE_MESSAGE(StepOver) + QT3DS_LUA_IGNORE_MESSAGE(StepOut) + QT3DS_LUA_IGNORE_MESSAGE(WatchUpdated) + QT3DS_LUA_IGNORE_MESSAGE(StatementExecuted) + QT3DS_LUA_IGNORE_MESSAGE(RequestPointerValue) + QT3DS_LUA_IGNORE_MESSAGE(UnknownPointerValue) + QT3DS_LUA_IGNORE_MESSAGE(EndPointerRequest) + QT3DS_LUA_IGNORE_MESSAGE(BeginCacheUpdate) void HandleRequestBreak(SLuaDebuggerProtocolReader &) { diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h index a8e8777a..70a3d363 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_SCENE_GRAPH_DEBUGGER_H -#define UIC_SCENE_GRAPH_DEBUGGER_H +#ifndef QT3DS_SCENE_GRAPH_DEBUGGER_H +#define QT3DS_SCENE_GRAPH_DEBUGGER_H #pragma once #include "Qt3DSStateDebugger.h" #include "UICUIADatamodel.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h index 29a01dd5..4fea4322 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_SCENE_GRAPH_DEBUGGER_PROTOCOL_H -#define UIC_SCENE_GRAPH_DEBUGGER_PROTOCOL_H +#ifndef QT3DS_SCENE_GRAPH_DEBUGGER_PROTOCOL_H +#define QT3DS_SCENE_GRAPH_DEBUGGER_PROTOCOL_H #include "Qt3DSSceneGraphDebugger.h" #include "Qt3DSSceneGraphDebuggerValue.h" #include "foundation/Qt3DSMemoryBuffer.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h index e3ce652f..b6404e72 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_SCENE_GRAPH_DEBUGGER_VALUE_H -#define UIC_SCENE_GRAPH_DEBUGGER_VALUE_H +#ifndef QT3DS_SCENE_GRAPH_DEBUGGER_VALUE_H +#define QT3DS_SCENE_GRAPH_DEBUGGER_VALUE_H #include "Qt3DSSceneGraphDebugger.h" #include "UICUIADatamodel.h" #include "UICUIADatamodelValue.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h index 7a1446cb..8cff699e 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_DEBUG_STREAMS_H -#define UIC_STATE_DEBUG_STREAMS_H +#ifndef QT3DS_STATE_DEBUG_STREAMS_H +#define QT3DS_STATE_DEBUG_STREAMS_H #pragma once #include "Qt3DSState.h" #include "foundation/Socket.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h index e87b38d9..801fb738 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_DEBUGGER_H -#define UIC_STATE_DEBUGGER_H +#ifndef QT3DS_STATE_DEBUGGER_H +#define QT3DS_STATE_DEBUGGER_H #pragma once #include "Qt3DSState.h" #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h index 37501723..03230a61 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_DEBUGGER_PROTOCOL_H -#define UIC_STATE_DEBUGGER_PROTOCOL_H +#ifndef QT3DS_STATE_DEBUGGER_PROTOCOL_H +#define QT3DS_STATE_DEBUGGER_PROTOCOL_H #include "Qt3DSStateDebugger.h" #include "Qt3DSStateDebuggerValues.h" #include "foundation/StringConversion.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h index b937fd35..340f46cb 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_DEBUGGER_VALUES_H -#define UIC_STATE_DEBUGGER_VALUES_H +#ifndef QT3DS_STATE_DEBUGGER_VALUES_H +#define QT3DS_STATE_DEBUGGER_VALUES_H #pragma once #include "Qt3DSStateDebugger.h" #include "foundation/Qt3DSDiscriminatedUnion.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h index 97039ab5..fa663e80 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_TEST_H -#define UIC_STATE_TEST_H +#ifndef QT3DS_STATE_TEST_H +#define QT3DS_STATE_TEST_H #include "Qt3DSState.h" #include "foundation/Qt3DSRefCounted.h" #include "foundation/Qt3DSOption.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTestCommon.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTestCommon.h index e3e12790..469cd553 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTestCommon.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTestCommon.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_TEST_COMMON_H -#define UIC_STATE_TEST_COMMON_H +#ifndef QT3DS_STATE_TEST_COMMON_H +#define QT3DS_STATE_TEST_COMMON_H #include "Qt3DSState.h" #include "foundation/Qt3DSFoundation.h" #include "foundation/Qt3DSBroadcastingAllocator.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICLuaArchitectDebugger.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICLuaArchitectDebugger.cpp index 502178da..a15dc6dc 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICLuaArchitectDebugger.cpp +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICLuaArchitectDebugger.cpp @@ -306,12 +306,12 @@ struct SDebugServer : public ILuaArchitectDebugServer, client->m_DataCache->HandleCacheMessage(inReader, inHeader); } else { switch (inHeader.m_MessageName) { -#define UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(msgname) \ +#define QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE(msgname) \ case SProtocolMessageNames::msgname: \ Handle##msgname(inHeader.m_ClientId, inReader.ReadMessage<lua::S##msgname>()); \ break; - UIC_LUA_DEBUGGER_ITERATE_PROTOCOL_MESSAGES; -#undef UIC_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE + QT3DS_LUA_DEBUGGER_ITERATE_PROTOCOL_MESSAGES; +#undef QT3DS_LUA_DEBUGGER_HANDLE_PROTOCOL_MESSAGE } } } diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditor.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditor.h index 0ade073e..31c83afe 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditor.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditor.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_EDITOR_H -#define UIC_STATE_EDITOR_H +#ifndef QT3DS_STATE_EDITOR_H +#define QT3DS_STATE_EDITOR_H #pragma once #include "Qt3DSState.h" #include "Qt3DSStateSignalConnection.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorEditorsImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorEditorsImpl.h index 01c5528e..4e2a304e 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorEditorsImpl.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorEditorsImpl.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_EDITOR_EDITORS_IMPL_H -#define UIC_STATE_EDITOR_EDITORS_IMPL_H +#ifndef QT3DS_STATE_EDITOR_EDITORS_IMPL_H +#define QT3DS_STATE_EDITOR_EDITORS_IMPL_H #include "UICState.h" #include "UICStateEditor.h" #include "UICStateEditorValue.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorFoundation.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorFoundation.h index cdeaf132..edb55ee3 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorFoundation.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorFoundation.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_EDITOR_FOUNDATION_H -#define UIC_STATE_EDITOR_FOUNDATION_H +#ifndef QT3DS_STATE_EDITOR_FOUNDATION_H +#define QT3DS_STATE_EDITOR_FOUNDATION_H #pragma once #include "Qt3DSState.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorImpl.h index e0e3d793..096b7e9d 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorImpl.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorImpl.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_EDITOR_IMPL_H -#define UIC_STATE_EDITOR_IMPL_H +#ifndef QT3DS_STATE_EDITOR_IMPL_H +#define QT3DS_STATE_EDITOR_IMPL_H #include "UICStateEditor.h" #include "UICStateEditorValue.h" #include "UICStateTypes.h" @@ -74,7 +74,7 @@ namespace state { typedef eastl::vector<TPropertyAccessorPtr> TPropertyAccessorList; typedef nvhash_map<int, TPropertyAccessorList> TAccessorMap; -#define UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(foundationPtr, refcountVar) \ +#define QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(foundationPtr, refcountVar) \ void addRef() { atomicIncrement(&(refcountVar)); } \ void release() \ { \ diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorProperties.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorProperties.h index 91ed5b04..5bf3626a 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorProperties.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorProperties.h @@ -80,7 +80,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -129,7 +129,7 @@ namespace state { m_LegalValues.push_back(inStrTable.RegisterStr(trueName)); } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -174,7 +174,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -222,7 +222,7 @@ namespace state { , m_Ptr(inPtr) { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual eastl::vector<CRegisteredString> GetLegalValues(IEditorObject & /*inObj*/) { @@ -249,7 +249,7 @@ namespace state { : TBaseType(inAlloc, inDec) { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -274,7 +274,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual eastl::vector<CRegisteredString> GetLegalValues(IEditorObject &inEditor) { @@ -331,7 +331,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -362,7 +362,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual void DoSet(TEditorType &inObj, const Option<SValue> &inValue) { @@ -395,7 +395,7 @@ namespace state { , m_Ptr(inPtr) { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -434,7 +434,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -461,7 +461,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -488,7 +488,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -515,7 +515,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual eastl::vector<CRegisteredString> GetLegalValues(IEditorObject &inEditor) { @@ -563,7 +563,7 @@ namespace state { { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); static const char *SCXMLParentName() { return "(none)"; } diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.cpp index 88794438..dc90a282 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.cpp +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.cpp @@ -143,7 +143,7 @@ namespace state { { m_Editor.RemoveChangeListener(m_ChangeListener); } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(m_Alloc, mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(m_Alloc, mRefCount); }; void STransactionManagerImpl::addRef() { atomicIncrement(&mRefCount); } diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.h index 3a672a85..1639dd3c 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_EDITOR_TRANSACTION_IMPL_H -#define UIC_STATE_EDITOR_TRANSACTION_IMPL_H +#ifndef QT3DS_STATE_EDITOR_TRANSACTION_IMPL_H +#define QT3DS_STATE_EDITOR_TRANSACTION_IMPL_H #include "UICStateEditor.h" #include "UICStateEditorFoundation.h" #include "UICStateEditorProperties.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransitionPath.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransitionPath.h index 24a4aa29..7ae9f31f 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransitionPath.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransitionPath.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_EDITOR_TRANSITION_PATH_H -#define UIC_STATE_EDITOR_TRANSITION_PATH_H +#ifndef QT3DS_STATE_EDITOR_TRANSITION_PATH_H +#define QT3DS_STATE_EDITOR_TRANSITION_PATH_H #pragma once #include "UICState.h" #include "foundation/Qt3DSVec2.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorValue.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorValue.h index 3149c093..2b637002 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorValue.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorValue.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_EDITOR_VALUE_H -#define UIC_STATE_EDITOR_VALUE_H +#ifndef QT3DS_STATE_EDITOR_VALUE_H +#define QT3DS_STATE_EDITOR_VALUE_H #pragma once #include "Qt3DSState.h" #include "UICStateEditor.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodel.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodel.cpp index 3f1d6fd9..4cda7b60 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodel.cpp +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodel.cpp @@ -464,7 +464,7 @@ struct SGenericPropertyStringAccessor : public SPropertyAccessorBase<TEditorType { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -500,7 +500,7 @@ struct SGenericPropertyStringFunctionAccessor : public SPropertyAccessorBase<TEd , m_Setter(inSetter) { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Allocator, this->mRefCount); virtual Option<SValue> DoGet(TEditorType &inObj) { @@ -596,7 +596,7 @@ struct SGotoSlideEditor : public SVSEditorObject { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); static const char8_t *ElementName() { return "goto-slide"; } @@ -658,7 +658,7 @@ struct SRunHandlerEditor : public SVSEditorObject : SVSEditorObject(editor, parent, ElementName(), ioList) { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); static const char8_t *ElementName() { return "call"; } }; @@ -694,7 +694,7 @@ struct SSetAttributeEditor : public SVSEditorObject : SVSEditorObject(editor, parent, ElementName(), ioList) { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); static const char8_t *ElementName() { return "set-attribute"; } }; @@ -723,7 +723,7 @@ struct SFireEventEditor : public SVSEditorObject : SVSEditorObject(editor, parent, ElementName(), ioList) { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); static const char8_t *ElementName() { return "fire-event"; } }; @@ -759,7 +759,7 @@ struct SSetPresentationEditor : public SVSEditorObject : SVSEditorObject(editor, parent, ElementName(), ioList) { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); static const char8_t *ElementName() { return "set-presentation"; } }; @@ -782,7 +782,7 @@ struct SPlaySoundEditor : public SVSEditorObject : SVSEditorObject(editor, parent, ElementName(), ioList) { } - UIC_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); + QT3DS_STATE_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(this->m_Foundation, this->mRefCount); static const char8_t *ElementName() { return "play-sound"; } }; diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodelValue.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodelValue.h index 5448da6e..32f5b792 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodelValue.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodelValue.h @@ -42,7 +42,7 @@ namespace app { { }; -#define UIC_UIA_DATAMODEL_TYPE_MAP(type, enumname) \ +#define QT3DS_UIA_DATAMODEL_TYPE_MAP(type, enumname) \ template <> \ struct SDatamodelValueTypeMap<type> \ { \ @@ -104,16 +104,16 @@ namespace app { } }; - UIC_UIA_DATAMODEL_TYPE_MAP(float, ERuntimeDataModelDataTypeFloat); - UIC_UIA_DATAMODEL_TYPE_MAP(QT3DSVec2, ERuntimeDataModelDataTypeFloat2); - UIC_UIA_DATAMODEL_TYPE_MAP(QT3DSVec3, ERuntimeDataModelDataTypeFloat3); - UIC_UIA_DATAMODEL_TYPE_MAP(QT3DSI32, ERuntimeDataModelDataTypeLong); - UIC_UIA_DATAMODEL_TYPE_MAP(eastl::string, ERuntimeDataModelDataTypeString); - UIC_UIA_DATAMODEL_TYPE_MAP(bool, ERuntimeDataModelDataTypeBool); - UIC_UIA_DATAMODEL_TYPE_MAP(SGuid, ERuntimeDataModelDataTypeLong4); - UIC_UIA_DATAMODEL_TYPE_MAP(CRegisteredString, ERuntimeDataModelDataTypeStringRef); - UIC_UIA_DATAMODEL_TYPE_MAP(SObjectRef, ERuntimeDataModelDataTypeObjectRef); - UIC_UIA_DATAMODEL_TYPE_MAP(CStringOrInt, ERuntimeDataModelDataTypeStringOrInt); + QT3DS_UIA_DATAMODEL_TYPE_MAP(float, ERuntimeDataModelDataTypeFloat); + QT3DS_UIA_DATAMODEL_TYPE_MAP(QT3DSVec2, ERuntimeDataModelDataTypeFloat2); + QT3DS_UIA_DATAMODEL_TYPE_MAP(QT3DSVec3, ERuntimeDataModelDataTypeFloat3); + QT3DS_UIA_DATAMODEL_TYPE_MAP(QT3DSI32, ERuntimeDataModelDataTypeLong); + QT3DS_UIA_DATAMODEL_TYPE_MAP(eastl::string, ERuntimeDataModelDataTypeString); + QT3DS_UIA_DATAMODEL_TYPE_MAP(bool, ERuntimeDataModelDataTypeBool); + QT3DS_UIA_DATAMODEL_TYPE_MAP(SGuid, ERuntimeDataModelDataTypeLong4); + QT3DS_UIA_DATAMODEL_TYPE_MAP(CRegisteredString, ERuntimeDataModelDataTypeStringRef); + QT3DS_UIA_DATAMODEL_TYPE_MAP(SObjectRef, ERuntimeDataModelDataTypeObjectRef); + QT3DS_UIA_DATAMODEL_TYPE_MAP(CStringOrInt, ERuntimeDataModelDataTypeStringOrInt); struct SDatamodelValueUnionTraits { diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSState.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSState.h index 5db768cc..b5686c25 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSState.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSState.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_STATE_H -#define UIC_STATE_H +#ifndef QT3DS_STATE_H +#define QT3DS_STATE_H namespace qt3ds { class NVAllocatorCallback; diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h index 8360f554..31098938 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_CONTEXT_H -#define UIC_STATE_CONTEXT_H +#ifndef QT3DS_STATE_CONTEXT_H +#define QT3DS_STATE_CONTEXT_H #include "Qt3DSState.h" #include "Qt3DSStateTypes.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h index 33f11dca..31ff0e22 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_EXECUTION_CONTEXT_H -#define UIC_STATE_EXECUTION_CONTEXT_H +#ifndef QT3DS_STATE_EXECUTION_CONTEXT_H +#define QT3DS_STATE_EXECUTION_CONTEXT_H #pragma once #include "Qt3DSState.h" #include "Qt3DSStateTypes.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h index 00c74ac2..6dc7674f 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_EXECUTION_TYPES_H -#define UIC_STATE_EXECUTION_TYPES_H +#ifndef QT3DS_STATE_EXECUTION_TYPES_H +#define QT3DS_STATE_EXECUTION_TYPES_H #pragma once #include "Qt3DSStateTypes.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h index d6936930..ed5beb13 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_STATE_ID_TYPE_VALUE_H -#define UIC_STATE_ID_TYPE_VALUE_H +#ifndef QT3DS_STATE_ID_TYPE_VALUE_H +#define QT3DS_STATE_ID_TYPE_VALUE_H #include "Qt3DSState.h" #include "foundation/Qt3DSDiscriminatedUnion.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h index 825f2b6f..d615d21f 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_INTERPRETER_H -#define UIC_STATE_INTERPRETER_H +#ifndef QT3DS_STATE_INTERPRETER_H +#define QT3DS_STATE_INTERPRETER_H #pragma once #include "Qt3DSState.h" #include "Qt3DSStateTypes.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateLuaScriptContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateLuaScriptContext.h index 130919bc..a134ce1a 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateLuaScriptContext.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateLuaScriptContext.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_LUA_SCRIPT_CONTEXT_H -#define UIC_STATE_LUA_SCRIPT_CONTEXT_H +#ifndef QT3DS_STATE_LUA_SCRIPT_CONTEXT_H +#define QT3DS_STATE_LUA_SCRIPT_CONTEXT_H #pragma once #include "Qt3DSState.h" #include "Qt3DSStateScriptContext.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h index cfd741cf..110770a1 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_SCRIPT_CONTEXT_H -#define UIC_STATE_SCRIPT_CONTEXT_H +#ifndef QT3DS_STATE_SCRIPT_CONTEXT_H +#define QT3DS_STATE_SCRIPT_CONTEXT_H #pragma once #include "Qt3DSState.h" #include "Qt3DSStateTypes.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h index 8f880f60..0b82cc3c 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_SHARED_IMPL_H -#define UIC_STATE_SHARED_IMPL_H +#ifndef QT3DS_STATE_SHARED_IMPL_H +#define QT3DS_STATE_SHARED_IMPL_H #include "Qt3DSState.h" #include "foundation/Utils.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h index 3c8ac21e..5bfa59ad 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_SIGNAL_CONNECTION_H -#define UIC_STATE_SIGNAL_CONNECTION_H +#ifndef QT3DS_STATE_SIGNAL_CONNECTION_H +#define QT3DS_STATE_SIGNAL_CONNECTION_H #pragma once #include "Qt3DSState.h" #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h index 999c5032..628b481f 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_STATE_TYPES_H -#define UIC_STATE_TYPES_H +#ifndef QT3DS_STATE_TYPES_H +#define QT3DS_STATE_TYPES_H #include "Qt3DSState.h" #include "foundation/StringTable.h" #include "foundation/Qt3DSInvasiveLinkedList.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h index 7217080b..7063ee2d 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_STATE_VISUAL_BINDING_CONTEXT_H -#define UIC_STATE_VISUAL_BINDING_CONTEXT_H +#ifndef QT3DS_STATE_VISUAL_BINDING_CONTEXT_H +#define QT3DS_STATE_VISUAL_BINDING_CONTEXT_H #include "Qt3DSState.h" #include "foundation/Qt3DSRefCounted.h" #include "foundation/StringTable.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h index 3bb46575..795ef02f 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_STATE_VISUAL_BINDING_CONTEXT_COMMANDS_H -#define UIC_STATE_VISUAL_BINDING_CONTEXT_COMMANDS_H +#ifndef QT3DS_STATE_VISUAL_BINDING_CONTEXT_COMMANDS_H +#define QT3DS_STATE_VISUAL_BINDING_CONTEXT_COMMANDS_H #include "Qt3DSState.h" #include "foundation/StringTable.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h index d79b6a46..7bad9b33 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_STATE_VISUAL_BINDING_CONTEXT_VALUES_H -#define UIC_STATE_VISUAL_BINDING_CONTEXT_VALUES_H +#ifndef QT3DS_STATE_VISUAL_BINDING_CONTEXT_VALUES_H +#define QT3DS_STATE_VISUAL_BINDING_CONTEXT_VALUES_H #include "Qt3DSStateVisualBindingContext.h" #include "foundation/Qt3DSDiscriminatedUnion.h" #include "Qt3DSStateVisualBindingContextCommands.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h index 075ec26b..3a639845 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h +++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_STATE_XML_IO_H -#define UIC_STATE_XML_IO_H +#ifndef QT3DS_STATE_XML_IO_H +#define QT3DS_STATE_XML_IO_H #pragma once #include "Qt3DSState.h" #include "foundation/Qt3DSDataRef.h" diff --git a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp index 86a6f862..9fc72406 100644 --- a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp +++ b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp @@ -57,8 +57,8 @@ using namespace qt3ds::state; using namespace qt3ds::state::debugger; #ifdef _DEBUG -#define UIC_LOG_ENTER_EXIT 1 -#define UIC_LOG_ACTIVE_EVENT 1 +#define QT3DS_LOG_ENTER_EXIT 1 +#define QT3DS_LOG_ACTIVE_EVENT 1 #endif namespace qt3ds { @@ -1154,7 +1154,7 @@ struct StateSystem : public IStateInterpreter for (nvvector<SStateNode *>::reverse_iterator iter = m_StatesToExit.m_List.rbegin(), end = m_StatesToExit.m_List.rend(); iter != end; ++iter) { -#ifdef UIC_LOG_ENTER_EXIT +#ifdef QT3DS_LOG_ENTER_EXIT qCInfo(TRACE_INFO, "Exiting state: %s", (*iter)->m_Id.c_str()); #endif TStateNodeList *children = (*iter)->GetChildren(); @@ -1324,7 +1324,7 @@ struct StateSystem : public IStateInterpreter DEBUGGER_CALL1(SetEnterSet, m_StatesToEnter); for (QT3DSU32 idx = 0, end = theEnterList.size(); idx < end; ++idx) { SStateNode *theEnterState(theEnterList[idx]); -#ifdef UIC_LOG_ENTER_EXIT +#ifdef QT3DS_LOG_ENTER_EXIT qCInfo(TRACE_INFO, "Entering state: %s", theEnterState->m_Id.c_str()); #endif m_Configuration.insert(theEnterState); @@ -1762,7 +1762,7 @@ struct StateSystem : public IStateInterpreter m_ScriptContext->SetCurrentEvent(theEvent); m_InternalQueue.pop_front(); DEBUGGER_CALL2(SetCurrentEvent, theEvent->GetName().c_str(), true); -#ifdef UIC_LOG_ACTIVE_EVENT +#ifdef QT3DS_LOG_ACTIVE_EVENT qCInfo(TRACE_INFO, "Current event: %s", theEvent->GetName().c_str()); #endif SelectTransitions(*theEvent); @@ -1773,7 +1773,7 @@ struct StateSystem : public IStateInterpreter DEBUGGER_CALL2(SetCurrentEvent, theEvent->GetName().c_str(), false); -#ifdef UIC_LOG_ACTIVE_EVENT +#ifdef QT3DS_LOG_ACTIVE_EVENT qCInfo(TRACE_INFO, "Current event: %s", theEvent->GetName().c_str()); #endif diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSActivationManager.h b/src/Runtime/Source/Runtime/Include/Qt3DSActivationManager.h index 9f9956a7..f343ac9b 100644 --- a/src/Runtime/Source/Runtime/Include/Qt3DSActivationManager.h +++ b/src/Runtime/Source/Runtime/Include/Qt3DSActivationManager.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_ACTIVATION_MANAGER_H -#define UIC_ACTIVATION_MANAGER_H +#ifndef QT3DS_ACTIVATION_MANAGER_H +#define QT3DS_ACTIVATION_MANAGER_H #include "foundation/Qt3DSRefCounted.h" #include "EASTL/string.h" #include "foundation/Qt3DSAllocator.h" diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSAnimationSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSAnimationSystem.h index 0fecb6ca..c0277706 100644 --- a/src/Runtime/Source/Runtime/Include/Qt3DSAnimationSystem.h +++ b/src/Runtime/Source/Runtime/Include/Qt3DSAnimationSystem.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_ANIMATION_SYSTEM_H -#define UIC_ANIMATION_SYSTEM_H +#ifndef QT3DS_ANIMATION_SYSTEM_H +#define QT3DS_ANIMATION_SYSTEM_H #include "foundation/Qt3DSFoundation.h" #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSApplication.h b/src/Runtime/Source/Runtime/Include/Qt3DSApplication.h index 39255a67..940ce7ce 100644 --- a/src/Runtime/Source/Runtime/Include/Qt3DSApplication.h +++ b/src/Runtime/Source/Runtime/Include/Qt3DSApplication.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_APPLICATION_H -#define UIC_APPLICATION_H +#ifndef QT3DS_APPLICATION_H +#define QT3DS_APPLICATION_H #include "foundation/Qt3DSRefCounted.h" #include "EASTL/string.h" #include "foundation/Qt3DSAllocator.h" diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializationHelper.h b/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializationHelper.h index a6b3531c..87dadd93 100644 --- a/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializationHelper.h +++ b/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializationHelper.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ -#ifndef UIC_BINARY_SERIALIZATION_HELPER_H -#define UIC_BINARY_SERIALIZATION_HELPER_H +#ifndef QT3DS_BINARY_SERIALIZATION_HELPER_H +#define QT3DS_BINARY_SERIALIZATION_HELPER_H #pragma once #include "foundation/Qt3DSIndexableLinkedList.h" #include "foundation/SerializationTypes.h" diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h index 93cf0f5c..4843286f 100644 --- a/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h +++ b/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h @@ -29,8 +29,8 @@ ****************************************************************************/ #pragma once -#ifndef UIC_ELEMENT_SYSTEM_H -#define UIC_ELEMENT_SYSTEM_H +#ifndef QT3DS_ELEMENT_SYSTEM_H +#define QT3DS_ELEMENT_SYSTEM_H #include "foundation/Qt3DSRefCounted.h" #include "EASTL/string.h" #include "foundation/Qt3DSAllocator.h" diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSLogicSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSLogicSystem.h index 24709d63..af13c91f 100644 --- a/src/Runtime/Source/Runtime/Include/Qt3DSLogicSystem.h +++ b/src/Runtime/Source/Runtime/Include/Qt3DSLogicSystem.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ #pragma once -#ifndef UIC_LOGIC_SYSTEM_H -#define UIC_LOGIC_SYSTEM_H +#ifndef QT3DS_LOGIC_SYSTEM_H +#define QT3DS_LOGIC_SYSTEM_H #include "Qt3DSElementSystem.h" namespace qt3ds { diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSParametersSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSParametersSystem.h index 97c160c9..51ce0135 100644 --- a/src/Runtime/Source/Runtime/Include/Qt3DSParametersSystem.h +++ b/src/Runtime/Source/Runtime/Include/Qt3DSParametersSystem.h @@ -27,8 +27,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef UIC_PARAMETERS_SYSTEM_H -#define UIC_PARAMETERS_SYSTEM_H +#ifndef QT3DS_PARAMETERS_SYSTEM_H +#define QT3DS_PARAMETERS_SYSTEM_H #pragma once #include "Qt3DSKernelTypes.h" #include "foundation/Qt3DSRefCounted.h" diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSQmlEngine.h b/src/Runtime/Source/Runtime/Include/Qt3DSQmlEngine.h index 76c12203..f778090a 100644 --- a/src/Runtime/Source/Runtime/Include/Qt3DSQmlEngine.h +++ b/src/Runtime/Source/Runtime/Include/Qt3DSQmlEngine.h @@ -29,8 +29,8 @@ ****************************************************************************/ #pragma once -#ifndef UIC_QML_ENGINE_H -#define UIC_QML_ENGINE_H +#ifndef QT3DS_QML_ENGINE_H +#define QT3DS_QML_ENGINE_H #include "Qt3DSIScriptBridge.h" #include "Qt3DSIComponentManager.h" diff --git a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h index bd607ab6..907bd8b2 100644 --- a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h +++ b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ -#ifndef UIC_VIEWER_LIB_UIC_AUDIO_PLAYER_IMPL_H -#define UIC_VIEWER_LIB_UIC_AUDIO_PLAYER_IMPL_H +#ifndef QT3DS_VIEWER_LIB_QT3DS_AUDIO_PLAYER_IMPL_H +#define QT3DS_VIEWER_LIB_QT3DS_AUDIO_PLAYER_IMPL_H #include "Qt3DSAudioPlayer.h" #include "qt3dsruntimeglobal.h" @@ -45,4 +45,4 @@ public: }; } -#endif // !UIC_VIEWER_LIB_UIC_AUDIO_PLAYER_IMPL_H +#endif // !QT3DS_VIEWER_LIB_QT3DS_AUDIO_PLAYER_IMPL_H diff --git a/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h b/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h index cbead585..ea98e768 100644 --- a/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h +++ b/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h @@ -28,8 +28,8 @@ ** ****************************************************************************/ -#ifndef UIC_EMBEDDED_WATERMARK_H -#define UIC_EMBEDDED_WATERMARK_H +#ifndef QT3DS_EMBEDDED_WATERMARK_H +#define QT3DS_EMBEDDED_WATERMARK_H #pragma once #include <stddef.h> diff --git a/src/commonplatform.pri b/src/commonplatform.pri index 87b3dbe3..e94325ab 100644 --- a/src/commonplatform.pri +++ b/src/commonplatform.pri @@ -8,10 +8,9 @@ DEFINES += \ QT3DS_FOUNDATION_NO_EXPORTS \ _CRT_SECURE_NO_DEPRECATE \ _CRT_NONSTDC_NO_DEPRECATE \ - UIC_FPMODEL_HARDFP \ - UIC_GRAPHICS_API_GL \ - UIC_NO_SEARCH_PATH \ - UIC_RENDER_ENABLE_LOAD_UIP \ + QT3DS_GRAPHICS_API_GL \ + QT3DS_NO_SEARCH_PATH \ + QT3DS_RENDER_ENABLE_LOAD_UIP \ FONT_NO_RES_DIR \ _TEGRA_NO_LOG_FILE \ EA_COMPILER_HAS_INTTYPES \ diff --git a/tests/auto/runtime/Qt3DSRenderTestBase.h b/tests/auto/runtime/Qt3DSRenderTestBase.h index 64026ef2..bd752f18 100644 --- a/tests/auto/runtime/Qt3DSRenderTestBase.h +++ b/tests/auto/runtime/Qt3DSRenderTestBase.h @@ -39,9 +39,9 @@ #include "Qt3DSTimer.h" #include "Qt3DSRenderRuntimeBinding.h" #include "Qt3DSRenderRuntimeBindingImpl.h" -#include "UICRenderContext.h" -#include "UICRendererImpl.h" -#include "UICMetadata.h" +#include "Qt3DSRenderContextCore.h" +#include "Qt3DSRendererImpl.h" +#include "Qt3DSMetadata.h" namespace qt3ds { namespace render { diff --git a/tests/auto/runtime/runtime.pro b/tests/auto/runtime/runtime.pro index e604339c..a1d9d7db 100644 --- a/tests/auto/runtime/runtime.pro +++ b/tests/auto/runtime/runtime.pro @@ -11,7 +11,7 @@ RESOURCES += \ $$PWD/../../../src/Runtime/platformres.qrc INCLUDEPATH += \ - $$PWD/../../../src/Runtime/Source/UICRender/RendererImpl + $$PWD/../../../src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl HEADERS += \ base/Qt3DSRenderTestAtomicCounterBuffer.h \ diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp index 034b0a4b..00d991d9 100644 --- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp +++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp @@ -31,23 +31,22 @@ #include "../Qt3DSRenderTestMathUtil.h" #include "render/Qt3DSRenderShaderProgram.h" #include "render/Qt3DSRenderContext.h" -#include "UICRenderCustomMaterialSystem.h" -#include "UICRenderCustomMaterialRenderContext.h" -#include "UICRenderCustomMaterialShaderGenerator.h" -#include "UICRenderDynamicObjectSystem.h" -#include "UICRenderDynamicObjectSystemCommands.h" -#include "UICRenderContext.h" +#include "Qt3DSRenderCustomMaterialSystem.h" +#include "Qt3DSRenderCustomMaterialRenderContext.h" +#include "Qt3DSRenderCustomMaterialShaderGenerator.h" +#include "Qt3DSRenderDynamicObjectSystem.h" +#include "Qt3DSRenderDynamicObjectSystemCommands.h" +#include "Qt3DSRenderContextCore.h" #include "Qt3DSTypes.h" #include "Qt3DSRenderRuntimeBinding.h" #include "Qt3DSApplication.h" #include "Qt3DSInputEngine.h" #include "foundation/FileTools.h" #include "Qt3DSWindowSystem.h" -#include "UICRenderContext.h" -#include "UICRenderShaderCache.h" -#include "UICRendererImpl.h" -#include "UICRenderLight.h" -#include "UICRenderUIPLoader.h" +#include "Qt3DSRenderShaderCache.h" +#include "Qt3DSRendererImpl.h" +#include "Qt3DSRenderLight.h" +#include "Qt3DSRenderUIPLoader.h" #include "UICDMMetaDataTypes.h" #include <QTime> @@ -106,7 +105,7 @@ struct CustomTestParams SLayer layer; SLayerRenderData layerData; SRenderableImage *images; - SLight light[UIC_MAX_NUM_LIGHTS]; + SLight light[QT3DS_MAX_NUM_LIGHTS]; SModel model; SRenderSubset subset; SShaderDefaultMaterialKey shaderkey; diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp index 6858a517..416fe9a3 100644 --- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp +++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp @@ -37,10 +37,10 @@ #include "Qt3DSInputEngine.h" #include "foundation/FileTools.h" #include "Qt3DSWindowSystem.h" -#include "UICRenderContext.h" -#include "UICRenderShaderCache.h" -#include "UICRendererImpl.h" -#include "UICRenderLight.h" +#include "Qt3DSRenderContextCore.h" +#include "Qt3DSRenderShaderCache.h" +#include "Qt3DSRendererImpl.h" +#include "Qt3DSRenderLight.h" #include <QTime> @@ -204,7 +204,7 @@ struct TestParams SShaderDefaultMaterialKey shaderkey; SSubsetRenderable renderable; eastl::vector<SShaderPreprocessorFeature> features; - SLight light[UIC_MAX_NUM_LIGHTS]; + SLight light[QT3DS_MAX_NUM_LIGHTS]; SLayer layer; SLayerRenderData layerData; SImage dummyImages[SShaderDefaultMaterialKeyProperties::ImageMapCount]; @@ -318,7 +318,7 @@ TestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl, params->shaderkey, true); } bool castShadow = false; - key.lights = qMin(int(key.lights), int(UIC_MAX_NUM_LIGHTS)); + key.lights = qMin(int(key.lights), int(QT3DS_MAX_NUM_LIGHTS)); for (unsigned int i = 0; i < key.lights; ++i) { params->light[i].m_LightType = static_cast<RenderLightTypes::Enum>((i%3)+1); if (params->light[i].m_LightType != RenderLightTypes::Directional) { diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp index 3e94cd5c..0faa0d5f 100644 --- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp +++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp @@ -31,23 +31,22 @@ #include "../Qt3DSRenderTestMathUtil.h" #include "render/Qt3DSRenderShaderProgram.h" #include "render/Qt3DSRenderContext.h" -#include "UICRenderCustomMaterialSystem.h" -#include "UICRenderCustomMaterialRenderContext.h" -#include "UICRenderCustomMaterialShaderGenerator.h" -#include "UICRenderDynamicObjectSystem.h" -#include "UICRenderDynamicObjectSystemCommands.h" -#include "UICRenderContext.h" +#include "Qt3DSRenderCustomMaterialSystem.h" +#include "Qt3DSRenderCustomMaterialRenderContext.h" +#include "Qt3DSRenderCustomMaterialShaderGenerator.h" +#include "Qt3DSRenderDynamicObjectSystem.h" +#include "Qt3DSRenderDynamicObjectSystemCommands.h" +#include "Qt3DSRenderContextCore.h" #include "Qt3DSTypes.h" #include "Qt3DSRenderRuntimeBinding.h" #include "Qt3DSApplication.h" #include "Qt3DSInputEngine.h" #include "foundation/FileTools.h" #include "Qt3DSWindowSystem.h" -#include "UICRenderContext.h" -#include "UICRenderShaderCache.h" -#include "UICRendererImpl.h" -#include "UICRenderLight.h" -#include "UICRenderUIPLoader.h" +#include "Qt3DSRenderShaderCache.h" +#include "Qt3DSRendererImpl.h" +#include "Qt3DSRenderLight.h" +#include "Qt3DSRenderUIPLoader.h" #include "UICDMMetaDataTypes.h" #include <QTime> |