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

Upgrade Physics2D and Physics3D

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-24 19:12:21 +02:00
parent 4bcb63d776
commit 8b0b5295f7
25 changed files with 239 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NazaraSDK/Components/CollisionComponent2D.cpp
View File

@@ -53,7 +53,7 @@ namespace Ndk
*
* \param geom Geometry used for collisions
*/
void CollisionComponent2D::SetGeom(Nz::Collider2DRef geom, bool recomputeMoment, bool recomputeMassCenter)
void CollisionComponent2D::SetGeom(std::shared_ptr<Nz::Collider2D> geom, bool recomputeMoment, bool recomputeMassCenter)
{
m_geom = std::move(geom);

2
src/NazaraSDK/Components/CollisionComponent3D.cpp
View File

@@ -24,7 +24,7 @@ namespace Ndk
* \remark Produces a NazaraAssert if the entity has no physics component and has no static body
*/
void CollisionComponent3D::SetGeom(Nz::Collider3DRef geom)
void CollisionComponent3D::SetGeom(std::shared_ptr<Nz::Collider3D> geom)
{
m_geom = std::move(geom);

4
src/NazaraSDK/Components/PhysicsComponent2D.cpp
View File

@@ -33,7 +33,7 @@ namespace Ndk
Nz::Vector2f positionOffset;
Nz::Collider2DRef geom;
std::shared_ptr<Nz::Collider2D> geom;
if (m_entity->HasComponent<CollisionComponent2D>())
{
const CollisionComponent2D& entityCollision = m_entity->GetComponent<CollisionComponent2D>();
@@ -94,7 +94,7 @@ namespace Ndk
if (IsComponent<CollisionComponent2D>(component))
{
NazaraAssert(m_object, "Invalid object");
m_object->SetGeom(Nz::NullCollider2D::New(), false, false);
m_object->SetGeom(std::make_shared<Nz::NullCollider2D>(), false, false);
}
}

4
src/NazaraSDK/Components/PhysicsComponent3D.cpp
View File

@@ -30,7 +30,7 @@ namespace Ndk
Nz::PhysWorld3D& world = entityWorld->GetSystem<PhysicsSystem3D>().GetWorld();
Nz::Collider3DRef geom;
std::shared_ptr<Nz::Collider3D> geom;
if (m_entity->HasComponent<CollisionComponent3D>())
geom = m_entity->GetComponent<CollisionComponent3D>().GetGeom();
@@ -81,7 +81,7 @@ namespace Ndk
{
NazaraAssert(m_object, "Invalid object");
m_object->SetGeom(Nz::NullCollider3D::New());
m_object->SetGeom(std::make_shared<Nz::NullCollider3D>());
}
}