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

Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

This commit is contained in:
Jérôme Leclercq 2017-02-27 16:30:37 +01:00
parent 14022ccee2 f22dd81d35
commit 658faf3d49
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/scripts/actions/package.lua
View File

@ -86,7 +86,7 @@ ACTION.Function = function ()
local exeFilterFunc local exeFilterFunc
if (os.is("windows")) then if (os.is("windows")) then
binFileMasks = {"**.dll"} binFileMasks = {"**.dll"}
libFileMasks = {"**.lib", "**.a"} libFileMasks = {"**.lib", "**.a", "**.pdb"}
exeFileExt = ".exe" exeFileExt = ".exe"
exeFilterFunc = function (filePath) return true end exeFilterFunc = function (filePath) return true end
else else

2
include/Nazara/Physics2D/RigidBody2D.hpp
View File

@ -34,6 +34,8 @@ namespace Nz
void AddForce(const Vector2f& force, CoordSys coordSys = CoordSys_Global); void AddForce(const Vector2f& force, CoordSys coordSys = CoordSys_Global);
void AddForce(const Vector2f& force, const Vector2f& point, CoordSys coordSys = CoordSys_Global); void AddForce(const Vector2f& force, const Vector2f& point, CoordSys coordSys = CoordSys_Global);
void AddImpulse(const Vector2f& impulse, CoordSys coordSys = CoordSys_Global);
void AddImpulse(const Vector2f& impulse, const Vector2f& point, CoordSys coordSys = CoordSys_Global);
void AddTorque(float torque); void AddTorque(float torque);
Rectf GetAABB() const; Rectf GetAABB() const;

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

@ -93,6 +93,25 @@ namespace Nz
} }
} }
void RigidBody2D::AddImpulse(const Vector2f& impulse, CoordSys coordSys)
{
return AddImpulse(impulse, GetCenterOfGravity(coordSys), coordSys);
}
void RigidBody2D::AddImpulse(const Vector2f& impulse, const Vector2f& point, CoordSys coordSys)
{
switch (coordSys)
{
case CoordSys_Global:
cpBodyApplyImpulseAtWorldPoint(m_handle, cpv(impulse.x, impulse.y), cpv(point.x, point.y));
break;
case CoordSys_Local:
cpBodyApplyImpulseAtLocalPoint(m_handle, cpv(impulse.x, impulse.y), cpv(point.x, point.y));
break;
}
}
void RigidBody2D::AddTorque(float torque) void RigidBody2D::AddTorque(float torque)
{ {
cpBodySetTorque(m_handle, cpBodyGetTorque(m_handle) + torque); cpBodySetTorque(m_handle, cpBodyGetTorque(m_handle) + torque);