Better visualization for placing a train

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

diff --git a/source/engineer/controlpanel.cpp b/source/engineer/controlpanel.cpp
index e81d25c366d9b671b7193a312b84e3853232aed7..050b37623fb98c472294c75078ea325f39e98312 100644 (file)
--- a/source/engineer/controlpanel.cpp
+++ b/source/engineer/controlpanel.cpp
@@ -6,6 +6,7 @@
 #include "libr2c2/vehicle.h"
 #include "controlpanel.h"
 #include "engineer.h"
+#include "placementghost.h"
 #include "trainview.h"
 
 using namespace std;
@@ -58,14 +59,13 @@ void ControlPanel::train_function_changed(unsigned func, bool value)
 
 void ControlPanel::place_clicked()
 {
-       pick_conn = engineer.signal_pick_done.connect(sigc::mem_fun(this, &ControlPanel::place_pick_done));
-       engineer.pick(true);
-}
+       signal_grab_pointer.emit();
+       placing = true;
 
-void ControlPanel::place_pick_done(Track *track, unsigned ep)
-{
-       pick_conn.disconnect();
-       train.place(TrackIter(track, ep).block_iter());
+       Layout3D &layout3d = engineer.get_layout_3d();
+       unsigned n_vehs = train.get_n_vehicles();
+       for(unsigned i=0; i<n_vehs; ++i)
+               ghosts.push_back(new PlacementGhost(layout3d, train.get_vehicle(i).get_type()));
 }
 
 void ControlPanel::take_clicked()
@@ -83,3 +83,45 @@ void ControlPanel::view_clicked()
        root->add(*dlg);
        dlg->autosize();
 }
+
+void ControlPanel::button_press(int x, int y, unsigned btn)
+{
+       Panel::button_press(x, y, btn);
+
+       if(placing)
+       {
+               signal_ungrab_pointer.emit();
+               placing = false;
+
+               for(vector<PlacementGhost *>::iterator i=ghosts.begin(); i!=ghosts.end(); ++i)
+                       delete *i;
+               ghosts.clear();
+
+               if(btn==1 && place_location)
+                       train.place(place_location);
+       }
+}
+
+void ControlPanel::pointer_motion(int x, int y)
+{
+       Panel::pointer_motion(x, y);
+
+       if(placing)
+       {
+               int rx = x;
+               int ry = y;
+               map_coords_to_ancestor(rx, ry, *find_ancestor<GLtk::Root>());
+               Ray ray = engineer.get_main_view().create_ray(rx, ry);
+               Track *track = engineer.get_layout().pick<Track>(ray);
+               if(track)
+               {
+                       place_location = TrackIter(track, 0).block_iter();
+                       if(place_location)
+                       {
+                               ghosts.back()->place(place_location.track_iter());
+                               for(unsigned i=ghosts.size()-1; i--; )
+                                       ghosts[i]->place_before(*ghosts[i+1]);
+                       }
+               }
+       }
+}