summaryrefslogtreecommitdiffstats
path: root/src/Authoring/QT3DSDM/Systems/Cores
diff options
context:
space:
mode:
authorMäättä Antti <antti.maatta@qt.io>2017-10-19 13:20:11 +0300
committerAntti Määttä <antti.maatta@qt.io>2017-10-24 13:23:56 +0000
commit2e96295db042e301c9367c441d8132813689ee4c (patch)
treef4a55801bd125cbb432ca9aba9151dd0e0c13370 /src/Authoring/QT3DSDM/Systems/Cores
parentf407c37d3f0ab61b3923c3ef0e5d0f842f0b0e41 (diff)
Rename CUICDM type names to Qt3DSDM
Task-number: QT3DS-18 Change-Id: Ia0ba2bb501f7d66b0088bd568bfad46a678ac078 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems/Cores')
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp54
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h44
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp84
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h56
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp40
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h36
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp70
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h46
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp20
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h22
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp36
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h26
12 files changed, 267 insertions, 267 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp b/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp
index 8b6f7ef5..c262c239 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp
@@ -36,18 +36,18 @@ using namespace std;
namespace qt3dsdm {
-CUICDMActionHandle CActionCoreProducer::CreateAction(Qt3DSDMInstanceHandle inInstance,
+Qt3DSDMActionHandle CActionCoreProducer::CreateAction(Qt3DSDMInstanceHandle inInstance,
Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inOwner,
SLong4 inTriggerTargetObjects)
{
- CUICDMActionHandle retval =
+ Qt3DSDMActionHandle retval =
m_Data->CreateAction(inInstance, inSlide, inOwner, inTriggerTargetObjects);
CREATE_HANDLE_CREATE_TRANSACTION(m_Consumer, retval, m_Data->m_Objects);
return retval;
}
-void CActionCoreProducer::DeleteAction(CUICDMActionHandle inAction,
+void CActionCoreProducer::DeleteAction(Qt3DSDMActionHandle inAction,
Qt3DSDMInstanceHandle &outInstance)
{
// Ensure action exists
@@ -59,7 +59,7 @@ void CActionCoreProducer::DeleteAction(CUICDMActionHandle inAction,
m_Data->DeleteAction(inAction, outInstance);
}
-const SActionInfo &CActionCoreProducer::GetActionInfo(CUICDMActionHandle inAction) const
+const SActionInfo &CActionCoreProducer::GetActionInfo(Qt3DSDMActionHandle inAction) const
{
return m_Data->GetActionInfo(inAction);
}
@@ -86,18 +86,18 @@ void CActionCoreProducer::GetActions(TActionHandleList &outActions) const
return m_Data->GetActions(outActions);
}
-Qt3DSDMInstanceHandle CActionCoreProducer::GetActionInstance(CUICDMActionHandle inAction) const
+Qt3DSDMInstanceHandle CActionCoreProducer::GetActionInstance(Qt3DSDMActionHandle inAction) const
{
return m_Data->GetActionInstance(inAction);
}
-CUICDMActionHandle
+Qt3DSDMActionHandle
CActionCoreProducer::GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const
{
return m_Data->GetActionByInstance(inActionInstance);
}
-void CActionCoreProducer::SetTriggerObject(CUICDMActionHandle inAction,
+void CActionCoreProducer::SetTriggerObject(Qt3DSDMActionHandle inAction,
const SObjectRefType &inTriggerObject)
{
SAction *theAction = CSimpleActionCore::GetActionNF(inAction, m_Data->m_Objects);
@@ -111,7 +111,7 @@ void CActionCoreProducer::SetTriggerObject(CUICDMActionHandle inAction,
GetSignalSender()->SendTriggerObjectSet(inAction, theAction->m_ActionInfo.m_TriggerObject);
}
-void CActionCoreProducer::SetTargetObject(CUICDMActionHandle inAction,
+void CActionCoreProducer::SetTargetObject(Qt3DSDMActionHandle inAction,
const SObjectRefType &inTargetObject)
{
SAction *theAction = CSimpleActionCore::GetActionNF(inAction, m_Data->m_Objects);
@@ -125,7 +125,7 @@ void CActionCoreProducer::SetTargetObject(CUICDMActionHandle inAction,
GetSignalSender()->SendTargetObjectSet(inAction, theAction->m_ActionInfo.m_TargetObject);
}
-void CActionCoreProducer::SetEvent(CUICDMActionHandle inAction, const wstring &inEventHandle)
+void CActionCoreProducer::SetEvent(Qt3DSDMActionHandle inAction, const wstring &inEventHandle)
{
SAction *theAction = CSimpleActionCore::GetActionNF(inAction, m_Data->m_Objects);
if (m_Consumer) {
@@ -138,7 +138,7 @@ void CActionCoreProducer::SetEvent(CUICDMActionHandle inAction, const wstring &i
GetSignalSender()->SendEventSet(inAction, inEventHandle);
}
-void CActionCoreProducer::SetHandler(CUICDMActionHandle inAction, const wstring &inHandlerHandle)
+void CActionCoreProducer::SetHandler(Qt3DSDMActionHandle inAction, const wstring &inHandlerHandle)
{
SAction *theAction = CSimpleActionCore::GetActionNF(inAction, m_Data->m_Objects);
if (m_Consumer) {
@@ -151,31 +151,31 @@ void CActionCoreProducer::SetHandler(CUICDMActionHandle inAction, const wstring
GetSignalSender()->SendHandlerSet(inAction, inHandlerHandle);
}
-CUICDMHandlerArgHandle CActionCoreProducer::AddHandlerArgument(CUICDMActionHandle inAction,
+Qt3DSDMHandlerArgHandle CActionCoreProducer::AddHandlerArgument(Qt3DSDMActionHandle inAction,
const TCharStr &inName,
HandlerArgumentType::Value inArgType,
DataModelDataType::Value inValueType)
{
- CUICDMHandlerArgHandle retval =
+ Qt3DSDMHandlerArgHandle retval =
m_Data->AddHandlerArgument(inAction, inName, inArgType, inValueType);
SAction *theAction = CSimpleActionCore::GetActionNF(inAction, m_Data->m_Objects);
- CreateVecInsertTransaction<CUICDMHandlerArgHandle>(__FILE__, __LINE__, m_Consumer, retval,
+ CreateVecInsertTransaction<Qt3DSDMHandlerArgHandle>(__FILE__, __LINE__, m_Consumer, retval,
theAction->m_ActionInfo.m_HandlerArgs);
CREATE_HANDLE_CREATE_TRANSACTION(m_Consumer, retval, m_Data->m_Objects);
GetSignalSender()->SendHandlerArgumentAdded(inAction, retval, inName, inArgType, inValueType);
return retval;
}
-void CActionCoreProducer::RemoveHandlerArgument(CUICDMHandlerArgHandle inHandlerArgument)
+void CActionCoreProducer::RemoveHandlerArgument(Qt3DSDMHandlerArgHandle inHandlerArgument)
{
SHandlerArgument *theHandlerArgument =
CSimpleActionCore::GetHandlerArgumentNF(inHandlerArgument, m_Data->m_Objects);
SAction *theAction = CSimpleActionCore::GetActionNF(
theHandlerArgument->m_HandlerArgInfo.m_Action, m_Data->m_Objects);
if (exists(theAction->m_ActionInfo.m_HandlerArgs,
- std::bind(equal_to<CUICDMHandlerArgHandle>(), inHandlerArgument,
+ std::bind(equal_to<Qt3DSDMHandlerArgHandle>(), inHandlerArgument,
std::placeholders::_1))) {
- CreateVecEraseTransaction<CUICDMHandlerArgHandle>(__FILE__, __LINE__, m_Consumer,
+ CreateVecEraseTransaction<Qt3DSDMHandlerArgHandle>(__FILE__, __LINE__, m_Consumer,
inHandlerArgument,
theAction->m_ActionInfo.m_HandlerArgs);
CREATE_HANDLE_DELETE_TRANSACTION(m_Consumer, inHandlerArgument, m_Data->m_Objects);
@@ -188,24 +188,24 @@ void CActionCoreProducer::RemoveHandlerArgument(CUICDMHandlerArgHandle inHandler
}
const SHandlerArgumentInfo &
-CActionCoreProducer::GetHandlerArgumentInfo(CUICDMHandlerArgHandle inHandlerArgument) const
+CActionCoreProducer::GetHandlerArgumentInfo(Qt3DSDMHandlerArgHandle inHandlerArgument) const
{
return m_Data->GetHandlerArgumentInfo(inHandlerArgument);
}
-void CActionCoreProducer::GetHandlerArguments(CUICDMActionHandle inAction,
+void CActionCoreProducer::GetHandlerArguments(Qt3DSDMActionHandle inAction,
THandlerArgHandleList &outHandlerArguments) const
{
return m_Data->GetHandlerArguments(inAction, outHandlerArguments);
}
-void CActionCoreProducer::GetHandlerArgumentValue(CUICDMHandlerArgHandle inHandlerArgument,
+void CActionCoreProducer::GetHandlerArgumentValue(Qt3DSDMHandlerArgHandle inHandlerArgument,
SValue &outValue) const
{
return m_Data->GetHandlerArgumentValue(inHandlerArgument, outValue);
}
-void CActionCoreProducer::SetHandlerArgumentValue(CUICDMHandlerArgHandle inHandlerArgument,
+void CActionCoreProducer::SetHandlerArgumentValue(Qt3DSDMHandlerArgHandle inHandlerArgument,
const SValue &inValue)
{
SHandlerArgument *theHandlerArgument =
@@ -234,40 +234,40 @@ void CActionCoreProducer::SetConsumer(TTransactionConsumerPtr inConsumer)
}
TSignalConnectionPtr CActionCoreProducer::ConnectTriggerObjectSet(
- const std::function<void(CUICDMActionHandle, SObjectRefType &)> &inCallback)
+ const std::function<void(Qt3DSDMActionHandle, SObjectRefType &)> &inCallback)
{
return GetSignalProvider()->ConnectTriggerObjectSet(inCallback);
}
TSignalConnectionPtr CActionCoreProducer::ConnectTargetObjectSet(
- const std::function<void(CUICDMActionHandle, SObjectRefType &)> &inCallback)
+ const std::function<void(Qt3DSDMActionHandle, SObjectRefType &)> &inCallback)
{
return GetSignalProvider()->ConnectTargetObjectSet(inCallback);
}
TSignalConnectionPtr CActionCoreProducer::ConnectEventSet(
- const std::function<void(CUICDMActionHandle, const wstring &)> &inCallback)
+ const std::function<void(Qt3DSDMActionHandle, const wstring &)> &inCallback)
{
return GetSignalProvider()->ConnectEventSet(inCallback);
}
TSignalConnectionPtr CActionCoreProducer::ConnectHandlerSet(
- const std::function<void(CUICDMActionHandle, const wstring &)> &inCallback)
+ const std::function<void(Qt3DSDMActionHandle, const wstring &)> &inCallback)
{
return GetSignalProvider()->ConnectHandlerSet(inCallback);
}
TSignalConnectionPtr CActionCoreProducer::ConnectHandlerArgumentAdded(
- const std::function<void(CUICDMActionHandle, CUICDMHandlerArgHandle, const TCharStr &,
+ const std::function<void(Qt3DSDMActionHandle, Qt3DSDMHandlerArgHandle, const TCharStr &,
HandlerArgumentType::Value, DataModelDataType::Value)> &inCallback)
{
return GetSignalProvider()->ConnectHandlerArgumentAdded(inCallback);
}
TSignalConnectionPtr CActionCoreProducer::ConnectHandlerArgumentRemoved(
- const std::function<void(CUICDMActionHandle, CUICDMHandlerArgHandle, const TCharStr &,
+ const std::function<void(Qt3DSDMActionHandle, Qt3DSDMHandlerArgHandle, const TCharStr &,
HandlerArgumentType::Value, DataModelDataType::Value)> &inCallback)
{
return GetSignalProvider()->ConnectHandlerArgumentRemoved(inCallback);
}
TSignalConnectionPtr CActionCoreProducer::ConnectHandlerArgumentValueSet(
- const std::function<void(CUICDMHandlerArgHandle, const SValue &)> &inCallback)
+ const std::function<void(Qt3DSDMHandlerArgHandle, const SValue &)> &inCallback)
{
return GetSignalProvider()->ConnectHandlerArgumentValueSet(inCallback);
}
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h b/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h
index a08d109c..bf65a387 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h
@@ -59,37 +59,37 @@ public:
IStringTable &GetStringTable() const override { return m_Data->GetStringTable(); }
TStringTablePtr GetStringTablePtr() const override { return m_Data->GetStringTablePtr(); }
// Action
- CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide,
+ Qt3DSDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inOwner, SLong4 inTriggerTargetObjects) override;
- void DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) override;
- const SActionInfo &GetActionInfo(CUICDMActionHandle inAction) const override;
+ void DeleteAction(Qt3DSDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) override;
+ const SActionInfo &GetActionInfo(Qt3DSDMActionHandle inAction) const override;
void GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
TActionHandleList &outActions) const override;
void GetActions(Qt3DSDMSlideHandle inSlide, TActionHandleList &outActions) const override;
void GetActions(Qt3DSDMInstanceHandle inOwner, TActionHandleList &outActions) const override;
void GetActions(TActionHandleList &outActions) const override;
- Qt3DSDMInstanceHandle GetActionInstance(CUICDMActionHandle inAction) const override;
- CUICDMActionHandle GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const override;
+ Qt3DSDMInstanceHandle GetActionInstance(Qt3DSDMActionHandle inAction) const override;
+ Qt3DSDMActionHandle GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const override;
// Action Properties
- void SetTriggerObject(CUICDMActionHandle inAction, const SObjectRefType &inTriggerObject) override;
- void SetTargetObject(CUICDMActionHandle inAction, const SObjectRefType &inTargetObject) override;
- void SetEvent(CUICDMActionHandle inAction, const wstring &inEventHandle) override;
- void SetHandler(CUICDMActionHandle inAction, const wstring &inHandlerHandle) override;
+ void SetTriggerObject(Qt3DSDMActionHandle inAction, const SObjectRefType &inTriggerObject) override;
+ void SetTargetObject(Qt3DSDMActionHandle inAction, const SObjectRefType &inTargetObject) override;
+ void SetEvent(Qt3DSDMActionHandle inAction, const wstring &inEventHandle) override;
+ void SetHandler(Qt3DSDMActionHandle inAction, const wstring &inHandlerHandle) override;
// Action Argument
- CUICDMHandlerArgHandle AddHandlerArgument(CUICDMActionHandle inAction, const TCharStr &inName,
+ Qt3DSDMHandlerArgHandle AddHandlerArgument(Qt3DSDMActionHandle inAction, const TCharStr &inName,
HandlerArgumentType::Value inArgType,
DataModelDataType::Value inValueType) override;
- void RemoveHandlerArgument(CUICDMHandlerArgHandle inHandlerArgument) override;
+ void RemoveHandlerArgument(Qt3DSDMHandlerArgHandle inHandlerArgument) override;
const SHandlerArgumentInfo &
- GetHandlerArgumentInfo(CUICDMHandlerArgHandle inHandlerArgument) const override;
- void GetHandlerArguments(CUICDMActionHandle inAction,
+ GetHandlerArgumentInfo(Qt3DSDMHandlerArgHandle inHandlerArgument) const override;
+ void GetHandlerArguments(Qt3DSDMActionHandle inAction,
THandlerArgHandleList &outHandlerArguments) const override;
// Action Argument Properties
- void GetHandlerArgumentValue(CUICDMHandlerArgHandle inHandlerArgument, SValue &outValue) const override;
- void SetHandlerArgumentValue(CUICDMHandlerArgHandle inHandlerArgument, const SValue &inValue) override;
+ void GetHandlerArgumentValue(Qt3DSDMHandlerArgHandle inHandlerArgument, SValue &outValue) const override;
+ void SetHandlerArgumentValue(Qt3DSDMHandlerArgHandle inHandlerArgument, const SValue &inValue) override;
// CHandleBase
bool HandleValid(int inHandle) const override;
@@ -98,22 +98,22 @@ public:
void SetConsumer(TTransactionConsumerPtr inConsumer) override;
TSignalConnectionPtr ConnectTriggerObjectSet(
- const std::function<void(CUICDMActionHandle, SObjectRefType &)> &inCallback) override;
+ const std::function<void(Qt3DSDMActionHandle, SObjectRefType &)> &inCallback) override;
TSignalConnectionPtr ConnectTargetObjectSet(
- const std::function<void(CUICDMActionHandle, SObjectRefType &)> &inCallback) override;
+ const std::function<void(Qt3DSDMActionHandle, SObjectRefType &)> &inCallback) override;
virtual TSignalConnectionPtr
- ConnectEventSet(const std::function<void(CUICDMActionHandle, const wstring &)> &inCallback) override;
+ ConnectEventSet(const std::function<void(Qt3DSDMActionHandle, const wstring &)> &inCallback) override;
virtual TSignalConnectionPtr
- ConnectHandlerSet(const std::function<void(CUICDMActionHandle, const wstring &)> &inCallback) override;
+ ConnectHandlerSet(const std::function<void(Qt3DSDMActionHandle, const wstring &)> &inCallback) override;
TSignalConnectionPtr ConnectHandlerArgumentAdded(
- const std::function<void(CUICDMActionHandle, CUICDMHandlerArgHandle, const TCharStr &,
+ const std::function<void(Qt3DSDMActionHandle, Qt3DSDMHandlerArgHandle, const TCharStr &,
HandlerArgumentType::Value, DataModelDataType::Value)> &inCallback) override;
TSignalConnectionPtr ConnectHandlerArgumentRemoved(
- const std::function<void(CUICDMActionHandle, CUICDMHandlerArgHandle, const TCharStr &,
+ const std::function<void(Qt3DSDMActionHandle, Qt3DSDMHandlerArgHandle, const TCharStr &,
HandlerArgumentType::Value, DataModelDataType::Value)> &inCallback) override;
TSignalConnectionPtr ConnectHandlerArgumentValueSet(
- const std::function<void(CUICDMHandlerArgHandle, const SValue &)> &inCallback) override;
+ const std::function<void(Qt3DSDMHandlerArgHandle, const SValue &)> &inCallback) override;
private:
void InitSignaller();
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp b/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp
index 01b7062b..14d18240 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp
@@ -42,10 +42,10 @@ namespace qt3dsdm {
struct SArtistEditedUndoRedoScope
{
TSimpleAnimationCorePtr m_AnimationCore;
- CUICDMAnimationHandle m_Animation;
+ Qt3DSDMAnimationHandle m_Animation;
TTransactionConsumerPtr m_Consumer;
bool m_ArtistEdited;
- SArtistEditedUndoRedoScope(TSimpleAnimationCorePtr inAnimCore, CUICDMAnimationHandle inAnim,
+ SArtistEditedUndoRedoScope(TSimpleAnimationCorePtr inAnimCore, Qt3DSDMAnimationHandle inAnim,
TTransactionConsumerPtr inConsumer)
: m_AnimationCore(inAnimCore)
, m_Animation(inAnim)
@@ -71,7 +71,7 @@ struct SLookupCacheDoUndoOp : public ITransaction
std::shared_ptr<SAnimationTrack> m_Animation;
TSimpleAnimationCorePtr m_AnimationCore;
bool m_AddOnDo;
- SLookupCacheDoUndoOp(const char *inFile, int inLine, CUICDMAnimationHandle inAnimHandle,
+ SLookupCacheDoUndoOp(const char *inFile, int inLine, Qt3DSDMAnimationHandle inAnimHandle,
TSimpleAnimationCorePtr inCore, bool addOnDo)
: ITransaction(inFile, inLine)
, m_AnimationCore(inCore)
@@ -107,12 +107,12 @@ struct SLookupCacheDoUndoOp : public ITransaction
}
};
-CUICDMAnimationHandle
+Qt3DSDMAnimationHandle
CAnimationCoreProducer::CreateAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty, size_t inIndex,
EAnimationType inAnimationType, bool inFirstKeyframeDynamic)
{
- CUICDMAnimationHandle retval = m_Data->CreateAnimation(inSlide, inInstance, inProperty, inIndex,
+ Qt3DSDMAnimationHandle retval = m_Data->CreateAnimation(inSlide, inInstance, inProperty, inIndex,
inAnimationType, inFirstKeyframeDynamic);
CREATE_HANDLE_CREATE_TRANSACTION(m_Consumer, retval, m_Data->m_Objects);
@@ -124,7 +124,7 @@ CAnimationCoreProducer::CreateAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInsta
return retval;
}
-void CAnimationCoreProducer::DeleteAnimation(CUICDMAnimationHandle inAnimation)
+void CAnimationCoreProducer::DeleteAnimation(Qt3DSDMAnimationHandle inAnimation)
{
// Ensure animation exists
SAnimationTrack *theAnimation =
@@ -144,7 +144,7 @@ void CAnimationCoreProducer::DeleteAnimation(CUICDMAnimationHandle inAnimation)
theInfo.m_AnimationType);
}
-CUICDMAnimationHandle CAnimationCoreProducer::GetAnimation(Qt3DSDMSlideHandle inSlide,
+Qt3DSDMAnimationHandle CAnimationCoreProducer::GetAnimation(Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty,
size_t inIndex) const
@@ -152,7 +152,7 @@ CUICDMAnimationHandle CAnimationCoreProducer::GetAnimation(Qt3DSDMSlideHandle in
return m_Data->GetAnimation(inSlide, inInstance, inProperty, inIndex);
}
-SAnimationInfo CAnimationCoreProducer::GetAnimationInfo(CUICDMAnimationHandle inAnimation) const
+SAnimationInfo CAnimationCoreProducer::GetAnimationInfo(Qt3DSDMAnimationHandle inAnimation) const
{
return m_Data->GetAnimationInfo(inAnimation);
}
@@ -169,7 +169,7 @@ void CAnimationCoreProducer::GetAnimations(TAnimationInfoList &outAnimations,
return m_Data->GetAnimations(outAnimations, inMaster, inSlide);
}
-void CAnimationCoreProducer::SetFirstKeyframeDynamic(CUICDMAnimationHandle inAnimation,
+void CAnimationCoreProducer::SetFirstKeyframeDynamic(Qt3DSDMAnimationHandle inAnimation,
bool inValue)
{
SAnimationInfo theInfo(m_Data->GetAnimationInfo(inAnimation));
@@ -185,14 +185,14 @@ void CAnimationCoreProducer::SetFirstKeyframeDynamic(CUICDMAnimationHandle inAni
GetSignalSender()->SendFirstKeyframeDynamicSet(inAnimation, inValue);
}
-inline void DirtyKeyframes(CUICDMAnimationHandle inAnimation, THandleObjectMap &inObjects)
+inline void DirtyKeyframes(Qt3DSDMAnimationHandle inAnimation, THandleObjectMap &inObjects)
{
SAnimationTrack *theAnimation = CSimpleAnimationCore::GetAnimationNF(inAnimation, inObjects);
theAnimation->m_KeyframesDirty = true;
}
inline void CreateDirtyKeyframesTransaction(TTransactionConsumerPtr inConsumer,
- CUICDMAnimationHandle inAnimation,
+ Qt3DSDMAnimationHandle inAnimation,
THandleObjectMap &inObjects)
{
if (inConsumer) {
@@ -202,14 +202,14 @@ inline void CreateDirtyKeyframesTransaction(TTransactionConsumerPtr inConsumer,
}
}
-CUICDMKeyframeHandle CAnimationCoreProducer::InsertKeyframe(CUICDMAnimationHandle inAnimation,
+Qt3DSDMKeyframeHandle CAnimationCoreProducer::InsertKeyframe(Qt3DSDMAnimationHandle inAnimation,
const TKeyframe &inKeyframe)
{
SArtistEditedUndoRedoScope __editedScope(m_Data, inAnimation, m_Consumer);
- CUICDMKeyframeHandle retval = m_Data->InsertKeyframe(inAnimation, inKeyframe);
+ Qt3DSDMKeyframeHandle retval = m_Data->InsertKeyframe(inAnimation, inKeyframe);
SAnimationTrack *theAnimation =
CSimpleAnimationCore::GetAnimationNF(inAnimation, m_Data->m_Objects);
- CreateVecInsertTransaction<CUICDMKeyframeHandle>(__FILE__, __LINE__, m_Consumer, retval,
+ CreateVecInsertTransaction<Qt3DSDMKeyframeHandle>(__FILE__, __LINE__, m_Consumer, retval,
theAnimation->m_Keyframes);
CREATE_HANDLE_CREATE_TRANSACTION(m_Consumer, retval, m_Data->m_Objects);
CreateDirtyKeyframesTransaction(m_Consumer, inAnimation, m_Data->m_Objects);
@@ -217,7 +217,7 @@ CUICDMKeyframeHandle CAnimationCoreProducer::InsertKeyframe(CUICDMAnimationHandl
return retval;
}
-void CAnimationCoreProducer::EraseKeyframe(CUICDMKeyframeHandle inKeyframe)
+void CAnimationCoreProducer::EraseKeyframe(Qt3DSDMKeyframeHandle inKeyframe)
{
SKeyframe *theKeyframe = CSimpleAnimationCore::GetKeyframeNF(inKeyframe, m_Data->m_Objects);
SArtistEditedUndoRedoScope __editedScope(m_Data, theKeyframe->m_Animation, m_Consumer);
@@ -226,7 +226,7 @@ void CAnimationCoreProducer::EraseKeyframe(CUICDMKeyframeHandle inKeyframe)
CSimpleAnimationCore::GetAnimationNF(theKeyframe->m_Animation, m_Data->m_Objects);
if (exists(theAnimation->m_Keyframes, std::bind(equal_to<int>(), inKeyframe,
std::placeholders::_1))) {
- CreateVecEraseTransaction<CUICDMKeyframeHandle>(__FILE__, __LINE__, m_Consumer, inKeyframe,
+ CreateVecEraseTransaction<Qt3DSDMKeyframeHandle>(__FILE__, __LINE__, m_Consumer, inKeyframe,
theAnimation->m_Keyframes);
CREATE_HANDLE_DELETE_TRANSACTION(m_Consumer, inKeyframe, m_Data->m_Objects);
CreateDirtyKeyframesTransaction(m_Consumer, theKeyframe->m_Animation, m_Data->m_Objects);
@@ -252,7 +252,7 @@ struct VectorSwapTransaction : public ITransaction
void Undo() override { Do(); }
};
-void CAnimationCoreProducer::DeleteAllKeyframes(CUICDMAnimationHandle inAnimation)
+void CAnimationCoreProducer::DeleteAllKeyframes(Qt3DSDMAnimationHandle inAnimation)
{
// Ensure animation exists
SAnimationTrack *theAnimation =
@@ -263,13 +263,13 @@ void CAnimationCoreProducer::DeleteAllKeyframes(CUICDMAnimationHandle inAnimatio
std::bind(DoCreateHandleDeleteTransaction, __FILE__, __LINE__, m_Consumer,
std::placeholders::_1, std::ref(m_Data->m_Objects)));
if (m_Consumer)
- m_Consumer->OnTransaction(std::make_shared<VectorSwapTransaction<CUICDMKeyframeHandle>>(
+ m_Consumer->OnTransaction(std::make_shared<VectorSwapTransaction<Qt3DSDMKeyframeHandle>>(
__FILE__, __LINE__, std::ref(theAnimation->m_Keyframes)));
theAnimation->m_Keyframes.clear();
}
-CUICDMAnimationHandle
-CAnimationCoreProducer::GetAnimationForKeyframe(CUICDMKeyframeHandle inKeyframe) const
+Qt3DSDMAnimationHandle
+CAnimationCoreProducer::GetAnimationForKeyframe(Qt3DSDMKeyframeHandle inKeyframe) const
{
return m_Data->GetAnimationForKeyframe(inKeyframe);
}
@@ -277,12 +277,12 @@ CAnimationCoreProducer::GetAnimationForKeyframe(CUICDMKeyframeHandle inKeyframe)
struct KeyframeDataTransaction : public ITransaction, public IMergeableTransaction<TKeyframe>
{
TSimpleAnimationCorePtr m_AnimationCore;
- CUICDMKeyframeHandle m_Keyframe;
+ Qt3DSDMKeyframeHandle m_Keyframe;
TKeyframe m_OldData;
TKeyframe m_NewData;
KeyframeDataTransaction(const char *inFile, int inLine, TSimpleAnimationCorePtr animCore,
- CUICDMKeyframeHandle keyframe, TKeyframe oldData, TKeyframe newData)
+ Qt3DSDMKeyframeHandle keyframe, TKeyframe oldData, TKeyframe newData)
: ITransaction(inFile, inLine)
, m_AnimationCore(animCore)
, m_Keyframe(keyframe)
@@ -297,7 +297,7 @@ struct KeyframeDataTransaction : public ITransaction, public IMergeableTransacti
void Update(const TKeyframe &inKeyframe) override { m_NewData = inKeyframe; }
};
-void CAnimationCoreProducer::SetKeyframeData(CUICDMKeyframeHandle inKeyframe,
+void CAnimationCoreProducer::SetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe,
const TKeyframe &inData)
{
SKeyframe *theKeyframe = CSimpleAnimationCore::GetKeyframeNF(inKeyframe, m_Data->m_Objects);
@@ -322,18 +322,18 @@ void CAnimationCoreProducer::SetKeyframeData(CUICDMKeyframeHandle inKeyframe,
}
}
-TKeyframe CAnimationCoreProducer::GetKeyframeData(CUICDMKeyframeHandle inKeyframe) const
+TKeyframe CAnimationCoreProducer::GetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe) const
{
return m_Data->GetKeyframeData(inKeyframe);
}
-void CAnimationCoreProducer::GetKeyframes(CUICDMAnimationHandle inAnimation,
+void CAnimationCoreProducer::GetKeyframes(Qt3DSDMAnimationHandle inAnimation,
TKeyframeHandleList &outKeyframes) const
{
return m_Data->GetKeyframes(inAnimation, outKeyframes);
}
-size_t CAnimationCoreProducer::GetKeyframeCount(CUICDMAnimationHandle inAnimation) const
+size_t CAnimationCoreProducer::GetKeyframeCount(Qt3DSDMAnimationHandle inAnimation) const
{
return m_Data->GetKeyframeCount(inAnimation);
}
@@ -350,7 +350,7 @@ void CAnimationCoreProducer::OffsetAnimations(Qt3DSDMSlideHandle inSlide,
if (theTrack->m_Slide == inSlide && theTrack->m_Instance == inInstance) {
for (size_t keyframeIdx = 0, keyframeEnd = theTrack->m_Keyframes.size();
keyframeIdx < keyframeEnd; ++keyframeIdx) {
- CUICDMKeyframeHandle theKeyframeHandle(theTrack->m_Keyframes[keyframeIdx]);
+ Qt3DSDMKeyframeHandle theKeyframeHandle(theTrack->m_Keyframes[keyframeIdx]);
TKeyframe theCurrentKeyframe = m_Data->GetKeyframeData(theKeyframeHandle);
float seconds = qt3dsdm::GetKeyframeSeconds(theCurrentKeyframe);
@@ -364,29 +364,29 @@ void CAnimationCoreProducer::OffsetAnimations(Qt3DSDMSlideHandle inSlide,
}
}
-void CAnimationCoreProducer::SetIsArtistEdited(CUICDMAnimationHandle inAnimation, bool inEdited)
+void CAnimationCoreProducer::SetIsArtistEdited(Qt3DSDMAnimationHandle inAnimation, bool inEdited)
{
SArtistEditedUndoRedoScope __editedScope(m_Data, inAnimation, m_Consumer);
m_Data->SetIsArtistEdited(inAnimation, inEdited);
}
-bool CAnimationCoreProducer::IsArtistEdited(CUICDMAnimationHandle inAnimation) const
+bool CAnimationCoreProducer::IsArtistEdited(Qt3DSDMAnimationHandle inAnimation) const
{
return m_Data->IsArtistEdited(inAnimation);
}
// Animation Evaluation.
-float CAnimationCoreProducer::EvaluateAnimation(CUICDMAnimationHandle inAnimation,
+float CAnimationCoreProducer::EvaluateAnimation(Qt3DSDMAnimationHandle inAnimation,
float inSeconds) const
{
return m_Data->EvaluateAnimation(inAnimation, inSeconds);
}
-bool CAnimationCoreProducer::KeyframeValid(CUICDMKeyframeHandle inKeyframe) const
+bool CAnimationCoreProducer::KeyframeValid(Qt3DSDMKeyframeHandle inKeyframe) const
{
return m_Data->KeyframeValid(inKeyframe);
}
-bool CAnimationCoreProducer::AnimationValid(CUICDMAnimationHandle inAnimation) const
+bool CAnimationCoreProducer::AnimationValid(Qt3DSDMAnimationHandle inAnimation) const
{
return m_Data->AnimationValid(inAnimation);
}
@@ -406,7 +406,7 @@ void CAnimationCoreProducer::CopyAnimations(Qt3DSDMSlideHandle inSourceSlide,
}
for (size_t idx = 0, end = theAnimations.size(); idx < end; ++idx) {
const SAnimationTrack &newTrack(*theAnimations[idx]);
- CUICDMAnimationHandle theNewAnimation(
+ Qt3DSDMAnimationHandle theNewAnimation(
CreateAnimation(inDestSlide, inDestInstance, newTrack.m_Property, newTrack.m_Index,
newTrack.m_AnimationType, newTrack.m_FirstKeyframeDynamic));
for (size_t keyIdx = 0, keyEnd = newTrack.m_Keyframes.size(); keyIdx < keyEnd; ++keyIdx)
@@ -422,51 +422,51 @@ void CAnimationCoreProducer::SetConsumer(TTransactionConsumerPtr inConsumer)
}
TSignalConnectionPtr CAnimationCoreProducer::ConnectAnimationCreated(
- const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
+ const std::function<void(Qt3DSDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback)
{
return GetSignalProvider()->ConnectAnimationCreated(inCallback);
}
TSignalConnectionPtr CAnimationCoreProducer::ConnectBeforeAnimationDeleted(
- const std::function<void(CUICDMAnimationHandle)> &inCallback)
+ const std::function<void(Qt3DSDMAnimationHandle)> &inCallback)
{
return GetSignalProvider()->ConnectBeforeAnimationDeleted(inCallback);
}
TSignalConnectionPtr CAnimationCoreProducer::ConnectAnimationDeleted(
- const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
+ const std::function<void(Qt3DSDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback)
{
return GetSignalProvider()->ConnectAnimationDeleted(inCallback);
}
TSignalConnectionPtr CAnimationCoreProducer::ConnectKeyframeInserted(
- const std::function<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)>
+ const std::function<void(Qt3DSDMAnimationHandle, Qt3DSDMKeyframeHandle, const TKeyframe &)>
&inCallback)
{
return GetSignalProvider()->ConnectKeyframeInserted(inCallback);
}
TSignalConnectionPtr CAnimationCoreProducer::ConnectBeforeKeyframeErased(
- const std::function<void(CUICDMKeyframeHandle)> &inCallback)
+ const std::function<void(Qt3DSDMKeyframeHandle)> &inCallback)
{
return GetSignalProvider()->ConnectBeforeKeyframeErased(inCallback);
}
TSignalConnectionPtr CAnimationCoreProducer::ConnectKeyframeErased(
- const std::function<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)>
+ const std::function<void(Qt3DSDMAnimationHandle, Qt3DSDMKeyframeHandle, const TKeyframe &)>
&inCallback)
{
return GetSignalProvider()->ConnectKeyframeErased(inCallback);
}
TSignalConnectionPtr CAnimationCoreProducer::ConnectBeforeAllKeyframesErased(
- const std::function<void(CUICDMAnimationHandle)> &inCallback)
+ const std::function<void(Qt3DSDMAnimationHandle)> &inCallback)
{
return GetSignalProvider()->ConnectBeforeAllKeyframesErased(inCallback);
}
TSignalConnectionPtr CAnimationCoreProducer::ConnectKeyframeUpdated(
- const std::function<void(CUICDMKeyframeHandle, const TKeyframe &)> &inCallback)
+ const std::function<void(Qt3DSDMKeyframeHandle, const TKeyframe &)> &inCallback)
{
return GetSignalProvider()->ConnectKeyframeUpdated(inCallback);
}
TSignalConnectionPtr CAnimationCoreProducer::ConnectFirstKeyframeDynamicSet(
- const std::function<void(CUICDMAnimationHandle, bool)> &inCallback)
+ const std::function<void(Qt3DSDMAnimationHandle, bool)> &inCallback)
{
return GetSignalProvider()->ConnectFirstKeyframeDynamicSet(inCallback);
}
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h b/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h
index ac25d887..17603d64 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h
@@ -64,15 +64,15 @@ public:
// IAnimationManger implementation
- CUICDMAnimationHandle CreateAnimation(Qt3DSDMSlideHandle inSlide,
+ Qt3DSDMAnimationHandle CreateAnimation(Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty, size_t inIndex,
EAnimationType inAnimationType,
bool inFirstKeyframeDynamic) override;
- void DeleteAnimation(CUICDMAnimationHandle inAnimation) override;
- CUICDMAnimationHandle GetAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+ void DeleteAnimation(Qt3DSDMAnimationHandle inAnimation) override;
+ Qt3DSDMAnimationHandle GetAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty, size_t inIndex) const override;
- SAnimationInfo GetAnimationInfo(CUICDMAnimationHandle inAnimation) const override;
+ SAnimationInfo GetAnimationInfo(Qt3DSDMAnimationHandle inAnimation) const override;
void GetAnimations(TAnimationHandleList &outAnimations) const override;
void GetAnimations(TAnimationInfoList &outAnimations, Qt3DSDMSlideHandle inMaster,
Qt3DSDMSlideHandle inSlide) const override;
@@ -82,32 +82,32 @@ public:
m_Data->GetSpecificInstanceAnimations(inSlide, inInstance, outAnimations);
}
- void SetFirstKeyframeDynamic(CUICDMAnimationHandle inAnimation, bool inValue) override;
+ void SetFirstKeyframeDynamic(Qt3DSDMAnimationHandle inAnimation, bool inValue) override;
- CUICDMKeyframeHandle InsertKeyframe(CUICDMAnimationHandle inAnimation,
+ Qt3DSDMKeyframeHandle InsertKeyframe(Qt3DSDMAnimationHandle inAnimation,
const TKeyframe &inKeyframe) override;
- void EraseKeyframe(CUICDMKeyframeHandle) override;
- void DeleteAllKeyframes(CUICDMAnimationHandle inAnimation) override;
- CUICDMAnimationHandle GetAnimationForKeyframe(CUICDMKeyframeHandle inKeyframe) const override;
- TKeyframe GetKeyframeData(CUICDMKeyframeHandle inKeyframe) const override;
- void SetKeyframeData(CUICDMKeyframeHandle inKeyframe, const TKeyframe &inData) override;
- void GetKeyframes(CUICDMAnimationHandle inAnimation, TKeyframeHandleList &outKeyframes) const override;
- size_t GetKeyframeCount(CUICDMAnimationHandle inAnimation) const override;
- bool IsFirstKeyframe(CUICDMKeyframeHandle inKeyframe) const override
+ void EraseKeyframe(Qt3DSDMKeyframeHandle) override;
+ void DeleteAllKeyframes(Qt3DSDMAnimationHandle inAnimation) override;
+ Qt3DSDMAnimationHandle GetAnimationForKeyframe(Qt3DSDMKeyframeHandle inKeyframe) const override;
+ TKeyframe GetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe) const override;
+ void SetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe, const TKeyframe &inData) override;
+ void GetKeyframes(Qt3DSDMAnimationHandle inAnimation, TKeyframeHandleList &outKeyframes) const override;
+ size_t GetKeyframeCount(Qt3DSDMAnimationHandle inAnimation) const override;
+ bool IsFirstKeyframe(Qt3DSDMKeyframeHandle inKeyframe) const override
{
return m_Data->IsFirstKeyframe(inKeyframe);
}
void OffsetAnimations(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
long inMillisecondOffset) override;
- void SetIsArtistEdited(CUICDMAnimationHandle inAnimation, bool inEdited = true) override;
- bool IsArtistEdited(CUICDMAnimationHandle inAnimation) const override;
+ void SetIsArtistEdited(Qt3DSDMAnimationHandle inAnimation, bool inEdited = true) override;
+ bool IsArtistEdited(Qt3DSDMAnimationHandle inAnimation) const override;
// Animation Evaluation.
- float EvaluateAnimation(CUICDMAnimationHandle inAnimation, float inSeconds) const override;
+ float EvaluateAnimation(Qt3DSDMAnimationHandle inAnimation, float inSeconds) const override;
- bool KeyframeValid(CUICDMKeyframeHandle inKeyframe) const override;
- bool AnimationValid(CUICDMAnimationHandle inAnimation) const override;
+ bool KeyframeValid(Qt3DSDMKeyframeHandle inKeyframe) const override;
+ bool AnimationValid(Qt3DSDMAnimationHandle inAnimation) const override;
void CopyAnimations(Qt3DSDMSlideHandle inSourceSlide, Qt3DSDMInstanceHandle inSourceInstance,
Qt3DSDMSlideHandle inDestSlide, Qt3DSDMInstanceHandle inDestInstance) override;
@@ -116,27 +116,27 @@ public:
void SetConsumer(TTransactionConsumerPtr inConsumer) override;
TSignalConnectionPtr ConnectAnimationCreated(
- const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
+ const std::function<void(Qt3DSDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) override;
virtual TSignalConnectionPtr
- ConnectBeforeAnimationDeleted(const std::function<void(CUICDMAnimationHandle)> &inCallback) override;
+ ConnectBeforeAnimationDeleted(const std::function<void(Qt3DSDMAnimationHandle)> &inCallback) override;
TSignalConnectionPtr ConnectAnimationDeleted(
- const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
+ const std::function<void(Qt3DSDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) override;
TSignalConnectionPtr ConnectKeyframeInserted(
- const std::function<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)>
+ const std::function<void(Qt3DSDMAnimationHandle, Qt3DSDMKeyframeHandle, const TKeyframe &)>
&inCallback) override;
virtual TSignalConnectionPtr
- ConnectBeforeKeyframeErased(const std::function<void(CUICDMKeyframeHandle)> &inCallback) override;
+ ConnectBeforeKeyframeErased(const std::function<void(Qt3DSDMKeyframeHandle)> &inCallback) override;
TSignalConnectionPtr ConnectKeyframeErased(
- const std::function<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)>
+ const std::function<void(Qt3DSDMAnimationHandle, Qt3DSDMKeyframeHandle, const TKeyframe &)>
&inCallback) override;
virtual TSignalConnectionPtr
- ConnectBeforeAllKeyframesErased(const std::function<void(CUICDMAnimationHandle)> &inCallback) override;
+ ConnectBeforeAllKeyframesErased(const std::function<void(Qt3DSDMAnimationHandle)> &inCallback) override;
TSignalConnectionPtr ConnectKeyframeUpdated(
- const std::function<void(CUICDMKeyframeHandle, const TKeyframe &)> &inCallback) override;
+ const std::function<void(Qt3DSDMKeyframeHandle, const TKeyframe &)> &inCallback) override;
TSignalConnectionPtr ConnectFirstKeyframeDynamicSet(
- const std::function<void(CUICDMAnimationHandle, bool)> &inCallback) override;
+ const std::function<void(Qt3DSDMAnimationHandle, bool)> &inCallback) override;
private:
void InitSignaller();
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp
index 4aa55c89..b2f35538 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp
@@ -31,19 +31,19 @@
namespace qt3dsdm {
-CUICDMActionHandle CSimpleActionCore::CreateAction(Qt3DSDMInstanceHandle inInstance,
+Qt3DSDMActionHandle CSimpleActionCore::CreateAction(Qt3DSDMInstanceHandle inInstance,
Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inOwner,
SLong4 inTriggerTargetObjects)
{
int nextId = GetNextId();
- CUICDMActionHandle retval = CreateActionWithHandle(nextId, inInstance, inSlide, inOwner);
+ Qt3DSDMActionHandle retval = CreateActionWithHandle(nextId, inInstance, inSlide, inOwner);
SetTriggerObject(retval, inTriggerTargetObjects);
SetTargetObject(retval, inTriggerTargetObjects);
return retval;
}
-void CSimpleActionCore::DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance)
+void CSimpleActionCore::DeleteAction(Qt3DSDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance)
{
SAction *theAction = GetActionNF(inAction, m_Objects);
outInstance = theAction->m_ActionInfo.m_Instance;
@@ -52,7 +52,7 @@ void CSimpleActionCore::DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanc
EraseHandle(inAction, m_Objects);
}
-const SActionInfo &CSimpleActionCore::GetActionInfo(CUICDMActionHandle inAction) const
+const SActionInfo &CSimpleActionCore::GetActionInfo(Qt3DSDMActionHandle inAction) const
{
const SAction *theAction = GetActionNF(inAction, m_Objects);
return theAction->m_ActionInfo;
@@ -98,12 +98,12 @@ void CSimpleActionCore::GetActions(TActionHandleList &outActions) const
outActions.clear();
outActions.reserve(m_Objects.size());
do_all(m_Objects,
- std::bind(MaybeAddObject<SAction, CUICDMActionHandle>,
+ std::bind(MaybeAddObject<SAction, Qt3DSDMActionHandle>,
std::placeholders::_1, std::ref(outActions)));
}
// Return the instance that was allocated for this action.
-Qt3DSDMInstanceHandle CSimpleActionCore::GetActionInstance(CUICDMActionHandle inAction) const
+Qt3DSDMInstanceHandle CSimpleActionCore::GetActionInstance(Qt3DSDMActionHandle inAction) const
{
return GetActionNF(inAction, m_Objects)->m_ActionInfo.m_Instance;
}
@@ -119,7 +119,7 @@ inline bool ActionInstanceMatches(const THandleObjectPair &inPair, Qt3DSDMInstan
}
// Reverse lookup into the action system so you can match actions to instances.
-CUICDMActionHandle
+Qt3DSDMActionHandle
CSimpleActionCore::GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const
{
THandleObjectMap::const_iterator theAction =
@@ -131,34 +131,34 @@ CSimpleActionCore::GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) c
}
// Action Properties
-void CSimpleActionCore::SetTriggerObject(CUICDMActionHandle inAction,
+void CSimpleActionCore::SetTriggerObject(Qt3DSDMActionHandle inAction,
const SObjectRefType &inTriggerObject)
{
SAction *theAction = GetActionNF(inAction, m_Objects);
theAction->m_ActionInfo.m_TriggerObject = inTriggerObject;
}
-void CSimpleActionCore::SetTargetObject(CUICDMActionHandle inAction,
+void CSimpleActionCore::SetTargetObject(Qt3DSDMActionHandle inAction,
const SObjectRefType &inTargetObject)
{
SAction *theAction = GetActionNF(inAction, m_Objects);
theAction->m_ActionInfo.m_TargetObject = inTargetObject;
}
-void CSimpleActionCore::SetEvent(CUICDMActionHandle inAction, const wstring &inEventHandle)
+void CSimpleActionCore::SetEvent(Qt3DSDMActionHandle inAction, const wstring &inEventHandle)
{
SAction *theAction = GetActionNF(inAction, m_Objects);
theAction->m_ActionInfo.m_Event = inEventHandle;
}
-void CSimpleActionCore::SetHandler(CUICDMActionHandle inAction, const wstring &inHandlerHandle)
+void CSimpleActionCore::SetHandler(Qt3DSDMActionHandle inAction, const wstring &inHandlerHandle)
{
SAction *theAction = GetActionNF(inAction, m_Objects);
theAction->m_ActionInfo.m_Handler = inHandlerHandle;
}
// Action Argument
-CUICDMHandlerArgHandle CSimpleActionCore::AddHandlerArgument(CUICDMActionHandle inAction,
+Qt3DSDMHandlerArgHandle CSimpleActionCore::AddHandlerArgument(Qt3DSDMActionHandle inAction,
const TCharStr &inName,
HandlerArgumentType::Value inArgType,
DataModelDataType::Value inValueType)
@@ -167,7 +167,7 @@ CUICDMHandlerArgHandle CSimpleActionCore::AddHandlerArgument(CUICDMActionHandle
return AddHandlerArgumentWithHandle(nextId, inAction, inName, inArgType, inValueType);
}
-void CSimpleActionCore::RemoveHandlerArgument(CUICDMHandlerArgHandle inHandlerArgument)
+void CSimpleActionCore::RemoveHandlerArgument(Qt3DSDMHandlerArgHandle inHandlerArgument)
{
SHandlerArgument *theHandlerArgument = GetHandlerArgumentNF(inHandlerArgument, m_Objects);
SAction *theAction = GetActionNF(theHandlerArgument->m_HandlerArgInfo.m_Action, m_Objects);
@@ -177,7 +177,7 @@ void CSimpleActionCore::RemoveHandlerArgument(CUICDMHandlerArgHandle inHandlerAr
}
const SHandlerArgumentInfo &
-CSimpleActionCore::GetHandlerArgumentInfo(CUICDMHandlerArgHandle inHandlerArgument) const
+CSimpleActionCore::GetHandlerArgumentInfo(Qt3DSDMHandlerArgHandle inHandlerArgument) const
{
if (HandleValid(inHandlerArgument)) {
const SHandlerArgument *theHandlerArgument =
@@ -189,7 +189,7 @@ CSimpleActionCore::GetHandlerArgumentInfo(CUICDMHandlerArgHandle inHandlerArgume
}
}
-void CSimpleActionCore::GetHandlerArguments(CUICDMActionHandle inAction,
+void CSimpleActionCore::GetHandlerArguments(Qt3DSDMActionHandle inAction,
THandlerArgHandleList &outHandlerArguments) const
{
const SAction *theAction = GetActionNF(inAction, m_Objects);
@@ -197,14 +197,14 @@ void CSimpleActionCore::GetHandlerArguments(CUICDMActionHandle inAction,
}
// Action Argument Properties
-void CSimpleActionCore::GetHandlerArgumentValue(CUICDMHandlerArgHandle inHandlerArgument,
+void CSimpleActionCore::GetHandlerArgumentValue(Qt3DSDMHandlerArgHandle inHandlerArgument,
SValue &outValue) const
{
const SHandlerArgument *theHandlerArgument = GetHandlerArgumentNF(inHandlerArgument, m_Objects);
outValue = theHandlerArgument->m_HandlerArgInfo.m_Value;
}
-void CSimpleActionCore::SetHandlerArgumentValue(CUICDMHandlerArgHandle inHandlerArgument,
+void CSimpleActionCore::SetHandlerArgumentValue(Qt3DSDMHandlerArgHandle inHandlerArgument,
const SValue &inValue)
{
SHandlerArgument *theHandlerArgument = GetHandlerArgumentNF(inHandlerArgument, m_Objects);
@@ -212,7 +212,7 @@ void CSimpleActionCore::SetHandlerArgumentValue(CUICDMHandlerArgHandle inHandler
}
// Helper functions
-CUICDMActionHandle CSimpleActionCore::CreateActionWithHandle(int inHandle,
+Qt3DSDMActionHandle CSimpleActionCore::CreateActionWithHandle(int inHandle,
Qt3DSDMInstanceHandle inInstance,
Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inOwner)
@@ -224,8 +224,8 @@ CUICDMActionHandle CSimpleActionCore::CreateActionWithHandle(int inHandle,
return inHandle;
}
-CUICDMHandlerArgHandle
-CSimpleActionCore::AddHandlerArgumentWithHandle(int inHandle, CUICDMActionHandle inAction,
+Qt3DSDMHandlerArgHandle
+CSimpleActionCore::AddHandlerArgumentWithHandle(int inHandle, Qt3DSDMActionHandle inAction,
const TCharStr &inName, HandlerArgumentType::Value inArgType,
DataModelDataType::Value inValueType)
{
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h b/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h
index 8b3626a9..1e229f18 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h
@@ -58,7 +58,7 @@ struct SHandlerArgument : public CHandleObject
SHandlerArgument() {}
- SHandlerArgument(int inHandle, CUICDMActionHandle inAction, const TCharStr &inName,
+ SHandlerArgument(int inHandle, Qt3DSDMActionHandle inAction, const TCharStr &inName,
HandlerArgumentType::Value inArgType, DataModelDataType::Value inValueType)
: CHandleObject(inHandle)
, m_HandlerArgInfo(inAction, inName, inArgType, inValueType)
@@ -82,10 +82,10 @@ public: // Use
IStringTable &GetStringTable() const override { return *m_StringTable.get(); }
TStringTablePtr GetStringTablePtr() const override { return m_StringTable; }
// Action
- CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide,
+ Qt3DSDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inOwner, SLong4 inTriggerTargetObjects) override;
- void DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) override;
- const SActionInfo &GetActionInfo(CUICDMActionHandle inAction) const override;
+ void DeleteAction(Qt3DSDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) override;
+ const SActionInfo &GetActionInfo(Qt3DSDMActionHandle inAction) const override;
void GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
TActionHandleList &outActions) const override;
void GetActions(Qt3DSDMSlideHandle inSlide, TActionHandleList &outActions) const override;
@@ -93,38 +93,38 @@ public: // Use
void GetActions(TActionHandleList &outActions) const override;
// Return the instance that was allocated for this action.
- Qt3DSDMInstanceHandle GetActionInstance(CUICDMActionHandle inAction) const override;
+ Qt3DSDMInstanceHandle GetActionInstance(Qt3DSDMActionHandle inAction) const override;
// Reverse lookup into the action system so you can match actions to instances.
- CUICDMActionHandle GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const override;
+ Qt3DSDMActionHandle GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const override;
// Action Properties
- void SetTriggerObject(CUICDMActionHandle inAction, const SObjectRefType &inTriggerObject) override;
- void SetTargetObject(CUICDMActionHandle inAction, const SObjectRefType &inTargetObject) override;
- void SetEvent(CUICDMActionHandle inAction, const wstring &inEvent) override;
- void SetHandler(CUICDMActionHandle inAction, const wstring &inHandler) override;
+ void SetTriggerObject(Qt3DSDMActionHandle inAction, const SObjectRefType &inTriggerObject) override;
+ void SetTargetObject(Qt3DSDMActionHandle inAction, const SObjectRefType &inTargetObject) override;
+ void SetEvent(Qt3DSDMActionHandle inAction, const wstring &inEvent) override;
+ void SetHandler(Qt3DSDMActionHandle inAction, const wstring &inHandler) override;
// Action Argument
- CUICDMHandlerArgHandle AddHandlerArgument(CUICDMActionHandle inAction, const TCharStr &inName,
+ Qt3DSDMHandlerArgHandle AddHandlerArgument(Qt3DSDMActionHandle inAction, const TCharStr &inName,
HandlerArgumentType::Value inArgType,
DataModelDataType::Value inValueType) override;
- void RemoveHandlerArgument(CUICDMHandlerArgHandle inHandlerArgument) override;
+ void RemoveHandlerArgument(Qt3DSDMHandlerArgHandle inHandlerArgument) override;
const SHandlerArgumentInfo &
- GetHandlerArgumentInfo(CUICDMHandlerArgHandle inHandlerArgument) const override;
- void GetHandlerArguments(CUICDMActionHandle inAction,
+ GetHandlerArgumentInfo(Qt3DSDMHandlerArgHandle inHandlerArgument) const override;
+ void GetHandlerArguments(Qt3DSDMActionHandle inAction,
THandlerArgHandleList &outHandlerArguments) const override;
// Action Argument Properties
- void GetHandlerArgumentValue(CUICDMHandlerArgHandle inHandlerArgument, SValue &outValue) const override;
- void SetHandlerArgumentValue(CUICDMHandlerArgHandle inHandlerArgument, const SValue &inValue) override;
+ void GetHandlerArgumentValue(Qt3DSDMHandlerArgHandle inHandlerArgument, SValue &outValue) const override;
+ void SetHandlerArgumentValue(Qt3DSDMHandlerArgHandle inHandlerArgument, const SValue &inValue) override;
// CHandleBase
bool HandleValid(int inHandle) const override { return CHandleBase::HandleValid(inHandle); }
// Helper functions
- CUICDMActionHandle CreateActionWithHandle(int inHandle, Qt3DSDMInstanceHandle inInstance,
+ Qt3DSDMActionHandle CreateActionWithHandle(int inHandle, Qt3DSDMInstanceHandle inInstance,
Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inOwner);
- CUICDMHandlerArgHandle AddHandlerArgumentWithHandle(int inHandle, CUICDMActionHandle inAction,
+ Qt3DSDMHandlerArgHandle AddHandlerArgumentWithHandle(int inHandle, Qt3DSDMActionHandle inAction,
const TCharStr &inName,
HandlerArgumentType::Value inArgType,
DataModelDataType::Value inValueType);
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
index 145bacaa..05094bd2 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
@@ -50,7 +50,7 @@ using namespace boost;
namespace qt3dsdm {
-CUICDMAnimationHandle
+Qt3DSDMAnimationHandle
CSimpleAnimationCore::CreateAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty, size_t inIndex,
EAnimationType inAnimationType, bool inFirstKeyframeDynamic)
@@ -59,13 +59,13 @@ CSimpleAnimationCore::CreateAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanc
throw AnimationExists(L"");
int nextId = GetNextId();
- CUICDMAnimationHandle retval = CreateAnimationWithHandle(
+ Qt3DSDMAnimationHandle retval = CreateAnimationWithHandle(
nextId, inSlide, inInstance, inProperty, inIndex, inAnimationType, inFirstKeyframeDynamic);
AddAnimationToLookupCache(retval);
return retval;
}
-void CSimpleAnimationCore::DeleteAnimation(CUICDMAnimationHandle inAnimation)
+void CSimpleAnimationCore::DeleteAnimation(Qt3DSDMAnimationHandle inAnimation)
{
RemoveAnimationFromLookupCache(inAnimation);
SAnimationTrack *theItem = GetAnimationNF(inAnimation, m_Objects);
@@ -85,7 +85,7 @@ void CSimpleAnimationCore::EnsureAnimationCache() const
}
}
-CUICDMAnimationHandle CSimpleAnimationCore::GetAnimation(Qt3DSDMSlideHandle inSlide,
+Qt3DSDMAnimationHandle CSimpleAnimationCore::GetAnimation(Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty,
size_t inIndex) const
@@ -106,7 +106,7 @@ CUICDMAnimationHandle CSimpleAnimationCore::GetAnimation(Qt3DSDMSlideHandle inSl
return 0;
}
-SAnimationInfo CSimpleAnimationCore::GetAnimationInfo(CUICDMAnimationHandle inAnimation) const
+SAnimationInfo CSimpleAnimationCore::GetAnimationInfo(Qt3DSDMAnimationHandle inAnimation) const
{
if (m_Objects.find(inAnimation) != m_Objects.end()) {
const SAnimationTrack *theItem = GetAnimationNF(inAnimation, m_Objects);
@@ -177,7 +177,7 @@ void CSimpleAnimationCore::GetSpecificInstanceAnimations(Qt3DSDMSlideHandle inSl
outAnimations.push_back(iter->second->m_Handle);
}
-void CSimpleAnimationCore::SetFirstKeyframeDynamic(CUICDMAnimationHandle inAnimation, bool inValue)
+void CSimpleAnimationCore::SetFirstKeyframeDynamic(Qt3DSDMAnimationHandle inAnimation, bool inValue)
{
SAnimationTrack *theItem = GetAnimationNF(inAnimation, m_Objects);
theItem->m_FirstKeyframeDynamic = inValue;
@@ -191,7 +191,7 @@ inline void CheckKeyframeType(EAnimationType inExpected, const TKeyframe &inKeyf
}
// keyframe manipulation
-CUICDMKeyframeHandle CSimpleAnimationCore::InsertKeyframe(CUICDMAnimationHandle inAnimation,
+Qt3DSDMKeyframeHandle CSimpleAnimationCore::InsertKeyframe(Qt3DSDMAnimationHandle inAnimation,
const TKeyframe &inKeyframe)
{
SAnimationTrack *theItem = GetAnimationNF(inAnimation, m_Objects);
@@ -205,7 +205,7 @@ CUICDMKeyframeHandle CSimpleAnimationCore::InsertKeyframe(CUICDMAnimationHandle
return nextId;
}
-void CSimpleAnimationCore::EraseKeyframe(CUICDMKeyframeHandle inKeyframe)
+void CSimpleAnimationCore::EraseKeyframe(Qt3DSDMKeyframeHandle inKeyframe)
{
SKeyframe *theKeyframe = GetKeyframeNF(inKeyframe, m_Objects);
int theAnimHandle(theKeyframe->m_Animation);
@@ -216,7 +216,7 @@ void CSimpleAnimationCore::EraseKeyframe(CUICDMKeyframeHandle inKeyframe)
SetIsArtistEdited(theAnimHandle);
}
-void CSimpleAnimationCore::DeleteAllKeyframes(CUICDMAnimationHandle inAnimation)
+void CSimpleAnimationCore::DeleteAllKeyframes(Qt3DSDMAnimationHandle inAnimation)
{
SAnimationTrack *theItem = GetAnimationNF(inAnimation, m_Objects);
do_all(theItem->m_Keyframes, std::bind(EraseHandle,
@@ -225,27 +225,27 @@ void CSimpleAnimationCore::DeleteAllKeyframes(CUICDMAnimationHandle inAnimation)
SetIsArtistEdited(inAnimation);
}
-CUICDMAnimationHandle
-CSimpleAnimationCore::GetAnimationForKeyframe(CUICDMKeyframeHandle inKeyframe) const
+Qt3DSDMAnimationHandle
+CSimpleAnimationCore::GetAnimationForKeyframe(Qt3DSDMKeyframeHandle inKeyframe) const
{
const SKeyframe *theKeyframe = GetKeyframeNF(inKeyframe, m_Objects);
return theKeyframe->m_Animation;
}
-TKeyframe CSimpleAnimationCore::GetKeyframeData(CUICDMKeyframeHandle inKeyframe) const
+TKeyframe CSimpleAnimationCore::GetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe) const
{
const SKeyframe *theKeyframe = GetKeyframeNF(inKeyframe, m_Objects);
return theKeyframe->m_Keyframe;
}
-void CSimpleAnimationCore::SetKeyframeData(CUICDMKeyframeHandle inKeyframe, const TKeyframe &inData)
+void CSimpleAnimationCore::SetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe, const TKeyframe &inData)
{
DoSetKeyframeData(inKeyframe, inData);
SKeyframe *theKeyframe = GetKeyframeNF(inKeyframe, m_Objects);
SetIsArtistEdited(theKeyframe->m_Animation);
}
-void CSimpleAnimationCore::DoSetKeyframeData(CUICDMKeyframeHandle inKeyframe,
+void CSimpleAnimationCore::DoSetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe,
const TKeyframe &inData)
{
SKeyframe *theKeyframe = GetKeyframeNF(inKeyframe, m_Objects);
@@ -278,7 +278,7 @@ void CheckKeyframesSorted(const SAnimationTrack *theItem, const THandleObjectMap
}
}
-void CSimpleAnimationCore::GetKeyframes(CUICDMAnimationHandle inAnimation,
+void CSimpleAnimationCore::GetKeyframes(Qt3DSDMAnimationHandle inAnimation,
TKeyframeHandleList &outKeyframes) const
{
const SAnimationTrack *theItem = GetAnimationNF(inAnimation, m_Objects);
@@ -286,15 +286,15 @@ void CSimpleAnimationCore::GetKeyframes(CUICDMAnimationHandle inAnimation,
outKeyframes = theItem->m_Keyframes;
}
-size_t CSimpleAnimationCore::GetKeyframeCount(CUICDMAnimationHandle inAnimation) const
+size_t CSimpleAnimationCore::GetKeyframeCount(Qt3DSDMAnimationHandle inAnimation) const
{
const SAnimationTrack *theItem = GetAnimationNF(inAnimation, m_Objects);
return theItem->m_Keyframes.size();
}
-bool CSimpleAnimationCore::IsFirstKeyframe(CUICDMKeyframeHandle inKeyframe) const
+bool CSimpleAnimationCore::IsFirstKeyframe(Qt3DSDMKeyframeHandle inKeyframe) const
{
- CUICDMAnimationHandle theAnimation = GetAnimationForKeyframe(inKeyframe);
+ Qt3DSDMAnimationHandle theAnimation = GetAnimationForKeyframe(inKeyframe);
if (theAnimation.Valid()) {
const SAnimationTrack *theItem = GetAnimationNF(theAnimation, m_Objects);
return theItem->m_Keyframes.size() && theItem->m_Keyframes[0] == inKeyframe;
@@ -308,7 +308,7 @@ void CSimpleAnimationCore::OffsetAnimations(Qt3DSDMSlideHandle /*inSlide*/,
throw std::runtime_error("unimplemented");
}
-void CSimpleAnimationCore::SetIsArtistEdited(CUICDMAnimationHandle inAnimation, bool inEdited)
+void CSimpleAnimationCore::SetIsArtistEdited(Qt3DSDMAnimationHandle inAnimation, bool inEdited)
{
if (m_Objects.find(inAnimation) == m_Objects.end()) {
Q_ASSERT(false);
@@ -319,7 +319,7 @@ void CSimpleAnimationCore::SetIsArtistEdited(CUICDMAnimationHandle inAnimation,
theItem->m_ArtistEdited = inEdited;
}
-bool CSimpleAnimationCore::IsArtistEdited(CUICDMAnimationHandle inAnimation) const
+bool CSimpleAnimationCore::IsArtistEdited(Qt3DSDMAnimationHandle inAnimation) const
{
if (m_Objects.find(inAnimation) == m_Objects.end()) {
return false;
@@ -373,7 +373,7 @@ inline float DoBezierEvaluation(float inSeconds, const SBezierKeyframe &inK1,
}
// Animation Evaluation.
-float CSimpleAnimationCore::EvaluateAnimation(CUICDMAnimationHandle inAnimation,
+float CSimpleAnimationCore::EvaluateAnimation(Qt3DSDMAnimationHandle inAnimation,
float inSeconds) const
{
const SAnimationTrack *theItem = GetAnimationNF(inAnimation, m_Objects);
@@ -425,17 +425,17 @@ float CSimpleAnimationCore::EvaluateAnimation(CUICDMAnimationHandle inAnimation,
}
}
-bool CSimpleAnimationCore::KeyframeValid(CUICDMKeyframeHandle inKeyframe) const
+bool CSimpleAnimationCore::KeyframeValid(Qt3DSDMKeyframeHandle inKeyframe) const
{
return HandleObjectValid<SKeyframe>(inKeyframe, m_Objects);
}
-bool CSimpleAnimationCore::AnimationValid(CUICDMAnimationHandle inAnimation) const
+bool CSimpleAnimationCore::AnimationValid(Qt3DSDMAnimationHandle inAnimation) const
{
return HandleObjectValid<SAnimationTrack>(inAnimation, m_Objects);
}
-CUICDMAnimationHandle CSimpleAnimationCore::CreateAnimationWithHandle(
+Qt3DSDMAnimationHandle CSimpleAnimationCore::CreateAnimationWithHandle(
int inHandle, Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
bool inFirstKeyframeDynamic)
@@ -448,13 +448,13 @@ CUICDMAnimationHandle CSimpleAnimationCore::CreateAnimationWithHandle(
return inHandle;
}
-void CSimpleAnimationCore::AddAnimationToLookupCache(CUICDMAnimationHandle inAnimation) const
+void CSimpleAnimationCore::AddAnimationToLookupCache(Qt3DSDMAnimationHandle inAnimation) const
{
THandleObjectMap::const_iterator theAnim = m_Objects.find(inAnimation);
if (theAnim != m_Objects.end())
AddAnimationToLookupCache(static_pointer_cast<SAnimationTrack>(theAnim->second));
}
-void CSimpleAnimationCore::RemoveAnimationFromLookupCache(CUICDMAnimationHandle inAnimation) const
+void CSimpleAnimationCore::RemoveAnimationFromLookupCache(Qt3DSDMAnimationHandle inAnimation) const
{
THandleObjectMap::const_iterator theAnim = m_Objects.find(inAnimation);
if (theAnim != m_Objects.end())
@@ -501,7 +501,7 @@ void CSimpleAnimationCore::RemoveAnimationFromLookupCache(
// UICDMAnimation.h function implementations
//================================================================================
-void CopyKeyframe(CUICDMAnimationHandle inAnimation, CUICDMKeyframeHandle inKeyframe,
+void CopyKeyframe(Qt3DSDMAnimationHandle inAnimation, Qt3DSDMKeyframeHandle inKeyframe,
const IAnimationCore &inSourceAnimationCore, IAnimationCore &inDestAnimationCore)
{
TKeyframe theData = inSourceAnimationCore.GetKeyframeData(inKeyframe);
@@ -509,35 +509,35 @@ void CopyKeyframe(CUICDMAnimationHandle inAnimation, CUICDMKeyframeHandle inKeyf
}
void CopyKeyframes(const IAnimationCore &inSourceAnimationCore, IAnimationCore &inDestAnimationCore,
- CUICDMAnimationHandle inDestAnimation, const TKeyframeHandleList &inKeyframes)
+ Qt3DSDMAnimationHandle inDestAnimation, const TKeyframeHandleList &inKeyframes)
{
do_all(inKeyframes,
std::bind(CopyKeyframe, inDestAnimation, std::placeholders::_1,
std::cref(inSourceAnimationCore), std::ref(inDestAnimationCore)));
}
-CUICDMAnimationHandle CopyAnimation(TAnimationCorePtr inAnimationCore,
- CUICDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inNewSlide,
+Qt3DSDMAnimationHandle CopyAnimation(TAnimationCorePtr inAnimationCore,
+ Qt3DSDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inNewSlide,
Qt3DSDMInstanceHandle inNewInstance,
Qt3DSDMPropertyHandle inNewProperty, size_t inNewIndex)
{
TKeyframeHandleList theKeyframes;
inAnimationCore->GetKeyframes(inAnimation, theKeyframes);
SAnimationInfo theInfo(inAnimationCore->GetAnimationInfo(inAnimation));
- CUICDMAnimationHandle theAnimation =
+ Qt3DSDMAnimationHandle theAnimation =
inAnimationCore->CreateAnimation(inNewSlide, inNewInstance, inNewProperty, inNewIndex,
theInfo.m_AnimationType, theInfo.m_DynamicFirstKeyframe);
CopyKeyframes(*inAnimationCore, *inAnimationCore, theAnimation, theKeyframes);
return theAnimation;
}
-SBezierKeyframe GetBezierKeyframeData(CUICDMKeyframeHandle inKeyframe,
+SBezierKeyframe GetBezierKeyframeData(Qt3DSDMKeyframeHandle inKeyframe,
const IAnimationCore &inAnimationCore)
{
return get<SBezierKeyframe>(inAnimationCore.GetKeyframeData(inKeyframe));
}
-SEaseInEaseOutKeyframe GetEaseInEaseOutKeyframeData(CUICDMKeyframeHandle inKeyframe,
+SEaseInEaseOutKeyframe GetEaseInEaseOutKeyframeData(Qt3DSDMKeyframeHandle inKeyframe,
const IAnimationCore &inAnimationCore)
{
return get<SEaseInEaseOutKeyframe>(inAnimationCore.GetKeyframeData(inKeyframe));
@@ -549,7 +549,7 @@ TKeyframeHandleList::iterator SafeIncrementIterator(TKeyframeHandleList::iterato
return inIter == inEnd ? inEnd : inIter + 1;
}
-void GetKeyframesAsBezier(CUICDMAnimationHandle inAnimation, const IAnimationCore &inAnimationCore,
+void GetKeyframesAsBezier(Qt3DSDMAnimationHandle inAnimation, const IAnimationCore &inAnimationCore,
TBezierKeyframeList &outKeyframes)
{
SAnimationInfo theInfo(inAnimationCore.GetAnimationInfo(inAnimation));
@@ -568,7 +568,7 @@ void GetKeyframesAsBezier(CUICDMAnimationHandle inAnimation, const IAnimationCor
TKeyframeHandleList::iterator theEndKeyframe = theKeyframes.end();
- typedef std::function<SEaseInEaseOutKeyframe(CUICDMKeyframeHandle)> TConvertFunc;
+ typedef std::function<SEaseInEaseOutKeyframe(Qt3DSDMKeyframeHandle)> TConvertFunc;
TConvertFunc theDataConverter(
std::bind(GetEaseInEaseOutKeyframeData, std::placeholders::_1,
std::cref(inAnimationCore)));
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h
index cbc2aa01..90f0e3fd 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h
@@ -116,49 +116,49 @@ public: // Use
}
TStringTablePtr GetStringTablePtr() const { return m_StringTable; }
- CUICDMAnimationHandle CreateAnimation(Qt3DSDMSlideHandle inSlide,
+ Qt3DSDMAnimationHandle CreateAnimation(Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty, size_t inIndex,
EAnimationType inAnimationType,
bool inFirstKeyframeDynamic) override;
- void DeleteAnimation(CUICDMAnimationHandle inAnimation) override;
- CUICDMAnimationHandle GetAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+ void DeleteAnimation(Qt3DSDMAnimationHandle inAnimation) override;
+ Qt3DSDMAnimationHandle GetAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty, size_t inIndex) const override;
- SAnimationInfo GetAnimationInfo(CUICDMAnimationHandle inAnimation) const override;
+ SAnimationInfo GetAnimationInfo(Qt3DSDMAnimationHandle inAnimation) const override;
void GetAnimations(TAnimationHandleList &outAnimations) const override;
void GetAnimations(TAnimationInfoList &outAnimations, Qt3DSDMSlideHandle inMaster,
Qt3DSDMSlideHandle inSlide) const override;
void GetSpecificInstanceAnimations(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
TAnimationHandleList &outAnimations) override;
- void SetFirstKeyframeDynamic(CUICDMAnimationHandle inAnimation, bool inValue) override;
+ void SetFirstKeyframeDynamic(Qt3DSDMAnimationHandle inAnimation, bool inValue) override;
// keyframe manipulation
- CUICDMKeyframeHandle InsertKeyframe(CUICDMAnimationHandle inAnimation,
+ Qt3DSDMKeyframeHandle InsertKeyframe(Qt3DSDMAnimationHandle inAnimation,
const TKeyframe &inKeyframe) override;
- void EraseKeyframe(CUICDMKeyframeHandle inKeyframe) override;
- void DeleteAllKeyframes(CUICDMAnimationHandle inAnimation) override;
- CUICDMAnimationHandle GetAnimationForKeyframe(CUICDMKeyframeHandle inKeyframe) const override;
- TKeyframe GetKeyframeData(CUICDMKeyframeHandle inKeyframe) const override;
- void SetKeyframeData(CUICDMKeyframeHandle inKeyframe, const TKeyframe &inData) override;
+ void EraseKeyframe(Qt3DSDMKeyframeHandle inKeyframe) override;
+ void DeleteAllKeyframes(Qt3DSDMAnimationHandle inAnimation) override;
+ Qt3DSDMAnimationHandle GetAnimationForKeyframe(Qt3DSDMKeyframeHandle inKeyframe) const override;
+ TKeyframe GetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe) const override;
+ void SetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe, const TKeyframe &inData) override;
// Set the keyframe data, but don't set the artist edited flag. Used for undo/redo operations
// where the artist edited flag has handeled by a different transaction
- void DoSetKeyframeData(CUICDMKeyframeHandle inKeyframe, const TKeyframe &inData);
- void GetKeyframes(CUICDMAnimationHandle inAnimation, TKeyframeHandleList &outKeyframes) const override;
- size_t GetKeyframeCount(CUICDMAnimationHandle inAnimation) const override;
- bool IsFirstKeyframe(CUICDMKeyframeHandle inKeyframe) const override;
+ void DoSetKeyframeData(Qt3DSDMKeyframeHandle inKeyframe, const TKeyframe &inData);
+ void GetKeyframes(Qt3DSDMAnimationHandle inAnimation, TKeyframeHandleList &outKeyframes) const override;
+ size_t GetKeyframeCount(Qt3DSDMAnimationHandle inAnimation) const override;
+ bool IsFirstKeyframe(Qt3DSDMKeyframeHandle inKeyframe) const override;
// Only implemented in the producer for now.
void OffsetAnimations(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
long inOffset) override;
- void SetIsArtistEdited(CUICDMAnimationHandle inAnimation, bool inEdited = true) override;
- bool IsArtistEdited(CUICDMAnimationHandle inAnimation) const override;
+ void SetIsArtistEdited(Qt3DSDMAnimationHandle inAnimation, bool inEdited = true) override;
+ bool IsArtistEdited(Qt3DSDMAnimationHandle inAnimation) const override;
// Animation Evaluation.
- float EvaluateAnimation(CUICDMAnimationHandle inAnimation, float inSeconds) const override;
+ float EvaluateAnimation(Qt3DSDMAnimationHandle inAnimation, float inSeconds) const override;
- bool KeyframeValid(CUICDMKeyframeHandle inKeyframe) const override;
- bool AnimationValid(CUICDMAnimationHandle inAnimation) const override;
+ bool KeyframeValid(Qt3DSDMKeyframeHandle inKeyframe) const override;
+ bool AnimationValid(Qt3DSDMAnimationHandle inAnimation) const override;
// Only implemented at the producer level, not at the simple core level.
void CopyAnimations(Qt3DSDMSlideHandle /*inSourceSlide*/,
@@ -170,14 +170,14 @@ public: // Use
// Lookup cache management so we can find particular animations quickly.
void ClearAnimationMatchesLookupCache() const { m_AnimationMatchesCache.clear(); }
- void AddAnimationToLookupCache(CUICDMAnimationHandle inAnimation) const;
- void RemoveAnimationFromLookupCache(CUICDMAnimationHandle inAnimation) const;
+ void AddAnimationToLookupCache(Qt3DSDMAnimationHandle inAnimation) const;
+ void RemoveAnimationFromLookupCache(Qt3DSDMAnimationHandle inAnimation) const;
void AddAnimationToLookupCache(std::shared_ptr<SAnimationTrack> inAnimation) const;
void RemoveAnimationFromLookupCache(std::shared_ptr<SAnimationTrack> inAnimation) const;
void EnsureAnimationCache() const;
- CUICDMAnimationHandle CreateAnimationWithHandle(int inHandle, Qt3DSDMSlideHandle inSlide,
+ Qt3DSDMAnimationHandle CreateAnimationWithHandle(int inHandle, Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inInstance,
Qt3DSDMPropertyHandle inProperty, size_t inIndex,
EAnimationType inAnimationType,
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp
index 07d47b66..5f1de1ea 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp
@@ -33,13 +33,13 @@ using namespace std;
namespace qt3dsdm {
-CUICDMSlideGraphHandle CSimpleSlideGraphCore::CreateSlideGraph(Qt3DSDMSlideHandle inRoot)
+Qt3DSDMSlideGraphHandle CSimpleSlideGraphCore::CreateSlideGraph(Qt3DSDMSlideHandle inRoot)
{
int nextId = GetNextId();
return CreateSlideGraphWithHandle(nextId, inRoot);
}
-Qt3DSDMSlideHandle CSimpleSlideGraphCore::GetGraphRoot(CUICDMSlideGraphHandle inGraph) const
+Qt3DSDMSlideHandle CSimpleSlideGraphCore::GetGraphRoot(Qt3DSDMSlideGraphHandle inGraph) const
{
return GetSlideGraphNF(inGraph, m_Objects)->m_Root;
}
@@ -52,7 +52,7 @@ inline bool RootSlideMatches(const THandleObjectPair &inPair, Qt3DSDMSlideHandle
return false;
}
-CUICDMSlideGraphHandle CSimpleSlideGraphCore::GetSlideGraph(Qt3DSDMSlideHandle inSlide) const
+Qt3DSDMSlideGraphHandle CSimpleSlideGraphCore::GetSlideGraph(Qt3DSDMSlideHandle inSlide) const
{
THandleObjectMap::const_iterator theFind = find_if<THandleObjectMap::const_iterator>(
m_Objects, std::bind(RootSlideMatches, std::placeholders::_1, inSlide));
@@ -61,7 +61,7 @@ CUICDMSlideGraphHandle CSimpleSlideGraphCore::GetSlideGraph(Qt3DSDMSlideHandle i
return 0;
}
-inline CUICDMSlideGraphHandle ToGraphHandle(const THandleObjectPair &inPair)
+inline Qt3DSDMSlideGraphHandle ToGraphHandle(const THandleObjectPair &inPair)
{
return inPair.first;
}
@@ -72,7 +72,7 @@ void CSimpleSlideGraphCore::GetSlideGraphs(TSlideGraphHandleList &outGraphs) con
transform(m_Objects.begin(), m_Objects.end(), outGraphs.begin(), ToGraphHandle);
}
-void CSimpleSlideGraphCore::DeleteSlideGraph(CUICDMSlideGraphHandle inHandle)
+void CSimpleSlideGraphCore::DeleteSlideGraph(Qt3DSDMSlideGraphHandle inHandle)
{
TSlideInstancePairList theAssociatedInstances;
GetAssociatedInstances(inHandle, theAssociatedInstances);
@@ -81,7 +81,7 @@ void CSimpleSlideGraphCore::DeleteSlideGraph(CUICDMSlideGraphHandle inHandle)
EraseHandle(inHandle, m_Objects);
}
-void CSimpleSlideGraphCore::AssociateInstance(CUICDMSlideGraphHandle inSlideGraph,
+void CSimpleSlideGraphCore::AssociateInstance(Qt3DSDMSlideGraphHandle inSlideGraph,
Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inInstance)
{
@@ -97,7 +97,7 @@ void CSimpleSlideGraphCore::AssociateInstance(CUICDMSlideGraphHandle inSlideGrap
insert_unique(theGraphResult.first->second, make_pair(inSlide, inInstance));
}
-void CSimpleSlideGraphCore::GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
+void CSimpleSlideGraphCore::GetAssociatedInstances(Qt3DSDMSlideGraphHandle inSlideGraph,
TSlideInstancePairList &outAssociations) const
{
TGraphToInstanceMap::const_iterator theFind = m_GraphToInstances.find(inSlideGraph);
@@ -141,13 +141,13 @@ void CSimpleSlideGraphCore::DissociateInstance(Qt3DSDMInstanceHandle inInstance)
m_InstanceToGraph.erase(inInstance);
}
-void CSimpleSlideGraphCore::SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph,
+void CSimpleSlideGraphCore::SetGraphActiveSlide(Qt3DSDMSlideGraphHandle inGraph,
Qt3DSDMSlideHandle inSlide)
{
GetSlideGraphNF(inGraph, m_Objects)->m_ActiveSlide = inSlide;
}
-Qt3DSDMSlideHandle CSimpleSlideGraphCore::GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const
+Qt3DSDMSlideHandle CSimpleSlideGraphCore::GetGraphActiveSlide(Qt3DSDMSlideGraphHandle inGraph) const
{
const SSlideGraph *theSlide = GetSlideGraphNF(inGraph, m_Objects);
if (theSlide->m_ActiveSlide)
@@ -160,7 +160,7 @@ bool CSimpleSlideGraphCore::HandleValid(int inHandle) const
return CHandleBase::HandleValid(inHandle);
}
-CUICDMSlideGraphHandle CSimpleSlideGraphCore::CreateSlideGraphWithHandle(int inHandle,
+Qt3DSDMSlideGraphHandle CSimpleSlideGraphCore::CreateSlideGraphWithHandle(int inHandle,
Qt3DSDMSlideHandle inRoot)
{
m_Objects.insert(make_pair(inHandle, (THandleObjectPtr) new SSlideGraph(inHandle, inRoot)));
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h
index 9c9d9142..484d6750 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h
@@ -60,9 +60,9 @@ class CSimpleSlideGraphCore : public CHandleBase, public ISlideGraphCore
{
TStringTablePtr m_StringTable;
typedef std::unordered_map<Qt3DSDMInstanceHandle,
- pair<CUICDMSlideGraphHandle, Qt3DSDMSlideHandle>, std::hash<int>>
+ pair<Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle>, std::hash<int>>
TInstanceToGraphMap;
- typedef std::unordered_map<CUICDMSlideGraphHandle, TSlideInstancePairList, std::hash<int>>
+ typedef std::unordered_map<Qt3DSDMSlideGraphHandle, TSlideInstancePairList, std::hash<int>>
TGraphToInstanceMap;
TInstanceToGraphMap m_InstanceToGraph;
@@ -81,11 +81,11 @@ public:
* of one and only one graph (i.e. it does not derive from another slide outside of the graph).
* Second is that an instance is a member of one and only one graph.
*/
- CUICDMSlideGraphHandle CreateSlideGraph(Qt3DSDMSlideHandle inRoot) override;
- Qt3DSDMSlideHandle GetGraphRoot(CUICDMSlideGraphHandle inGraph) const override;
- CUICDMSlideGraphHandle GetSlideGraph(Qt3DSDMSlideHandle inSlide) const override;
+ Qt3DSDMSlideGraphHandle CreateSlideGraph(Qt3DSDMSlideHandle inRoot) override;
+ Qt3DSDMSlideHandle GetGraphRoot(Qt3DSDMSlideGraphHandle inGraph) const override;
+ Qt3DSDMSlideGraphHandle GetSlideGraph(Qt3DSDMSlideHandle inSlide) const override;
void GetSlideGraphs(TSlideGraphHandleList &outGraphs) const override;
- void DeleteSlideGraph(CUICDMSlideGraphHandle inHandle) override;
+ void DeleteSlideGraph(Qt3DSDMSlideGraphHandle inHandle) override;
/**
* Associate a given instance handle with a given graph. This will ensure that property
@@ -96,9 +96,9 @@ public:
*is
* implicitly associated with any root-derived slides.
*/
- void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, Qt3DSDMSlideHandle inSlide,
+ void AssociateInstance(Qt3DSDMSlideGraphHandle inSlideGraph, Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inInstance) override;
- void GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
+ void GetAssociatedInstances(Qt3DSDMSlideGraphHandle inSlideGraph,
TSlideInstancePairList &outAssociations) const override;
TGraphSlidePair GetAssociatedGraph(Qt3DSDMInstanceHandle inInstance) const override;
void DissociateInstance(Qt3DSDMInstanceHandle inInstance) override;
@@ -106,12 +106,12 @@ public:
/**
* All graphs always have an active slide. This is assumed to be the root right off the bat.
*/
- void SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) override;
- Qt3DSDMSlideHandle GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const override;
+ void SetGraphActiveSlide(Qt3DSDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) override;
+ Qt3DSDMSlideHandle GetGraphActiveSlide(Qt3DSDMSlideGraphHandle inGraph) const override;
bool HandleValid(int inHandle) const override;
- CUICDMSlideGraphHandle CreateSlideGraphWithHandle(int inHandle, Qt3DSDMSlideHandle inRoot);
+ Qt3DSDMSlideGraphHandle CreateSlideGraphWithHandle(int inHandle, Qt3DSDMSlideHandle inRoot);
static SSlideGraph *GetSlideGraphNF(int inHandle, THandleObjectMap &inObjects)
{
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp
index 5bf5b94a..c514108c 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp
@@ -35,20 +35,20 @@ using namespace std;
namespace qt3dsdm {
-CUICDMSlideGraphHandle CSlideGraphCoreProducer::CreateSlideGraph(Qt3DSDMSlideHandle inRoot)
+Qt3DSDMSlideGraphHandle CSlideGraphCoreProducer::CreateSlideGraph(Qt3DSDMSlideHandle inRoot)
{
- CUICDMSlideGraphHandle retval(m_Data->CreateSlideGraph(inRoot));
+ Qt3DSDMSlideGraphHandle retval(m_Data->CreateSlideGraph(inRoot));
CREATE_HANDLE_CREATE_TRANSACTION(m_Consumer, retval, m_Data->m_Objects);
GetSignalSender()->SendGraphCreated(retval, inRoot);
return retval;
}
-Qt3DSDMSlideHandle CSlideGraphCoreProducer::GetGraphRoot(CUICDMSlideGraphHandle inGraph) const
+Qt3DSDMSlideHandle CSlideGraphCoreProducer::GetGraphRoot(Qt3DSDMSlideGraphHandle inGraph) const
{
return m_Data->GetGraphRoot(inGraph);
}
-CUICDMSlideGraphHandle CSlideGraphCoreProducer::GetSlideGraph(Qt3DSDMSlideHandle inSlide) const
+Qt3DSDMSlideGraphHandle CSlideGraphCoreProducer::GetSlideGraph(Qt3DSDMSlideHandle inSlide) const
{
return m_Data->GetSlideGraph(inSlide);
}
@@ -61,11 +61,11 @@ void CSlideGraphCoreProducer::GetSlideGraphs(TSlideGraphHandleList &outGraphs) c
struct DissocateAllInstanceTrans : public ITransaction
{
std::shared_ptr<CSimpleSlideGraphCore> m_Graph;
- CUICDMSlideGraphHandle m_Handle;
+ Qt3DSDMSlideGraphHandle m_Handle;
TSlideInstancePairList m_Instances;
DissocateAllInstanceTrans(const char *inFile, int inLine,
std::shared_ptr<CSimpleSlideGraphCore> inGraph,
- CUICDMSlideGraphHandle inHandle)
+ Qt3DSDMSlideGraphHandle inHandle)
: ITransaction(inFile, inLine)
, m_Graph(inGraph)
, m_Handle(inHandle)
@@ -84,7 +84,7 @@ struct DissocateAllInstanceTrans : public ITransaction
}
};
-void CSlideGraphCoreProducer::DeleteSlideGraph(CUICDMSlideGraphHandle inHandle)
+void CSlideGraphCoreProducer::DeleteSlideGraph(Qt3DSDMSlideGraphHandle inHandle)
{
SSlideGraph *theGraph = CSimpleSlideGraphCore::GetSlideGraphNF(inHandle, m_Data->m_Objects);
Qt3DSDMSlideHandle theRootSlide(theGraph->m_Root);
@@ -99,13 +99,13 @@ void CSlideGraphCoreProducer::DeleteSlideGraph(CUICDMSlideGraphHandle inHandle)
struct SInstanceAssociateTrans : public ITransaction
{
std::shared_ptr<CSimpleSlideGraphCore> m_Graph;
- CUICDMSlideGraphHandle m_GraphHandle;
+ Qt3DSDMSlideGraphHandle m_GraphHandle;
Qt3DSDMSlideHandle m_Slide;
Qt3DSDMInstanceHandle m_Instance;
bool m_InsertOnDo;
SInstanceAssociateTrans(const char *inFile, int inLine,
std::shared_ptr<CSimpleSlideGraphCore> inGraph,
- CUICDMSlideGraphHandle inGraphHandle, Qt3DSDMSlideHandle inSlideHandle,
+ Qt3DSDMSlideGraphHandle inGraphHandle, Qt3DSDMSlideHandle inSlideHandle,
Qt3DSDMInstanceHandle inInstance, bool inInsertOnDo)
: ITransaction(inFile, inLine)
, m_Graph(inGraph)
@@ -134,7 +134,7 @@ struct SInstanceAssociateTrans : public ITransaction
}
};
-void CSlideGraphCoreProducer::AssociateInstance(CUICDMSlideGraphHandle inSlideGraph,
+void CSlideGraphCoreProducer::AssociateInstance(Qt3DSDMSlideGraphHandle inSlideGraph,
Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inInstance)
{
@@ -145,7 +145,7 @@ void CSlideGraphCoreProducer::AssociateInstance(CUICDMSlideGraphHandle inSlideGr
GetSignalSender()->SendInstanceAssociated(inSlideGraph, inSlide, inInstance);
}
-void CSlideGraphCoreProducer::GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
+void CSlideGraphCoreProducer::GetAssociatedInstances(Qt3DSDMSlideGraphHandle inSlideGraph,
TSlideInstancePairList &outAssociations) const
{
m_Data->GetAssociatedInstances(inSlideGraph, outAssociations);
@@ -171,7 +171,7 @@ void CSlideGraphCoreProducer::DissociateInstance(Qt3DSDMInstanceHandle inInstanc
}
}
-void CSlideGraphCoreProducer::SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph,
+void CSlideGraphCoreProducer::SetGraphActiveSlide(Qt3DSDMSlideGraphHandle inGraph,
Qt3DSDMSlideHandle inSlide)
{
if (m_Consumer) {
@@ -185,7 +185,7 @@ void CSlideGraphCoreProducer::SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph
GetSignalSender()->SendGraphActiveSlide(inGraph, inSlide);
}
-Qt3DSDMSlideHandle CSlideGraphCoreProducer::GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const
+Qt3DSDMSlideHandle CSlideGraphCoreProducer::GetGraphActiveSlide(Qt3DSDMSlideGraphHandle inGraph) const
{
return m_Data->GetGraphActiveSlide(inGraph);
}
@@ -201,29 +201,29 @@ void CSlideGraphCoreProducer::SetConsumer(TTransactionConsumerPtr inConsumer)
}
TSignalConnectionPtr CSlideGraphCoreProducer::ConnectGraphCreated(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback)
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback)
{
return GetSignalProvider()->ConnectGraphCreated(inCallback);
}
TSignalConnectionPtr CSlideGraphCoreProducer::ConnectGraphDeleted(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback)
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback)
{
return GetSignalProvider()->ConnectGraphDeleted(inCallback);
}
TSignalConnectionPtr CSlideGraphCoreProducer::ConnectInstanceAssociated(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
&inCallback)
{
return GetSignalProvider()->ConnectInstanceAssociated(inCallback);
}
TSignalConnectionPtr CSlideGraphCoreProducer::ConnectInstanceDissociated(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
&inCallback)
{
return GetSignalProvider()->ConnectInstanceDissociated(inCallback);
}
TSignalConnectionPtr CSlideGraphCoreProducer::ConnectGraphActiveSlide(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback)
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback)
{
return GetSignalProvider()->ConnectGraphActiveSlide(inCallback);
}
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h b/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h
index 1188b69d..5b34cdb9 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h
@@ -53,21 +53,21 @@ public:
TSimpleSlideGraphCorePtr GetTransactionlessSlideGraphCore() { return m_Data; }
TSimpleSlideGraphCorePtr GetTransactionlessSlideGraphCore() const { return m_Data; }
- CUICDMSlideGraphHandle CreateSlideGraph(Qt3DSDMSlideHandle inRoot) override;
- Qt3DSDMSlideHandle GetGraphRoot(CUICDMSlideGraphHandle inGraph) const override;
- CUICDMSlideGraphHandle GetSlideGraph(Qt3DSDMSlideHandle inSlide) const override;
+ Qt3DSDMSlideGraphHandle CreateSlideGraph(Qt3DSDMSlideHandle inRoot) override;
+ Qt3DSDMSlideHandle GetGraphRoot(Qt3DSDMSlideGraphHandle inGraph) const override;
+ Qt3DSDMSlideGraphHandle GetSlideGraph(Qt3DSDMSlideHandle inSlide) const override;
void GetSlideGraphs(TSlideGraphHandleList &outGraphs) const override;
- void DeleteSlideGraph(CUICDMSlideGraphHandle inHandle) override;
+ void DeleteSlideGraph(Qt3DSDMSlideGraphHandle inHandle) override;
- void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, Qt3DSDMSlideHandle inSlide,
+ void AssociateInstance(Qt3DSDMSlideGraphHandle inSlideGraph, Qt3DSDMSlideHandle inSlide,
Qt3DSDMInstanceHandle inInstance) override;
- void GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
+ void GetAssociatedInstances(Qt3DSDMSlideGraphHandle inSlideGraph,
TSlideInstancePairList &outAssociations) const override;
TGraphSlidePair GetAssociatedGraph(Qt3DSDMInstanceHandle inInstance) const override;
void DissociateInstance(Qt3DSDMInstanceHandle inInstance) override;
- void SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) override;
- Qt3DSDMSlideHandle GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const override;
+ void SetGraphActiveSlide(Qt3DSDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) override;
+ Qt3DSDMSlideHandle GetGraphActiveSlide(Qt3DSDMSlideGraphHandle inGraph) const override;
bool HandleValid(int inHandle) const override;
void SetConsumer(TTransactionConsumerPtr inConsumer) override;
@@ -76,17 +76,17 @@ public:
// Signals
//===================================================================
TSignalConnectionPtr ConnectGraphCreated(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override;
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override;
TSignalConnectionPtr ConnectGraphDeleted(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override;
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override;
TSignalConnectionPtr ConnectInstanceAssociated(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
&inCallback) override;
TSignalConnectionPtr ConnectInstanceDissociated(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
&inCallback) override;
TSignalConnectionPtr ConnectGraphActiveSlide(
- const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override;
+ const std::function<void(Qt3DSDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override;
private:
void InitSignaller();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 09:02:33 +0000