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

Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

This commit is contained in:
Jérôme Leclercq 2017-09-08 09:41:10 +02:00
parent b4d0854028 53020f27a5
commit f2870b83c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Physics2D/RigidBody2D.cpp
View File

@ -36,12 +36,12 @@ namespace Nz
m_userData(object.m_userData), m_userData(object.m_userData),
m_world(object.m_world), m_world(object.m_world),
m_gravityFactor(object.m_gravityFactor), m_gravityFactor(object.m_gravityFactor),
m_mass(0.f) m_mass(object.GetMass())
{ {
NazaraAssert(m_world, "Invalid world"); NazaraAssert(m_world, "Invalid world");
NazaraAssert(m_geom, "Invalid geometry"); NazaraAssert(m_geom, "Invalid geometry");
m_handle = Create(object.GetMass(), object.GetMomentOfInertia()); m_handle = Create(m_mass, object.GetMomentOfInertia());
SetGeom(object.GetGeom(), false); SetGeom(object.GetGeom(), false);
CopyBodyData(object.GetHandle()); CopyBodyData(object.GetHandle());