X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainview.h;h=598b43fab9209bb520228bd886d9961e9f8e5b34;hb=862d8bea6d31e6fe9a60747e0b9559f77e72bf44;hp=a452a71912cca03e0bde0a946301e12d489cac1d;hpb=3889ed84ee54c312436503f2fd1e328f4a2ba5e5;p=r2c2.git

diff --git a/source/engineer/trainview.h b/source/engineer/trainview.h
index a452a71..598b43f 100644
--- a/source/engineer/trainview.h
+++ b/source/engineer/trainview.h
@@ -1,23 +1,16 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef TRAINVIEW_H_
 #define TRAINVIEW_H_
 
 #include <msp/gl/renderbuffer.h>
 #include <msp/gl/framebuffer.h>
 #include <msp/gl/texture2d.h>
-#include <msp/gltk/panel.h>
+#include <msp/gltk/dialog.h>
 #include <msp/gltk/toggle.h>
-#include "libmarklin/train.h"
+#include "libr2c2/train.h"
 
 class Engineer;
 
-class TrainView: public Msp::GLtk::Panel
+class TrainView: public Msp::GLtk::Dialog
 {
 public:
 	enum Mode
@@ -29,27 +22,25 @@ public:
 
 private:
 	Engineer &engineer;
-	const Marklin::Train &train;
+	const R2C2::Train &train;
 	Msp::GLtk::Toggle *tgl_forward;
 	Mode mode;
 	bool forward;
 	Msp::GL::Framebuffer fbo;
 	Msp::GL::Texture2D tex;
 	Msp::GL::Renderbuffer depth;
-	Msp::GL::Camera camera;
-	Msp::GL::Pipeline pipeline;
-	bool stale;
+	R2C2::View3D view;
 
 public:
-	TrainView(Engineer &, const Marklin::Train &);
+	TrainView(Engineer &, const R2C2::Train &);
 	~TrainView();
 
 	void set_mode(Mode);
+private:
+	void ui_mode_toggled(bool, Mode);
+public:
 	void set_forward(bool);
 	void prepare();
-private:
-	virtual void button_release(int, int, unsigned);
-	void close_clicked();
 };
 
 #endif