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

Merge branch 'master' into nazara-next

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-09-17 20:28:11 +02:00
parent 3f6f18859c 980d200092
commit 790815e9ee
270 changed files with 106800 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -77,7 +77,7 @@ namespace Ndk
if (IsComponent<CollisionComponent2D>(component))
{
NazaraAssert(m_object, "Invalid object");
m_object->SetGeom(static_cast<CollisionComponent2D&>(component).GetGeom());
m_object->SetGeom(static_cast<CollisionComponent2D&>(component).GetGeom(), false, false);
}
}
@@ -94,7 +94,7 @@ namespace Ndk
if (IsComponent<CollisionComponent2D>(component))
{
NazaraAssert(m_object, "Invalid object");
m_object->SetGeom(Nz::NullCollider2D::New());
m_object->SetGeom(Nz::NullCollider2D::New(), false, false);
}
}