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

Physics3D/Collider3D: Improve CompoundCollider3D constructor

This commit is contained in:
Jérôme Leclercq 2017-07-27 11:40:42 +02:00
parent afdc018778
commit 6047018082
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Physics3D/Collider3D.hpp
View File

@ -135,7 +135,7 @@ namespace Nz
class NAZARA_PHYSICS3D_API CompoundCollider3D : public Collider3D class NAZARA_PHYSICS3D_API CompoundCollider3D : public Collider3D
{ {
public: public:
CompoundCollider3D(Collider3D** geoms, std::size_t geomCount); CompoundCollider3D(std::vector<Collider3DRef> geoms);
const std::vector<Collider3DRef>& GetGeoms() const; const std::vector<Collider3DRef>& GetGeoms() const;
ColliderType3D GetType() const override; ColliderType3D GetType() const override;

10
src/Nazara/Physics3D/Collider3D.cpp
View File

@ -128,12 +128,12 @@ namespace Nz
std::size_t primitiveCount = list.GetSize(); std::size_t primitiveCount = list.GetSize();
if (primitiveCount > 1) if (primitiveCount > 1)
{ {
std::vector<Collider3D*> geoms(primitiveCount); std::vector<Collider3DRef> geoms(primitiveCount);
for (unsigned int i = 0; i < primitiveCount; ++i) for (unsigned int i = 0; i < primitiveCount; ++i)
geoms[i] = CreateGeomFromPrimitive(list.GetPrimitive(i)); geoms[i] = CreateGeomFromPrimitive(list.GetPrimitive(i));
return CompoundCollider3D::New(&geoms[0], primitiveCount); return CompoundCollider3D::New(std::move(geoms));
} }
else if (primitiveCount > 0) else if (primitiveCount > 0)
return CreateGeomFromPrimitive(list.GetPrimitive(0)); return CreateGeomFromPrimitive(list.GetPrimitive(0));
@ -239,11 +239,9 @@ namespace Nz
/******************************* CompoundCollider3D ********************************/ /******************************* CompoundCollider3D ********************************/
CompoundCollider3D::CompoundCollider3D(Collider3D** geoms, std::size_t geomCount) CompoundCollider3D::CompoundCollider3D(std::vector<Collider3DRef> geoms) :
m_geoms(std::move(geoms))
{ {
m_geoms.reserve(geomCount);
for (std::size_t i = 0; i < geomCount; ++i)
m_geoms.emplace_back(geoms[i]);
} }
const std::vector<Collider3DRef>& CompoundCollider3D::GetGeoms() const const std::vector<Collider3DRef>& CompoundCollider3D::GetGeoms() const