Make designer work on generic objects

[r2c2.git] / source / engineer / engineer.cpp

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index ba92933430ee013690ae1164b7da977c644cd640..e19c11e063707a8e7e91383a51044e9ce100f8df 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -11,7 +11,6 @@
 #include <msp/gl/framebuffer.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/misc.h>
-#include <msp/gl/projection.h>
 #include <msp/gl/tests.h>
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
@@ -53,8 +52,8 @@ Engineer::Engineer(int argc, char **argv):
        window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0));
 
        root = new GLtk::Root(ui_res, window);
-       mouse.signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press));
-       mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Engineer::axis_motion));
+       mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Engineer::button_press), false));
+       mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Engineer::axis_motion), false));
        root->set_visible(true);
 
        main_panel = new MainPanel(*this);
@@ -417,9 +416,10 @@ void Engineer::train_added(Train &train)
        for(unsigned i=0; i<10; ++i)
        {
                GL::Color color;
-               color.r = rand()*1.0/RAND_MAX;
-               color.g = rand()*1.0/RAND_MAX;
-               color.b = rand()*1.0/RAND_MAX;
+               unsigned h = rand()%3;
+               color.r = (h==0 ? 0.0 : rand()*1.0/RAND_MAX);
+               color.g = (h==1 ? 0.0 : rand()*1.0/RAND_MAX);
+               color.b = (h==2 ? 0.0 : rand()*1.0/RAND_MAX);
                color = color*(1/max(max(color.r, color.g), color.b));
                float min_d_sq = 3;
                for(map<Train *, GL::Color>::const_iterator j=train_colors.begin(); j!=train_colors.end(); ++j)