(20111216) 20:00

This commit is contained in:
2011-12-16 20:00:00 +01:00
parent 5a8cfe79bd
commit 0f403b8234
12 changed files with 255 additions and 35 deletions

View File

@@ -131,6 +131,7 @@ void Entity_PostProcess(Entity *e,int ft){
vec2_scale(e->vel,e->vel,
1.0f-(e->fric_dynamic+(e->fric_static/len)));
}
}
// Animate
@@ -146,7 +147,7 @@ void Entity_CollisionResponse(
Entity *b1,Entity *b2,float t,vec2 n)
{
float moment;
vec2 temp,temp2;
vec2 temp;
float elast;
if(b1->mass>0.0f && b2->mass>0.0f){
@@ -194,7 +195,6 @@ int Entity_Collide(Entity *b1,Entity *b2){
float t;
vec2 n;
vec2 cir1[2];
vec2 cir1i,cir2i;
Entity *b_aux;
// FIX: Swap colision order based on moving object