Преглед изворни кода

Backend correction for the rigid vs rigid collision resolver:
First line is to ensure similar behavior to current regarding pushback on the object doing the colliding.
Second line applies an impulse to the rigid that was collided with.

Azaezel пре 10 година
родитељ
комит
691a08bb33
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      Engine/source/T3D/rigid.cpp

+ 2 - 2
Engine/source/T3D/rigid.cpp

@@ -156,7 +156,7 @@ bool Rigid::resolveCollision(const Point3F& p, const Point3F &normal, Rigid* rig
       return false;
       return false;
 
 
    // Compute impulse
    // Compute impulse
-   F32 d, n = -nv * (1.0f + restitution * rigid->restitution);
+   F32 d, n = -nv * (2.0f + restitution * rigid->restitution);
    Point3F a1,b1,c1;
    Point3F a1,b1,c1;
    mCross(r1,normal,&a1);
    mCross(r1,normal,&a1);
    invWorldInertia.mulV(a1,&b1);
    invWorldInertia.mulV(a1,&b1);
@@ -173,7 +173,7 @@ bool Rigid::resolveCollision(const Point3F& p, const Point3F &normal, Rigid* rig
 
 
    applyImpulse(r1,impulse);
    applyImpulse(r1,impulse);
    impulse.neg();
    impulse.neg();
-   applyImpulse(r2,impulse);
+   rigid->applyImpulse(r2, impulse);
    return true;
    return true;
 }
 }