mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix assert raised in empty scene

Browse Source
This commit is contained in:
Daniel Chappuis 2016-05-18 22:30:20 +02:00
parent ae7bec43c4
commit c3e74856a0
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/ConstraintSolver.h
View File

@ -202,8 +202,6 @@ class ConstraintSolver {
// Set the constrained velocities arrays // Set the constrained velocities arrays
inline void ConstraintSolver::setConstrainedVelocitiesArrays(Vector3* constrainedLinearVelocities, inline void ConstraintSolver::setConstrainedVelocitiesArrays(Vector3* constrainedLinearVelocities,
Vector3* constrainedAngularVelocities) { Vector3* constrainedAngularVelocities) {
assert(constrainedLinearVelocities != NULL);
assert(constrainedAngularVelocities != NULL);
mConstraintSolverData.linearVelocities = constrainedLinearVelocities; mConstraintSolverData.linearVelocities = constrainedLinearVelocities;
mConstraintSolverData.angularVelocities = constrainedAngularVelocities; mConstraintSolverData.angularVelocities = constrainedAngularVelocities;
} }
@ -211,8 +209,6 @@ inline void ConstraintSolver::setConstrainedVelocitiesArrays(Vector3* constraine
// Set the constrained positions/orientations arrays // Set the constrained positions/orientations arrays
inline void ConstraintSolver::setConstrainedPositionsArrays(Vector3* constrainedPositions, inline void ConstraintSolver::setConstrainedPositionsArrays(Vector3* constrainedPositions,
Quaternion* constrainedOrientations) { Quaternion* constrainedOrientations) {
assert(constrainedPositions != NULL);
assert(constrainedOrientations != NULL);
mConstraintSolverData.positions = constrainedPositions; mConstraintSolverData.positions = constrainedPositions;
mConstraintSolverData.orientations = constrainedOrientations; mConstraintSolverData.orientations = constrainedOrientations;
} }

4
src/engine/ContactSolver.h
View File

@ -453,8 +453,6 @@ class ContactSolver {
// Set the split velocities arrays // Set the split velocities arrays
inline void ContactSolver::setSplitVelocitiesArrays(Vector3* splitLinearVelocities, inline void ContactSolver::setSplitVelocitiesArrays(Vector3* splitLinearVelocities,
Vector3* splitAngularVelocities) { Vector3* splitAngularVelocities) {
assert(splitLinearVelocities != NULL);
assert(splitAngularVelocities != NULL);
mSplitLinearVelocities = splitLinearVelocities; mSplitLinearVelocities = splitLinearVelocities;
mSplitAngularVelocities = splitAngularVelocities; mSplitAngularVelocities = splitAngularVelocities;
} }
@ -462,8 +460,6 @@ inline void ContactSolver::setSplitVelocitiesArrays(Vector3* splitLinearVelociti
// Set the constrained velocities arrays // Set the constrained velocities arrays
inline void ContactSolver::setConstrainedVelocitiesArrays(Vector3* constrainedLinearVelocities, inline void ContactSolver::setConstrainedVelocitiesArrays(Vector3* constrainedLinearVelocities,
Vector3* constrainedAngularVelocities) { Vector3* constrainedAngularVelocities) {
assert(constrainedLinearVelocities != NULL);
assert(constrainedAngularVelocities != NULL);
mLinearVelocities = constrainedLinearVelocities; mLinearVelocities = constrainedLinearVelocities;
mAngularVelocities = constrainedAngularVelocities; mAngularVelocities = constrainedAngularVelocities;
} }