AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-20 02:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

General: Remove unnecessary inline specifiers and add overrides

Browse Source
This commit is contained in:
Lioncash
2020-06-11 14:10:22 -04:00
parent 2d76c5865a
commit 012da6fb6d
107 changed files with 885 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/ScriptExtra/CScriptExtra.h
View File

@@ -26,7 +26,7 @@ protected:
EGame mGame;
public:
explicit CScriptExtra(CScriptObject *pInstance, CScene *pScene, CScriptNode *pParent = 0)
explicit CScriptExtra(CScriptObject *pInstance, CScene *pScene, CScriptNode *pParent = nullptr)
: CSceneNode(pScene, -1, pParent)
, mpScriptNode(pParent)
, mpInstance(pInstance)
@@ -34,20 +34,20 @@ public:
{
}
virtual ~CScriptExtra() {}
inline CScriptObject* Instance() const { return mpInstance; }
inline EGame Game() const { return mGame; }
virtual ~CScriptExtra() = default;
CScriptObject* Instance() const { return mpInstance; }
EGame Game() const { return mGame; }
// Default implementations for CSceneNode
virtual ENodeType NodeType() { return ENodeType::ScriptExtra; }
virtual void RayAABoxIntersectTest(CRayCollisionTester& /*rTester*/, const SViewInfo& /*rkViewInfo*/) {}
virtual SRayIntersection RayNodeIntersectTest(const CRay& /*rkRay*/, uint32 /*AssetID*/, const SViewInfo& /*rkViewInfo*/)
ENodeType NodeType() override { return ENodeType::ScriptExtra; }
void RayAABoxIntersectTest(CRayCollisionTester& /*rTester*/, const SViewInfo& /*rkViewInfo*/) override {}
SRayIntersection RayNodeIntersectTest(const CRay& /*rkRay*/, uint32 /*AssetID*/, const SViewInfo& /*rkViewInfo*/) override
{
SRayIntersection out;
out.Hit = false;
return out;
}
virtual CColor WireframeColor() const { return mpParent->WireframeColor(); }
CColor WireframeColor() const override { return mpParent->WireframeColor(); }
// Virtual CScriptExtra functions
virtual void InstanceTransformed() {}