diff --git a/skeleton/main b/skeleton/main index 8ab4f3fb6ea73203ef4749761a599a71fffd5f35..c019f70a5cb130e5b443dbb74aad667e78f1bcd8 100755 Binary files a/skeleton/main and b/skeleton/main differ diff --git a/skeleton/main.c b/skeleton/main.c index a356c18a962d07939ae7c68a080e8b89ac2fe0f5..72c77f339e27d6fe666e03b5c28686a61cb4a6bf 100644 --- a/skeleton/main.c +++ b/skeleton/main.c @@ -32,7 +32,7 @@ int main() system_t system = create_system(planet, NB_PLANETS); for (uint16_t i = 0; i < NB_PLANETS; ++i) { system.planets[i].prec_pos=system.planets[i].pos; - system.planets[i].pos = vec2_add(vec2_sub(system.planets[i].pos,vec2_mul(DELTA_T, vitessePerihelie(system.planets[i],&system))),vec2_mul(pow(DELTA_T,2)/2,acceleration(system.planets[i],&system))); + system.planets[i].pos = postition_next(system.planets[i],DELTA_T,&system); } while (true) { diff --git a/skeleton/main.o b/skeleton/main.o index ff41c7f3ee81ecefbabbedded94ee24f5700a121..b439467dfc8e155b20087e69f726e037516eaf59 100644 Binary files a/skeleton/main.o and b/skeleton/main.o differ diff --git a/skeleton/planet/planet.h b/skeleton/planet/planet.h index 647095bd319d769482a19bb0f22bdc9880b50571..a6e0cff396b3b3881833408d5c6b5465c1ba0eaf 100644 --- a/skeleton/planet/planet.h +++ b/skeleton/planet/planet.h @@ -69,9 +69,8 @@ vec2 gravitationForce(planet_t a, planet_t b); vec2 force_resultante(system_t *system, planet_t p); vec2 vitessePerihelie(planet_t p, system_t *system); vec2 acceleration(planet_t p, system_t *system); -//vec2 pos_init(planet_t p, double delta_t, system_t *system); vec2 postition_next(planet_t p, double delta_t, system_t *system); -planet_t create_planet(double mass,double rayon, double excentricite, double demi_grand_axe, int color); +planet_t create_planet(double mass,double rayon, double excentricite, double demi_grand_axe, int couleur); system_t create_system(planet_t *planet, int nb_); void show_system(struct gfx_context_t *ctxt, system_t *system, int width, int height, long resolution); void update_system(system_t *system, double delta_t);