From 17512b2b8e408214f63d2856a32ffb1203195c56 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 14 Aug 2016 18:01:23 +0200 Subject: [PATCH] SDK/Entity: Add constant component getter Former-commit-id: 602e3d136124f7a49270d95f191eeda0f78179d4 [formerly 1666ac8477467e91e8763109cb91e6cb2074d223] [formerly 3c27a318695a98bb97bbcceb2879f8b9b6da90bf [formerly 3f2b769579af5c103102a9a3d1f0c6a6c7bbbf32]] Former-commit-id: 791755b458c83193eb1849ed3eabf9b41da564bf [formerly 8fc83ec409b57a67999bb0f7a4e25a87d96024a2] Former-commit-id: 58a87205503d734ce877800da06daa1fee838bfa --- SDK/include/NDK/Entity.hpp | 2 ++ SDK/include/NDK/Entity.inl | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/SDK/include/NDK/Entity.hpp b/SDK/include/NDK/Entity.hpp index 33661eb50..5aeeb8226 100644 --- a/SDK/include/NDK/Entity.hpp +++ b/SDK/include/NDK/Entity.hpp @@ -40,6 +40,8 @@ namespace Ndk inline BaseComponent& GetComponent(ComponentIndex index); template ComponentType& GetComponent(); + inline const BaseComponent& GetComponent(ComponentIndex index) const; + template const ComponentType& GetComponent() const; inline const Nz::Bitset<>& GetComponentBits() const; inline EntityId GetId() const; inline const Nz::Bitset<>& GetSystemBits() const; diff --git a/SDK/include/NDK/Entity.inl b/SDK/include/NDK/Entity.inl index c7937b786..a03130b0d 100644 --- a/SDK/include/NDK/Entity.inl +++ b/SDK/include/NDK/Entity.inl @@ -2,6 +2,7 @@ // This file is part of the "Nazara Development Kit" // For conditions of distribution and use, see copyright notice in Prerequesites.hpp +#include #include #include #include @@ -50,6 +51,27 @@ namespace Ndk return static_cast(GetComponent(index)); } + inline const BaseComponent& Entity::GetComponent(ComponentIndex index) const + { + ///DOC: Le component doit être présent + NazaraAssert(HasComponent(index), "This component is not part of the entity"); + + BaseComponent* component = m_components[index].get(); + NazaraAssert(component, "Invalid component pointer"); + + return *component; + } + + template + const ComponentType& Entity::GetComponent() const + { + ///DOC: Le component doit être présent + static_assert(std::is_base_of::value, "ComponentType is not a component"); + + ComponentIndex index = GetComponentIndex(); + return static_cast(GetComponent(index)); + } + inline const Nz::Bitset<>& Entity::GetComponentBits() const { return m_componentBits;