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

Merge branch 'Minigeee-develop' into develop

Browse Source
This commit is contained in:
Daniel Chappuis 2021-07-01 23:32:13 +02:00
commit afa4fd7253
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/reactphysics3d/body/RigidBody.h
View File

@ -222,6 +222,7 @@ class RigidBody : public CollisionBody {
friend class SolveHingeJointSystem; friend class SolveHingeJointSystem;
friend class SolveSliderJointSystem; friend class SolveSliderJointSystem;
friend class Joint; friend class Joint;
friend class Collider;
}; };
/// Compute the inverse of the inertia tensor in world coordinates. /// Compute the inverse of the inertia tensor in world coordinates.

2
src/collision/Collider.cpp
View File

@ -114,7 +114,7 @@ void Collider::setLocalToBodyTransform(const Transform& transform) {
RigidBody* rigidBody = static_cast<RigidBody*>(mBody); RigidBody* rigidBody = static_cast<RigidBody*>(mBody);
if (rigidBody != nullptr) { if (rigidBody != nullptr) {
mBody->mWorld.mRigidBodyComponents.setIsSleeping(mBody->getEntity(), false); rigidBody->setIsSleeping(false);
} }
mBody->mWorld.mCollisionDetection.updateCollider(mEntity, 0); mBody->mWorld.mCollisionDetection.updateCollider(mEntity, 0);