X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=polygon.cc;h=1d2b3dd434dd42d8ea44aa4fea79d354001b0c7e;hb=5609af651ece7980e4170c9bc0e99e35ed5c13cf;hp=e957ec11e845a49c763371860c6c0f800c4ef754;hpb=fe0be986e63c5dabed472d68b0aa7c91ca0651db;p=universe.git

diff --git a/polygon.cc b/polygon.cc
index e957ec1..1d2b3dd 100644
--- a/polygon.cc
+++ b/polygon.cc
@@ -56,6 +56,7 @@ void Polygon::print_xfig(XFigTracer *tracer) {
                        _nb_vertices, _x, _y);
 }
 
+#ifdef X11_SUPPORT
 void Polygon::draw(SimpleWindow *window) {
   window->color(_red, _green, _blue);
   int x[_nb_vertices], y[_nb_vertices];
@@ -72,23 +73,36 @@ void Polygon::draw_contours(SimpleWindow *window) {
     x[n] = int(_x[n]);
     y[n] = int(_y[n]);
   }
-  window->color(0.0, 0.0, 0.0);
+  // window->color(0.0, 0.0, 0.0);
+  window->color(1.0, 1.0, 1.0);
   for(int n = 0; n < _nb_vertices; n++) {
     window->draw_line(x[n], y[n], x[(n+1)%_nb_vertices], y[(n+1)%_nb_vertices]);
   }
 }
+#endif
 
 #ifdef CAIRO_SUPPORT
 void Polygon::draw(cairo_t* context_resource) {
+  cairo_set_line_width(context_resource, 1.0);
+  cairo_set_source_rgb (context_resource, _red, _green, _blue);
+  cairo_move_to(context_resource, _x[0], _y[0]);
+  for(int n = 0; n < _nb_vertices; n++) {
+    cairo_line_to(context_resource, _x[n], _y[n]);
+  }
+  cairo_close_path(context_resource);
+  cairo_stroke_preserve(context_resource);
+  cairo_fill(context_resource);
 }
 
 void Polygon::draw_contours(cairo_t* context_resource) {
   cairo_set_line_width(context_resource, 1.0);
-  cairo_set_source_rgb (context_resource, 0.0, 0.0, 0.0);
+  // cairo_set_source_rgb (context_resource, 0.0, 0.0, 0.0);
+  cairo_set_source_rgb (context_resource, 1.0, 1.0, 1.0);
+  cairo_move_to(context_resource, _x[0], _y[0]);
   for(int n = 0; n < _nb_vertices; n++) {
-    cairo_move_to(context_resource, _x[n], _y[n]);
-    cairo_line_to(context_resource, _x[(n+1)%_nb_vertices], _y[(n+1)%_nb_vertices]);
+    cairo_line_to(context_resource, _x[n], _y[n]);
   }
+  cairo_close_path(context_resource);
   cairo_stroke(context_resource);
 }
 #endif