enabled antialiasing. GL bug persists on MacOS

Author: rtv

libstage/blockgroup.cc

@@ -113,17 +113,17 @@ void BlockGroup::CalcSize()
 
 void BlockGroup::Map(unsigned int layer)
 {
- static size_t count = 0;
- printf( "BlockGroup::Map %lu (%lu)\n", ++count, blocks.size() );
+  //static size_t count = 0;
+ //printf( "BlockGroup::Map %lu (%lu)\n", ++count, blocks.size() );
 
   FOR_EACH (it, blocks)
       it->Map(layer);
 }
 
 void BlockGroup::UnMap(unsigned int layer)
 {
- static size_t count = 0;
- printf( "BlockGroup::UnMap %lu (%lu)\n", ++count, blocks.size() );
+  //static size_t count = 0;
+  //printf( "BlockGroup::UnMap %lu (%lu)\n", ++count, blocks.size() );
 
   FOR_EACH (it, blocks)
     it->UnMap(layer);

libstage/canvas.cc

@@ -82,6 +82,8 @@ Canvas::Canvas(WorldGui *world, int x, int y, int width, int height)
   // configuring GL
   // but that line causes a segfault in Linux/X11! TODO: test in OS X
 
+  mode(  FL_RGB|FL_DOUBLE|FL_DEPTH|FL_MULTISAMPLE );
+  
   perspective_camera.setPose(0.0, -4.0, 3.0);
   current_camera = &camera;
   setDirtyBuffer();
@@ -691,11 +693,11 @@ void Canvas::DrawBoundingBoxes()
   glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
   glLineWidth(2.0);
   glPointSize(5.0);
-  glDisable(GL_CULL_FACE);
+  //glDisable(GL_CULL_FACE);
 
   world->DrawBoundingBoxTree();
 
-  glEnable(GL_CULL_FACE);
+  //glEnable(GL_CULL_FACE);
   glLineWidth(1.0);
   glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 }

libstage/model.cc

@@ -379,13 +379,8 @@ void Model::LoadBlock(Worldfile *wf, int entity)
 
 void Model::AddBlockRect(meters_t x, meters_t y, meters_t dx, meters_t dy, meters_t dz)
 {
-  static size_t count=0;
-  printf( "abr %lu\n", ++count );
-
-  puts( "unmap start" );
   UnMap();
-  puts( "unmap done" );
-  
+    
   std::vector<point_t> pts(4);
   pts[0].x = x;
   pts[0].y = y;
@@ -398,9 +393,7 @@ void Model::AddBlockRect(meters_t x, meters_t y, meters_t dx, meters_t dy, meter
 
   blockgroup.AppendBlock(Block(&blockgroup, pts, Bounds(0, dz)));
 
-  puts( "map start" );
   Map();
-  puts( "map done\n" );
 }
 
 // convert a global pose into the model's local coordinate system