AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ObjReference: Remove unnecessary inline keywords

This commit is contained in:
Lioncash 2020-07-10 15:56:20 -04:00
parent 2dcb3a86df
commit 015e6ec40c
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Editor/Undo/ObjReferences.h
View File

@ -62,21 +62,21 @@ public:
CNodePtr() { SetNode(nullptr); } CNodePtr() { SetNode(nullptr); }
CNodePtr(CSceneNode *pNode) { SetNode(pNode); } CNodePtr(CSceneNode *pNode) { SetNode(pNode); }
inline void SetNode(CSceneNode *pNode) void SetNode(CSceneNode *pNode)
{ {
mNodeID = pNode ? pNode->ID() : 0; mNodeID = pNode ? pNode->ID() : 0;
mpScene = pNode ? pNode->Scene() : nullptr; mpScene = pNode ? pNode->Scene() : nullptr;
mValid = pNode ? true : false; mValid = pNode ? true : false;
} }
inline bool Valid() const { return mValid; } bool Valid() const { return mValid; }
inline uint32 NodeID() const { return mNodeID; } uint32 NodeID() const { return mNodeID; }
inline CScene* Scene() const { return mpScene; } CScene* Scene() const { return mpScene; }
inline CSceneNode* operator* () const { return mValid ? mpScene->NodeByID(mNodeID) : nullptr; } CSceneNode* operator* () const { return mValid ? mpScene->NodeByID(mNodeID) : nullptr; }
inline CSceneNode* operator->() const { return mValid ? mpScene->NodeByID(mNodeID) : nullptr; } CSceneNode* operator->() const { return mValid ? mpScene->NodeByID(mNodeID) : nullptr; }
inline CNodePtr& operator=(CSceneNode *pNode) { SetNode(pNode); return *this; } CNodePtr& operator=(CSceneNode *pNode) { SetNode(pNode); return *this; }
inline bool operator==(const CNodePtr& rkOther) const bool operator==(const CNodePtr& rkOther) const
{ {
return (mNodeID == rkOther.mNodeID && mpScene == rkOther.mpScene); return (mNodeID == rkOther.mNodeID && mpScene == rkOther.mpScene);
} }
@ -92,20 +92,20 @@ public:
CInstancePtr() { SetInstance(nullptr); } CInstancePtr() { SetInstance(nullptr); }
CInstancePtr(CScriptObject *pInst) { SetInstance(pInst); } CInstancePtr(CScriptObject *pInst) { SetInstance(pInst); }
inline void SetInstance(CScriptObject *pInst) void SetInstance(CScriptObject *pInst)
{ {
mInstanceID = pInst ? pInst->InstanceID() : CInstanceID(); mInstanceID = pInst ? pInst->InstanceID() : CInstanceID();
mpArea = pInst ? pInst->Area() : nullptr; mpArea = pInst ? pInst->Area() : nullptr;
mValid = pInst ? true : false; mValid = pInst ? true : false;
} }
inline CInstanceID InstanceID() const { return mInstanceID; } CInstanceID InstanceID() const { return mInstanceID; }
inline CGameArea* Area() const { return mpArea; } CGameArea* Area() const { return mpArea; }
inline CScriptObject* operator* () const { return mValid ? mpArea->InstanceByID(mInstanceID) : nullptr; } CScriptObject* operator* () const { return mValid ? mpArea->InstanceByID(mInstanceID) : nullptr; }
inline CScriptObject* operator->() const { return mValid ? mpArea->InstanceByID(mInstanceID) : nullptr; } CScriptObject* operator->() const { return mValid ? mpArea->InstanceByID(mInstanceID) : nullptr; }
inline CInstancePtr& operator=(CScriptObject *pInst) { SetInstance(pInst); return *this; } CInstancePtr& operator=(CScriptObject *pInst) { SetInstance(pInst); return *this; }
inline bool operator==(const CInstancePtr& rkOther) const bool operator==(const CInstancePtr& rkOther) const
{ {
return (mInstanceID == rkOther.mInstanceID && mpArea == rkOther.mpArea); return (mInstanceID == rkOther.mInstanceID && mpArea == rkOther.mpArea);
} }
@ -121,19 +121,19 @@ public:
CLinkPtr() { SetLink(nullptr); } CLinkPtr() { SetLink(nullptr); }
CLinkPtr(CLink *pLink) { SetLink(pLink); } CLinkPtr(CLink *pLink) { SetLink(pLink); }
inline void SetLink(CLink *pLink) void SetLink(CLink *pLink)
{ {
mpInstance = pLink ? pLink->Sender() : 0; mpInstance = pLink ? pLink->Sender() : 0;
mLinkIndex = pLink ? pLink->SenderIndex() : 0; mLinkIndex = pLink ? pLink->SenderIndex() : 0;
mValid = pLink ? true : false; mValid = pLink ? true : false;
} }
inline uint32 LinkIndex() const { return mLinkIndex; } uint32 LinkIndex() const { return mLinkIndex; }
inline CLink* operator* () const { return mValid ? mpInstance->Link(ELinkType::Outgoing, mLinkIndex) : nullptr; } CLink* operator* () const { return mValid ? mpInstance->Link(ELinkType::Outgoing, mLinkIndex) : nullptr; }
inline CLink* operator->() const { return mValid ? mpInstance->Link(ELinkType::Outgoing, mLinkIndex) : nullptr; } CLink* operator->() const { return mValid ? mpInstance->Link(ELinkType::Outgoing, mLinkIndex) : nullptr; }
inline CLinkPtr& operator=(CLink *pLink) { SetLink(pLink); return *this; } CLinkPtr& operator=(CLink *pLink) { SetLink(pLink); return *this; }
inline bool operator==(const CLinkPtr& rkOther) const bool operator==(const CLinkPtr& rkOther) const
{ {
return (mpInstance == rkOther.mpInstance && mLinkIndex == rkOther.mLinkIndex); return (mpInstance == rkOther.mpInstance && mLinkIndex == rkOther.mLinkIndex);
} }