diff options
| author | Kaj Grönholm <kaj.gronholm@qt.io> | 2020-09-18 14:20:20 +0300 |
|---|---|---|
| committer | Kaj Grönholm <kaj.gronholm@qt.io> | 2020-09-25 06:40:53 +0300 |
| commit | 34db1fb59ca477af95311cb8249ee90b1e471184 (patch) | |
| tree | 85ecaa1ed3aeaafac7f23d13b77b500cf79fad14 /src/dm/systems | |
| parent | e551c9d27febae3a874cfd4c54ff9811abce0fc7 (diff) | |
Add signal objectv2.8.0-beta1
Add signal object type and use it instead of dummy group in
activateactions autotest.
Task-number: QT3DS-4165
Change-Id: Id10fcc95e3a8f9009db71e6c2d640a593e633d67
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/dm/systems')
| -rw-r--r-- | src/dm/systems/Qt3DSDMComposerTypeDefinitions.cpp | 2 | ||||
| -rw-r--r-- | src/dm/systems/Qt3DSDMComposerTypeDefinitions.h | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/dm/systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/dm/systems/Qt3DSDMComposerTypeDefinitions.cpp index 3aacdec..fc2500a 100644 --- a/src/dm/systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/dm/systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -109,6 +109,7 @@ struct DataConstructor<SObjectRefType> #define QT3DS_WCHAR_T_Node L"Node" #define QT3DS_WCHAR_T_Layer L"Layer" #define QT3DS_WCHAR_T_Group L"Group" +#define QT3DS_WCHAR_T_Signal L"Signal" #define QT3DS_WCHAR_T_Model L"Model" #define QT3DS_WCHAR_T_Light L"Light" #define QT3DS_WCHAR_T_Camera L"Camera" @@ -513,6 +514,7 @@ SComposerObjectDefinitions::SComposerObjectDefinitions(IDataCore &inCore, IMetaD , m_Node(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_Layer(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Group(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) + , m_Signal(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Model(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Light(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Camera(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) diff --git a/src/dm/systems/Qt3DSDMComposerTypeDefinitions.h b/src/dm/systems/Qt3DSDMComposerTypeDefinitions.h index e8bd139..bd1dcb5 100644 --- a/src/dm/systems/Qt3DSDMComposerTypeDefinitions.h +++ b/src/dm/systems/Qt3DSDMComposerTypeDefinitions.h @@ -67,6 +67,7 @@ class IPropertySystem; 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_GROUP_PROPERTIES) \ + HANDLE_COMPOSER_OBJECT_TYPE(Signal, ITERATE_COMPOSER_SIGNAL_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) \ @@ -253,6 +254,9 @@ class IPropertySystem; HANDLE_COMPOSER_PROPERTY_DUPLICATE(ordered, m_ordered, bool, false) \ HANDLE_COMPOSER_PROPERTY_DUPLICATE(variants, m_variants, TDataStrPtr, L"") \ +#define ITERATE_COMPOSER_SIGNAL_PROPERTIES \ + // Note: Signal doesn't contain any properties + #define ITERATE_COMPOSER_LIGHT_PROPERTIES \ HANDLE_COMPOSER_PROPERTY(lighttype, m_LightType, TDataStrPtr, L"Directional") \ HANDLE_COMPOSER_PROPERTY(scope, m_Scope, SObjectRefType, L"") \ @@ -799,6 +803,21 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Group> }; template <> +struct SComposerObjectDefinition<ComposerObjectTypes::Signal> + : public SComposerBaseObjectDefinition<ComposerObjectTypes::Signal> +{ + SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData, + Qt3DSDMInstanceHandle inInstance, + SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped, + SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode) + : SComposerBaseObjectDefinition<ComposerObjectTypes::Signal>(inCore, inMetaData, inInstance) + { + Derive(inCore, inNode); + SetType(inCore, inTyped); + } +}; + +template <> struct SComposerObjectDefinition<ComposerObjectTypes::Light> : public SComposerBaseObjectDefinition<ComposerObjectTypes::Light> { |