X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=move_square.cc;h=664b70f50d1320dab97f816cf0dc355723a1da1e;hb=24b702cd5e7623bd4f427814cdaec748f8f27074;hp=5aed572d766a630d763eee9b3020b9cbc21f3b2c;hpb=3caf13085a6ae1ae41d6f489c8b69206b0ffa48d;p=universe.git diff --git a/move_square.cc b/move_square.cc index 5aed572..664b70f 100644 --- a/move_square.cc +++ b/move_square.cc @@ -29,13 +29,24 @@ public: else if(degree == 1) _square_size = 150; else if(degree == 2) _square_size = 100; else _square_size = 50; - scalar_t x[] = { -_square_size/2, _square_size/2, _square_size/2, -_square_size/2 }; - scalar_t y[] = { -_square_size/2, -_square_size/2, _square_size/2, _square_size/2 }; + + scalar_t x[] = { + -_square_size / 2.0, _square_size / 2.0, + _square_size / 2.0, -_square_size / 2.0 + }; + + scalar_t y[] = { + -_square_size / 2.0, -_square_size / 2.0, + _square_size / 2.0, _square_size / 2.0 + }; + _target = new Polygon(0.5, 1.0, 1.0, 0.0, x, y, 4); _target->set_position(_square_size/2, _square_size/2 + (world_height - _square_size) * drand48(), 0); _target->set_speed(0, 0, 0); - universe->initialize(_target); + + universe->initialize_polygon(_target); universe->add_polygon(_target); + if(degree == 4) { Polygon *obstacle; scalar_t x[] = { ( 9 * world_width)/20, (11 * world_width)/20, @@ -46,7 +57,7 @@ public: obstacle->set_position(world_width/2, world_height/2, 0); obstacle->set_speed(0, 0, 0); obstacle->_nailed = true; - universe->initialize(obstacle); + universe->initialize_polygon(obstacle); universe->add_polygon(obstacle); } } @@ -59,7 +70,9 @@ public: _target->set_speed(0, 0, 0); manipulator->force_release(); return 1.0; - } else return 0.0; + } else { + return 0.0; + } } virtual void draw(SimpleWindow *window) {