Update.

[universe.git] / universe.cc

diff --git a/universe.cc b/universe.cc
index 5d6ed91..92b7a1b 100644 (file)
--- a/universe.cc
+++ b/universe.cc
@@ -7,7 +7,7 @@
 #include "universe.h"
 
 Universe::Universe(int nb_max_polygons,
 #include "universe.h"
 
 Universe::Universe(int nb_max_polygons,

-                   scalar_t xmax, scalar_t ymax) : _xmax(xmax), _ymax(ymax),
+                   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;
                                                    _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;


@@ -104,7 +104,7 @@ bool Universe::update(scalar_t dt) {
   bool result = false;
   apply_collision_forces(dt);
   for(int n = 0; n < _nb_polygons; n++) if(_polygons[n]) {
   bool result = false;
   apply_collision_forces(dt);
   for(int n = 0; n < _nb_polygons; n++) if(_polygons[n]) {

-    _polygons[n]->apply_border_forces(dt, _xmax, _ymax);
+    _polygons[n]->apply_border_forces(dt, _width, _height);

     result |= _polygons[n]->update(dt);
   }
   return result;
     result |= _polygons[n]->update(dt);
   }
   return result;


@@ -116,18 +116,50 @@ Polygon *Universe::pick_polygon(scalar_t x, scalar_t y) {
   return 0;
 }
 
   return 0;
 }
 

-void Universe::print_fig(XFigTracer *tracer) {
+void Universe::print_xfig(XFigTracer *tracer) {

   for(int n = 0; n < _nb_polygons; n++) {
     if(_polygons[n]) {
   for(int n = 0; n < _nb_polygons; n++) {
     if(_polygons[n]) {

-      _polygons[n]->print_fig(tracer);
+      _polygons[n]->color_xfig(tracer);
+    }
+  }
+  for(int n = 0; n < _nb_polygons; n++) {
+    if(_polygons[n]) {
+      _polygons[n]->print_xfig(tracer);

     }
   }
 }
 
     }
   }
 }
 

+#ifdef X11_SUPPORT

 void Universe::draw(SimpleWindow *window) {
 void Universe::draw(SimpleWindow *window) {

-  for(int n = 0; n < _nb_polygons; n++) if(_polygons[n]) _polygons[n]->draw(window);
-  for(int n = 0; n < _nb_polygons; n++) if(_polygons[n]) _polygons[n]->draw_contours(window);
+  for(int n = 0; n < _nb_polygons; n++) {
+    if(_polygons[n]) {
+      _polygons[n]->draw(window);
+    }
+  }
+
+  for(int n = 0; n < _nb_polygons; n++) {
+    if(_polygons[n]) {
+      _polygons[n]->draw_contours(window);
+    }
+  }
+}
+#endif
+
+#ifdef CAIRO_SUPPORT
+void Universe::draw(cairo_t *context_resource) {
+  for(int n = 0; n < _nb_polygons; n++) {
+    if(_polygons[n]) {
+      _polygons[n]->draw(context_resource);
+    }
+  }
+
+  for(int n = 0; n < _nb_polygons; n++) {
+    if(_polygons[n]) {
+      _polygons[n]->draw_contours(context_resource);
+    }
+  }

 }
 }

+#endif

 
 void Universe::apply_collision_forces(scalar_t dt) {
   const int nb_axis = 2;
 
 void Universe::apply_collision_forces(scalar_t dt) {
   const int nb_axis = 2;