asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #35385 from akien-mga/bullet-prevent-div-by-zero

Browse source 
Bullet: Prevent potential division by zero
This commit is contained in:
Rémi Verschelde 2020-01-21 08:13:53 +01:00 committed by GitHub
commit a948782110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/bullet/rigid_body_bullet.cpp
View file

@ -795,12 +795,12 @@ Vector3 RigidBodyBullet::get_angular_velocity() const {
void RigidBodyBullet::set_transform__bullet(const btTransform &p_global_transform) { void RigidBodyBullet::set_transform__bullet(const btTransform &p_global_transform) {
if (mode == PhysicsServer::BODY_MODE_KINEMATIC) { if (mode == PhysicsServer::BODY_MODE_KINEMATIC) {
if (space) if (space && space->get_delta_time() != 0)
btBody->setLinearVelocity((p_global_transform.getOrigin() - btBody->getWorldTransform().getOrigin()) / space->get_delta_time()); btBody->setLinearVelocity((p_global_transform.getOrigin() - btBody->getWorldTransform().getOrigin()) / space->get_delta_time());
// The kinematic use MotionState class // The kinematic use MotionState class
godotMotionState->moveBody(p_global_transform); godotMotionState->moveBody(p_global_transform);
} else { } else {
// Is necesasry to avoid wrong location on the rendering side on the next frame // Is necessary to avoid wrong location on the rendering side on the next frame
godotMotionState->setWorldTransform(p_global_transform); godotMotionState->setWorldTransform(p_global_transform);
} }
CollisionObjectBullet::set_transform__bullet(p_global_transform); CollisionObjectBullet::set_transform__bullet(p_global_transform);