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
include/NazaraSDK/Components/CollisionComponent2D.hpp
View File

@@ -35,11 +35,11 @@ namespace Ndk
void Recenter(const Nz::Vector2f& origin);
void SetGeom(Nz::Collider2DRef geom);
void SetGeom(Nz::Collider2DRef geom, bool recomputeMoment = true, bool recomputeMassCenter = true);
void SetGeomOffset(const Nz::Vector2f& geomOffset);
CollisionComponent2D& operator=(Nz::Collider2DRef geom);
CollisionComponent2D& operator=(CollisionComponent2D&& collision) = default;
CollisionComponent2D& operator=(CollisionComponent2D&& collision) = delete;
static ComponentIndex componentIndex;

2
include/NazaraSDK/Components/CollisionComponent3D.hpp
View File

@@ -32,7 +32,7 @@ namespace Ndk
void SetGeom(Nz::Collider3DRef geom);
CollisionComponent3D& operator=(Nz::Collider3DRef geom);
CollisionComponent3D& operator=(CollisionComponent3D&& collision) = default;
CollisionComponent3D& operator=(CollisionComponent3D&& collision) = delete;
static ComponentIndex componentIndex;