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

3
include/Nazara/Physics3D/PhysWorld3D.hpp
View File

@@ -49,7 +49,6 @@ namespace Nz
void SetGravity(const Vector3f& gravity);
void SetMaxStepCount(std::size_t maxStepCount);
void SetSolverModel(unsigned int model);
void SetStepSize(float stepSize);
void SetThreadCount(unsigned int threadCount);
@@ -72,7 +71,7 @@ namespace Nz
CollisionCallback collisionCallback;
};
static int OnAABBOverlap(const NewtonMaterial* const material, const NewtonBody* const body0, const NewtonBody* const body1, int threadIndex);
static int OnAABBOverlap(const NewtonJoint* const contact, float timestep, int threadIndex);
static void ProcessContact(const NewtonJoint* const contact, float timestep, int threadIndex);
std::unordered_map<Nz::UInt64, std::unique_ptr<Callback>> m_callbacks;