diff options
Diffstat (limited to 'src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge')
| -rw-r--r-- | src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp | 12 | ||||
| -rw-r--r-- | src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp index 95540fe6..d0da3c6c 100644 --- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp +++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp @@ -81,6 +81,7 @@ CClientDataModelBridge::CClientDataModelBridge( , m_Camera(inDefinitions->m_Camera) , m_Text(inDefinitions->m_Text) , m_Group(inDefinitions->m_Group) + , m_Signal(inDefinitions->m_Signal) , m_Component(inDefinitions->m_Component) , m_Behavior(inDefinitions->m_Behavior) , m_Scene(inDefinitions->m_Scene) @@ -214,6 +215,9 @@ Qt3DSDMInstanceHandle CClientDataModelBridge::CreateAssetInstance(Q3DStudio::CId case OBJTYPE_GROUP: m_DataCore->DeriveInstance(theNewInstance, m_Group.m_Instance); break; + case OBJTYPE_SIGNAL: + m_DataCore->DeriveInstance(theNewInstance, m_Signal.m_Instance); + break; case OBJTYPE_COMPONENT: m_DataCore->DeriveInstance(theNewInstance, m_Component.m_Instance); break; @@ -1706,6 +1710,7 @@ bool CClientDataModelBridge::CanDelete(qt3dsdm::Qt3DSDMInstanceHandle inInstance case OBJTYPE_MODEL: case OBJTYPE_TEXT: case OBJTYPE_GROUP: + case OBJTYPE_SIGNAL: case OBJTYPE_CAMERA: case OBJTYPE_LIGHT: case OBJTYPE_IMAGE: @@ -1849,6 +1854,8 @@ CClientDataModelBridge::GetObjectType(qt3dsdm::Qt3DSDMInstanceHandle inInstance) return OBJTYPE_CAMERA; else if (theType == L"Group") return OBJTYPE_GROUP; + else if (theType == L"Signal") + return OBJTYPE_SIGNAL; else if (theType == L"Component") return OBJTYPE_COMPONENT; else if (theType == L"Image" || theType == L"LibraryImage") @@ -1904,6 +1911,11 @@ bool CClientDataModelBridge::IsGroupInstance(qt3dsdm::Qt3DSDMInstanceHandle inIn return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Group.m_Instance); } +bool CClientDataModelBridge::IsSignalInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const +{ + return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Signal.m_Instance); +} + bool CClientDataModelBridge::IsActionInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const { return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_ActionItem.m_Instance); diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h index c3f1a90f..f0f5004d 100644 --- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h +++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h @@ -75,6 +75,7 @@ typedef qt3dsdm::SComposerObjectDefinition<qt3dsdm::ComposerObjectTypes::Light> typedef qt3dsdm::SComposerObjectDefinition<qt3dsdm::ComposerObjectTypes::Camera> SDataModelCamera; typedef qt3dsdm::SComposerObjectDefinition<qt3dsdm::ComposerObjectTypes::Text> SDataModelText; typedef qt3dsdm::SComposerObjectDefinition<qt3dsdm::ComposerObjectTypes::Group> SDataModelGroup; +typedef qt3dsdm::SComposerObjectDefinition<qt3dsdm::ComposerObjectTypes::Signal> SDataModelSignal; typedef qt3dsdm::SComposerObjectDefinition<qt3dsdm::ComposerObjectTypes::Component> SDataModelComponent; typedef qt3dsdm::SComposerObjectDefinition<qt3dsdm::ComposerObjectTypes::Behavior> SDataModelBehavior; typedef qt3dsdm::SComposerObjectDefinition<qt3dsdm::ComposerObjectTypes::Scene> SDataModelScene; @@ -133,6 +134,7 @@ class CClientDataModelBridge SDataModelCamera &m_Camera; SDataModelText &m_Text; SDataModelGroup &m_Group; + SDataModelSignal &m_Signal; SDataModelComponent &m_Component; SDataModelBehavior &m_Behavior; SDataModelScene &m_Scene; @@ -232,6 +234,7 @@ public: const SDataModelCamera &GetCamera() const { return m_Camera; } const SDataModelText &GetText() const { return m_Text; } const SDataModelGroup &GetGroup() const { return m_Group; } + const SDataModelSignal &GetSignal() const { return m_Signal; } const SDataModelComponent &GetComponent() const { return m_Component; } const SDataModelBehavior &GetBehavior() const { return m_Behavior; } const SDataModelScene &GetScene() const { return m_Scene; } @@ -384,6 +387,7 @@ public: bool IsBehaviorInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const; bool IsCameraInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const; bool IsGroupInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const; + bool IsSignalInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const; bool IsActionInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const; bool IsComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const; bool IsLayerInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const; |