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

(Entity) GetComponent no longer throw 

Former-commit-id: 8efd0f5aba9c49d7f06ba290425f9e55c2f1eba3
This commit is contained in:
Lynix 2015-03-14 16:53:26 +01:00
parent a16582d20d
commit 7bac245a0f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SDK/include/NDK/Entity.inl
View File

@ -4,7 +4,6 @@
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <algorithm> #include <algorithm>
#include <stdexcept>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
@ -47,8 +46,8 @@ namespace Ndk
inline BaseComponent& Entity::GetComponent(nzUInt32 componentId) inline BaseComponent& Entity::GetComponent(nzUInt32 componentId)
{ {
if (!HasComponent(componentId)) ///DOC: Le component doit être présent
throw std::runtime_error("Tried to get a non-present component"); NazaraAssert(HasComponent(componentId), "This component is not part of the entity");
BaseComponent* component = m_components[componentId].get(); BaseComponent* component = m_components[componentId].get();
NazaraAssert(component, "Invalid component pointer"); NazaraAssert(component, "Invalid component pointer");
@ -59,7 +58,7 @@ namespace Ndk
template<typename ComponentType> template<typename ComponentType>
ComponentType& Entity::GetComponent() ComponentType& Entity::GetComponent()
{ {
///DOC: Lance une exception si le component n'est pas présent ///DOC: Le component doit être présent
static_assert(std::is_base_of<BaseComponent, ComponentType>(), "ComponentType is not a component"); static_assert(std::is_base_of<BaseComponent, ComponentType>(), "ComponentType is not a component");
nzUInt32 componentId = GetComponentId<ComponentType>(); nzUInt32 componentId = GetComponentId<ComponentType>();
@ -97,6 +96,7 @@ namespace Ndk
inline void Entity::RemoveComponent(nzUInt32 componentId) inline void Entity::RemoveComponent(nzUInt32 componentId)
{ {
///DOC: N'a aucun effet si le component n'est pas présent
if (HasComponent(componentId)) if (HasComponent(componentId))
m_components[componentId].reset(); m_components[componentId].reset();
} }