Fix keeping track of RigidBody2D constraints. Closes #1569.

urho3d · Sep 7, 2016 · 6be0d71 · 6be0d71
1 parent 4bf27d1
commit 6be0d71
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/Source/Urho3D/Graphics/GraphicsDefs.h b/Source/Urho3D/Graphics/GraphicsDefs.h
@@ -356,7 +356,7 @@ enum FaceCameraMode
     FC_DIRECTION,
 };
 
-/// Shadow type
+/// Shadow type.
 enum ShadowQuality
 {
     SHADOWQUALITY_SIMPLE_16BIT = 0,

diff --git a/Source/Urho3D/Urho2D/Constraint2D.cpp b/Source/Urho3D/Urho2D/Constraint2D.cpp
@@ -48,12 +48,6 @@ Constraint2D::Constraint2D(Context* context) :
 
 Constraint2D::~Constraint2D()
 {
-    if (ownerBody_)
-        ownerBody_->RemoveConstraint2D(this);
-
-    if (otherBody_)
-        otherBody_->RemoveConstraint2D(this);
-
     ReleaseJoint();
 }
 
@@ -80,6 +74,12 @@ void Constraint2D::CreateJoint()
     {
         joint_ = physicsWorld_->GetWorld()->CreateJoint(jointDef);
         joint_->SetUserData(this);
+
+        if (ownerBody_)
+            ownerBody_->AddConstraint2D(this);
+
+        if (otherBody_)
+            otherBody_->AddConstraint2D(this);
     }
 }
 
@@ -88,6 +88,12 @@ void Constraint2D::ReleaseJoint()
     if (!joint_)
         return;
 
+    if (ownerBody_)
+        ownerBody_->RemoveConstraint2D(this);
+
+    if (otherBody_)
+        otherBody_->RemoveConstraint2D(this);
+
     if (physicsWorld_)
         physicsWorld_->GetWorld()->DestroyJoint(joint_);
 

diff --git a/Source/Urho3D/Urho2D/Constraint2D.h b/Source/Urho3D/Urho2D/Constraint2D.h
@@ -47,9 +47,9 @@ class URHO3D_API Constraint2D : public Component
 
     /// Handle enabled/disabled state change.
     virtual void OnSetEnabled();
-    /// Create Joint.
+    /// Create joint.
     void CreateJoint();
-    /// Release Joint.
+    /// Release joint.
     void ReleaseJoint();
 
     /// Set other rigid body.

diff --git a/Source/Urho3D/Urho2D/RigidBody2D.cpp b/Source/Urho3D/Urho2D/RigidBody2D.cpp
@@ -395,10 +395,12 @@ void RigidBody2D::ReleaseBody()
     if (!physicsWorld_ || !physicsWorld_->GetWorld())
         return;
 
-    for (unsigned i = 0; i < constraints_.Size(); ++i)
+    // Make a copy for iteration
+    Vector<WeakPtr<Constraint2D> > constraints = constraints_;
+    for (unsigned i = 0; i < constraints.Size(); ++i)
     {
-        if (constraints_[i])
-            constraints_[i]->ReleaseJoint();
+        if (constraints[i])
+            constraints[i]->ReleaseJoint();
     }
 
     for (unsigned i = 0; i < collisionShapes_.Size(); ++i)