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-22 12:36:03 +01:00
parent a53a916399 d68cb35056
commit b0390221b5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ namespace Nz
friend RigidBody2D; friend RigidBody2D;
public: public:
Collider2D() = default; inline Collider2D();
Collider2D(const Collider2D&) = delete; Collider2D(const Collider2D&) = delete;
Collider2D(Collider2D&&) = delete; Collider2D(Collider2D&&) = delete;
virtual ~Collider2D(); virtual ~Collider2D();

6
include/Nazara/Physics2D/Collider2D.inl
View File

@ -7,6 +7,12 @@
namespace Nz namespace Nz
{ {
inline Collider2D::Collider2D() :
m_collisionId(0),
m_trigger(false)
{
}
inline unsigned int Collider2D::GetCollisionId() const inline unsigned int Collider2D::GetCollisionId() const
{ {
return m_collisionId; return m_collisionId;