From ca5fb44ecf1bddb8aaae77b5f8d650c13610a3cb Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 9 Jun 2013 22:03:42 +0200 Subject: [PATCH] Really fixed AABBs Former-commit-id: 003979537f2ea5362849df8a65611739aea6d298 --- include/Nazara/Utility/Algorithm.inl | 2 +- src/Nazara/Utility/Skeleton.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/Nazara/Utility/Algorithm.inl b/include/Nazara/Utility/Algorithm.inl index bbd5b0303..1eb606ffc 100644 --- a/include/Nazara/Utility/Algorithm.inl +++ b/include/Nazara/Utility/Algorithm.inl @@ -10,7 +10,7 @@ NzBoxf NzComputeVerticesAABB(const T* vertices, unsigned int vertexCount) NzBoxf aabb; if (vertexCount > 0) { - aabb.Set(vertices->position); + aabb.Set(vertices->position.x, vertices->position.y, vertices->position.z, 0.f, 0.f, 0.f); vertices++; for (unsigned int i = 1; i < vertexCount; ++i) diff --git a/src/Nazara/Utility/Skeleton.cpp b/src/Nazara/Utility/Skeleton.cpp index bab0afca2..02855a051 100644 --- a/src/Nazara/Utility/Skeleton.cpp +++ b/src/Nazara/Utility/Skeleton.cpp @@ -68,7 +68,8 @@ const NzBoxf& NzSkeleton::GetAABB() const unsigned int jointCount = m_impl->joints.size(); if (jointCount > 0) { - m_impl->aabb.Set(m_impl->joints[0].GetPosition()); + NzVector3f pos = m_impl->joints[0].GetPosition(); + m_impl->aabb.Set(pos.x, pos.y, pos.z, 0.f, 0.f, 0.f); for (unsigned int i = 1; i < jointCount; ++i) m_impl->aabb.ExtendTo(m_impl->joints[i].GetPosition()); }