TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

physics: fix assertions when particles get very large positions

Browse Source 
Fixes #822
This commit is contained in:
rdb 2020-01-04 21:06:46 +01:00
parent b7017669a1
commit 399797d0b1
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/ReleaseNotes
View File

@ -8,6 +8,7 @@ This is a recommended bugfix release, especially for macOS users.
* macOS thirdparty packages are now linked with libc++ (#584) * macOS thirdparty packages are now linked with libc++ (#584)
* Homebrew Python should now locate Panda libraries correctly (#755) * Homebrew Python should now locate Panda libraries correctly (#755)
* Work around Tk bug cancelling Load Params in Particle Panel on macOS (#811) * Work around Tk bug cancelling Load Params in Particle Panel on macOS (#811)
* Fix NaN assertions when particles get very large positions (#822)
* Add support for Autodesk Maya 2020 * Add support for Autodesk Maya 2020
* Fix maya2egg erroring when running from a pip installation (#709) * Fix maya2egg erroring when running from a pip installation (#709)
* Support .pz and .gz compressed models in deployment system * Support .pz and .gz compressed models in deployment system

3
panda/src/physics/linearFrictionForce.cxx
View File

@ -61,8 +61,7 @@ get_child_vector(const PhysicsObject* po) {
physics_debug(" v "<<v<<" len "<<v.length() physics_debug(" v "<<v<<" len "<<v.length()
<<" friction "<<friction<<" len "<<friction.length() <<" friction "<<friction<<" len "<<friction.length()
<<" dot "<<(normalize(v).dot(normalize(friction)))); <<" dot "<<(normalize(v).dot(normalize(friction))));
assert(friction.almost_equal(LVector3::zero()) assert(friction.almost_equal(LVector3::zero()) || v.dot(friction) < 0.0f);
|| IS_NEARLY_EQUAL(normalize(v).dot(normalize(friction)), -1.0f));
// cary said to cap this at zero so that friction can't reverse your // cary said to cap this at zero so that friction can't reverse your
// direction, but it seems to me that if you're computing: v + (-v * _coef), // direction, but it seems to me that if you're computing: v + (-v * _coef),
// _coef in [0, 1] that this will always be greater than or equal to zero. // _coef in [0, 1] that this will always be greater than or equal to zero.

13
panda/src/physics/linearNoiseForce.cxx
View File

@ -89,17 +89,12 @@ get_child_vector(const PhysicsObject *po) {
LPoint3 p = po->get_position(); LPoint3 p = po->get_position();
// get all of the components // get all of the components
int int_x, int_y, int_z; PN_stdfloat int_x, int_y, int_z;
PN_stdfloat frac_x, frac_y, frac_z; PN_stdfloat frac_x, frac_y, frac_z;
int_x = (int) p[0]; frac_x = std::modf(p[0], &int_x);
frac_x = p[0] - int_x; frac_y = std::modf(p[1], &int_y);
frac_z = std::modf(p[2], &int_z);
int_y = (int) p[1];
frac_y = p[1] - int_y;
int_z = (int) p[2];
frac_z = p[2] - int_z;
// apply the cubic smoother to the fractional values // apply the cubic smoother to the fractional values
PN_stdfloat cubic_x, cubic_y, cubic_z; PN_stdfloat cubic_x, cubic_y, cubic_z;