X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=universe.cc;h=4a2e4f9e1189a8d4921c853a316d477a56686e8b;hb=e9a44449a4002827894a51cdbb9072d423cba765;hp=92b7a1b702558bc806c3efa719daee6f1dd22626;hpb=8697ab57c9138aa2bb1657a971e4c2cc5e4a1606;p=universe.git

diff --git a/universe.cc b/universe.cc
index 92b7a1b..4a2e4f9 100644
--- a/universe.cc
+++ b/universe.cc
@@ -7,18 +7,20 @@
 #include "universe.h"
 
 Universe::Universe(int nb_max_polygons,
-                   scalar_t width, scalar_t height) : _width(width), _height(height),
-                                                   _nb_max_polygons(nb_max_polygons), _nb_polygons(0) {
+                   scalar_t width, scalar_t height) : _width(width),
+                                                      _height(height),
+                                                      _nb_max_polygons(nb_max_polygons),
+                                                      _nb_polygons(0) {
   _polygons = new Polygon *[_nb_max_polygons];
   for(int n = 0; n < _nb_max_polygons; n++) _polygons[n] = 0;
 }
 
 Universe::~Universe() {
-  for(int n = 0; n < _nb_polygons; n++) if(_polygons[n]) delete _polygons[n];
+  clear();
   delete[] _polygons;
 }
 
-void Universe::initialize(Polygon *p) {
+void Universe::initialize_polygon(Polygon *p) {
   p->initialize(_nb_max_polygons);
 }
 
@@ -116,6 +118,7 @@ Polygon *Universe::pick_polygon(scalar_t x, scalar_t y) {
   return 0;
 }
 
+#ifdef XFIG_SUPPORT
 void Universe::print_xfig(XFigTracer *tracer) {
   for(int n = 0; n < _nb_polygons; n++) {
     if(_polygons[n]) {
@@ -128,6 +131,7 @@ void Universe::print_xfig(XFigTracer *tracer) {
     }
   }
 }
+#endif
 
 #ifdef X11_SUPPORT
 void Universe::draw(SimpleWindow *window) {
@@ -145,21 +149,19 @@ void Universe::draw(SimpleWindow *window) {
 }
 #endif
 
-#ifdef CAIRO_SUPPORT
-void Universe::draw(cairo_t *context_resource) {
+void Universe::draw(Canvas *canvas) {
   for(int n = 0; n < _nb_polygons; n++) {
     if(_polygons[n]) {
-      _polygons[n]->draw(context_resource);
+      _polygons[n]->draw(canvas);
     }
   }
 
   for(int n = 0; n < _nb_polygons; n++) {
     if(_polygons[n]) {
-      _polygons[n]->draw_contours(context_resource);
+      _polygons[n]->draw_contours(canvas);
     }
   }
 }
-#endif
 
 void Universe::apply_collision_forces(scalar_t dt) {
   const int nb_axis = 2;