X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=d7fb2b859ed61408abb4bff097db1642ab096674;hb=5116fff210cdc3f0fbdae13046cc60450aad5e8f;hp=2bb079d62f3ab5c8c1d77ceab832294611f30bee;hpb=ec1f75d72e5c4f7f7c9dafdf80f58c30ffb1a855;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 2bb079d..d7fb2b8 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -17,8 +17,7 @@
 #include "network/server.h"
 #include "options.h"
 
-class MainPanel;
-class TrainPanel;
+class MainWindow;
 class TrainView;
 
 class Engineer: public Msp::RegisteredApplication<Engineer>
@@ -49,8 +48,8 @@ private:
 	Msp::GL::Pipeline pipeline;
 	Msp::GL::Mesh arrow_mesh;
 
-	MainPanel *main_panel;
-	std::list<TrainPanel *> train_panels;
+	MainWindow *main_wnd;
+	std::list<R2C2::Train *> new_trains;
 	std::list<TrainView *> train_views;
 	Msp::Time::TimeStamp status_timeout;
 	bool picking;
@@ -71,7 +70,6 @@ public:
 	R2C2::Layout3D &get_layout_3d() { return layout_3d; }
 	const Msp::GL::Lighting &get_lighting() const { return lighting; }
 	void set_status(const std::string &);
-	void rearrange_panels();
 	void add_train_view(TrainView &);
 	void remove_train_view(TrainView &);
 	void pick(bool);
@@ -82,12 +80,11 @@ private:
 	void button_press(unsigned);
 	void axis_motion(unsigned, float, float);
 	void view_all();
-	void set_block_color(const R2C2::Block &, const Msp::GL::Color &);
-	void reset_block_color(const R2C2::Block &);
 	void sensor_event(unsigned, bool);
 	void block_reserved(const R2C2::Block &, const R2C2::Train *);
-	R2C2::Track *pick_track(const R2C2::Vector &);
+	R2C2::Object *pick_object(const R2C2::Vector &);
 	void train_added(R2C2::Train &);
+	void process_new_train(R2C2::Train &);
 	virtual void sighandler(int);
 };