sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into enet_wip_nothing_to_see_here

This commit is contained in:
Jérôme Leclercq 2017-03-21 15:25:13 +01:00
parent ef2c233e63 02508fb99d
commit b706b3203e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SDK/include/NDK/BaseComponent.hpp
View File

@ -29,6 +29,7 @@ namespace Ndk
virtual std::unique_ptr<BaseComponent> Clone() const = 0; virtual std::unique_ptr<BaseComponent> Clone() const = 0;
inline const EntityHandle& GetEntity() const;
ComponentIndex GetIndex() const; ComponentIndex GetIndex() const;
inline static ComponentIndex GetMaxComponentIndex(); inline static ComponentIndex GetMaxComponentIndex();

10
SDK/include/NDK/BaseComponent.inl
View File

@ -19,11 +19,19 @@ namespace Ndk
{ {
} }
/*!
* \brief Gets the entity owning this component
* \return A handle to the entity owning this component, may be invalid if no entity owns it.
*/
inline const EntityHandle& BaseComponent::GetEntity() const
{
return m_entity;
}
/*! /*!
* \brief Gets the index of the component * \brief Gets the index of the component
* \return Index of the component * \return Index of the component
*/ */
inline ComponentIndex BaseComponent::GetIndex() const inline ComponentIndex BaseComponent::GetIndex() const
{ {
return m_componentIndex; return m_componentIndex;