Merge branch 'Minigeee-develop' into develop
This commit is contained in:
commit
afa4fd7253
|
@ -222,6 +222,7 @@ class RigidBody : public CollisionBody {
|
|||
friend class SolveHingeJointSystem;
|
||||
friend class SolveSliderJointSystem;
|
||||
friend class Joint;
|
||||
friend class Collider;
|
||||
};
|
||||
|
||||
/// Compute the inverse of the inertia tensor in world coordinates.
|
||||
|
|
|
@ -114,7 +114,7 @@ void Collider::setLocalToBodyTransform(const Transform& transform) {
|
|||
|
||||
RigidBody* rigidBody = static_cast<RigidBody*>(mBody);
|
||||
if (rigidBody != nullptr) {
|
||||
mBody->mWorld.mRigidBodyComponents.setIsSleeping(mBody->getEntity(), false);
|
||||
rigidBody->setIsSleeping(false);
|
||||
}
|
||||
|
||||
mBody->mWorld.mCollisionDetection.updateCollider(mEntity, 0);
|
||||
|
|
Loading…
Reference in New Issue
Block a user