diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-04-05 16:25:30 +0300 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-04-08 08:07:36 +0000 |
commit | 133f2744eaa1bfa7066af377c442d59db1509dbb (patch) | |
tree | eb7a4f4852f007cd6155b83c21cbe45bc2b74427 /src/Authoring/QT3DSDM/Systems | |
parent | 0c0c438384343148ac74dfe14e16a814d02936e4 (diff) |
Support variants property on Group types
Also few usual cleanups.
Task-number: QT3DS-3234
Change-Id: I4624aeac27ee512cdbe62677bb9469e2748cc58b
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems')
-rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | 11 | ||||
-rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h | 18 |
2 files changed, 11 insertions, 18 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp index 842a2884..41aa3365 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -487,14 +487,8 @@ void ComposerTypeDefinitionsHelper::DeriveInstance(IDataCore &inDataCore, } // Container object for all of the object definitions -SComposerObjectDefinitions::SComposerObjectDefinitions( - IDataCore &inCore, - IMetaData &inMetaData /*, ISlideCore& inSlideCore, IPropertySystem& inPropertySystem*/) - : m_DataCore(inCore) - , m_MetaData(inMetaData) - //, m_SlideCore( inSlideCore ) - //, m_PropertySystem( inPropertySystem ) - , m_Typed(inCore, inMetaData, inCore.CreateInstance()) +SComposerObjectDefinitions::SComposerObjectDefinitions(IDataCore &inCore, IMetaData &inMetaData) + : m_Typed(inCore, inMetaData, inCore.CreateInstance()) , m_Guided(inCore, inMetaData, inCore.CreateInstance()) , m_Named(inCore, inMetaData, inCore.CreateInstance()) , m_SlideOwner(inCore, inMetaData, inCore.CreateInstance()) @@ -523,6 +517,7 @@ SComposerObjectDefinitions::SComposerObjectDefinitions( , m_Path(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_PathAnchorPoint(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_SubPath(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) + , m_DataCore(inCore) { } diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h index f5db0e38..d962c137 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h @@ -66,7 +66,7 @@ class IPropertySystem; HANDLE_COMPOSER_OBJECT_TYPE(Effect, ITERATE_COMPOSER_NO_ADDITIONAL_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(Node, ITERATE_COMPOSER_NODE_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(Layer, ITERATE_COMPOSER_LAYER_PROPERTIES) \ - HANDLE_COMPOSER_OBJECT_TYPE(Group, ITERATE_COMPOSER_NO_ADDITIONAL_PROPERTIES) \ + HANDLE_COMPOSER_OBJECT_TYPE(Group, ITERATE_COMPOSER_GROUP_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(Model, ITERATE_COMPOSER_MODEL_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(Light, ITERATE_COMPOSER_LIGHT_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(Camera, ITERATE_COMPOSER_CAMERA_PROPERTIES) \ @@ -239,6 +239,9 @@ class IPropertySystem; HANDLE_COMPOSER_PROPERTY(variants, m_variants, TDataStrPtr, L"") \ HANDLE_COMPOSER_PROPERTY_DUPLICATE(controlledproperty, m_ControlledProperty, TDataStrPtr, L"") +#define ITERATE_COMPOSER_GROUP_PROPERTIES \ + HANDLE_COMPOSER_PROPERTY_DUPLICATE(variants, m_variants, TDataStrPtr, L"") \ + #define ITERATE_COMPOSER_LIGHT_PROPERTIES \ HANDLE_COMPOSER_PROPERTY(lighttype, m_LightType, TDataStrPtr, L"Directional") \ HANDLE_COMPOSER_PROPERTY(scope, m_Scope, SObjectRefType, L"") \ @@ -927,19 +930,15 @@ struct SComposerObjectDefinition<ComposerObjectTypes::SubPath> class SComposerObjectDefinitions { public: - IDataCore &m_DataCore; - IMetaData &m_MetaData; - #define HANDLE_COMPOSER_OBJECT_TYPE(name, propmacro) \ SComposerObjectDefinition<ComposerObjectTypes::name> m_##name; ITERATE_COMPOSER_OBJECT_TYPES #undef HANDLE_COMPOSER_OBJECT_TYPE - SComposerObjectDefinitions( - IDataCore &inDataCore, - IMetaData &inMetaData /*, ISlideCore& inSlideCore, IPropertySystem& inPropertySystem */); + SComposerObjectDefinitions(IDataCore &inDataCore, IMetaData &inMetaData); + SComposerObjectDefinitions() = default; + ~SComposerObjectDefinitions() = default; - //////////////////////////////////////////////////////////////////////////////////////////////// // RTTI API bool IsA(Qt3DSDMInstanceHandle inInstance, ComposerObjectTypes::Enum inType); // Could easily return None, meaning we can't identify the object type. @@ -948,9 +947,8 @@ public: ComposerObjectTypes::Enum GetType(Qt3DSDMInstanceHandle inInstance); Qt3DSDMInstanceHandle GetInstanceForType(ComposerObjectTypes::Enum inType); - SComposerObjectDefinitions() = default; - ~SComposerObjectDefinitions() = default; private: + IDataCore &m_DataCore; SComposerObjectDefinitions(const SComposerObjectDefinitions&) = delete; SComposerObjectDefinitions& operator=(const SComposerObjectDefinitions&) = delete; }; |