History

fix crash for bad avatar body on login

Andrew Meadows committed 11 years ago

Commit da9ceac1 parent 099a2b51 file · +10 −7Browse files

Showing the changes to libraries/physics/src/CharacterController.cpp (1 of 1 file). Show all

Unified · Split

libraries/physics/src/CharacterController.cpp+10−7
@@ -786,14 +786,17 @@ void CharacterController::setEnabled(bool enabled) { · 785 unmodified lines
786786
787787 void CharacterController::setDynamicsWorld(btDynamicsWorld* world) {
788788 if (_dynamicsWorld != world) {
789− if (_dynamicsWorld) {
790− _dynamicsWorld->removeCollisionObject(getGhostObject());
791− _dynamicsWorld->removeAction(this);
789+ if (_dynamicsWorld) {
790+ if (_ghostObject) {
791+ _dynamicsWorld->removeCollisionObject(_ghostObject);
792+ _dynamicsWorld->removeAction(this);
793+ }
794+ _dynamicsWorld = NULL;
792795 }
793− _dynamicsWorld = world;
794− if (_dynamicsWorld) {
796+ if (world && _ghostObject) {
797+ _dynamicsWorld = world;
795798 _pendingFlags &= ~ PENDING_FLAG_JUMP;
796− _dynamicsWorld->addCollisionObject(getGhostObject(),
799+ _dynamicsWorld->addCollisionObject(_ghostObject,
797800 btBroadphaseProxy::CharacterFilter,
798801 btBroadphaseProxy::StaticFilter | btBroadphaseProxy::DefaultFilter);
799802 _dynamicsWorld->addAction(this);
@@ -876,7 +879,7 @@ void CharacterController::preSimulation(btScalar timeStep) { · 76 unmodified lines
876879 }
877880
878881 void CharacterController::postSimulation() {
879− if (_enabled) {
882+ if (_enabled && _ghostObject) {
880883 const btTransform& avatarTransform = _ghostObject->getWorldTransform();
881884 glm::quat rotation = bulletToGLM(avatarTransform.getRotation());
882885 glm::vec3 position = bulletToGLM(avatarTransform.getOrigin());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t