|
@@ -351,7 +351,7 @@ void RigidBodyBullet::set_space(SpaceBullet *p_space) {
|
|
|
|
|
|
void RigidBodyBullet::dispatch_callbacks() {
|
|
void RigidBodyBullet::dispatch_callbacks() {
|
|
/// The check isTransformChanged is necessary in order to call integrated forces only when the first transform is sent
|
|
/// The check isTransformChanged is necessary in order to call integrated forces only when the first transform is sent
|
|
- if ((btBody->isActive() || previousActiveState != btBody->isActive()) && force_integration_callback && isTransformChanged) {
|
|
|
|
|
|
+ if ((btBody->isKinematicObject() || btBody->isActive() || previousActiveState != btBody->isActive()) && force_integration_callback && isTransformChanged) {
|
|
|
|
|
|
if (omit_forces_integration)
|
|
if (omit_forces_integration)
|
|
btBody->clearForces();
|
|
btBody->clearForces();
|
|
@@ -774,10 +774,13 @@ 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)
|
|
|
|
+ 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);
|
|
}
|
|
}
|
|
btBody->setWorldTransform(p_global_transform);
|
|
btBody->setWorldTransform(p_global_transform);
|
|
|
|
+ scratch();
|
|
}
|
|
}
|
|
|
|
|
|
const btTransform &RigidBodyBullet::get_transform__bullet() const {
|
|
const btTransform &RigidBodyBullet::get_transform__bullet() const {
|