NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OnPossibleCollision updated

This commit is contained in:
Dander7BD 2013-12-20 11:44:27 +01:00
parent a440cffb0e
commit ca90b3ae3b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp
View File

@ -65,6 +65,14 @@ namespace
//sumJ += ( 1 / deuterState.GetMass() )*frictionImpulse; //sumJ += ( 1 / deuterState.GetMass() )*frictionImpulse;
// FRICTION END // FRICTION END
Float4 forwardedDeltaPos, forwardedDeltaAxis;
{ // @todo TODO: is this right?
Float4 bounceAngularImpulse = ::Oyster::Math::Float4( (worldPointOfContact - protoState.GetCenterPosition()).xyz.Cross(bounce.xyz), 0.0f ),
bounceLinearImpulse = bounce - bounceAngularImpulse;
proto->Predict( forwardedDeltaPos, forwardedDeltaAxis, bounceLinearImpulse, bounceAngularImpulse, API_instance.GetFrameTimeLength() );
}
protoState.ApplyForwarding( forwardedDeltaPos, forwardedDeltaAxis );
protoState.ApplyImpulse( bounce, worldPointOfContact, normal ); protoState.ApplyImpulse( bounce, worldPointOfContact, normal );
proto->SetState( protoState ); proto->SetState( protoState );
} }