X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainview.cpp;h=c76e123bce7450e12d4a065f08ed47f2bb93a2aa;hb=c0e076401ee76fd9a5a96ff919a8e7b4d058c51b;hp=dffa04dde651be1768bda8b6ee20ed9cf4840ab6;hpb=7a36d396eded897c421424905b2c938d770df341;p=r2c2.git

diff --git a/source/engineer/trainview.cpp b/source/engineer/trainview.cpp
index dffa04d..c76e123 100644
--- a/source/engineer/trainview.cpp
+++ b/source/engineer/trainview.cpp
@@ -1,6 +1,9 @@
+#include <msp/core/maputils.h>
 #include <msp/gl/tests.h>
 #include <msp/gltk/button.h>
 #include <msp/gltk/image.h>
+#include <msp/gltk/label.h>
+#include <msp/strings/format.h>
 #include "libr2c2/vehicle.h"
 #include "libr2c2/vehicletype.h"
 #include "engineer.h"
@@ -9,72 +12,43 @@
 using namespace Msp;
 using namespace R2C2;
 
-TrainView::TrainView(Engineer &e, const Train &t):
-	engineer(e),
+TrainView::TrainView(Engineer &engineer, const Train &t):
+	DynamicDialog(engineer.get_user_interface()),
 	train(t),
 	mode(SIDE),
 	forward(true),
-	pipeline(280, 280, false),
-	stale(false)
+	view(engineer.get_layout_3d(), 400, 300)
 {
-	set_size(300, 330);
+	Loader::WidgetMap widgets;
+	DataFile::load(*this, "data/trainview.ui", widgets);
+
+	dynamic_cast<GLtk::Label *>(get_item(widgets, "lbl_title"))->set_text(format("View of %s", train.get_name()));
+	dynamic_cast<GLtk::Toggle *>(get_item(widgets, "tgl_forward"))->signal_toggled.connect(sigc::mem_fun(this, &TrainView::set_forward));
+	dynamic_cast<GLtk::Toggle *>(get_item(widgets, "tgl_roof"))->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainView::ui_mode_toggled), ROOF));
+	dynamic_cast<GLtk::Toggle *>(get_item(widgets, "tgl_side"))->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainView::ui_mode_toggled), SIDE));
+	dynamic_cast<GLtk::Toggle *>(get_item(widgets, "tgl_head"))->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainView::ui_mode_toggled), HEAD));
 
 	tex.set_min_filter(GL::LINEAR);
-	tex.storage(GL::RGB, 280, 280);
+	tex.storage(GL::RGB, 400, 300);
 	tex.image(0, GL::RGB, GL::UNSIGNED_BYTE, 0);
 	fbo.attach(GL::COLOR_ATTACHMENT0, tex, 0);
-	depth.storage(GL::DEPTH_COMPONENT, 280, 280);
+	depth.storage(GL::DEPTH_COMPONENT, 400, 300);
 	fbo.attach(GL::DEPTH_ATTACHMENT, depth);
 
-	camera.set_up_direction(GL::Vector3(0, 0, 1));
-	camera.set_depth_clip(0.01, 10);
-	camera.set_aspect(1);
-	pipeline.set_camera(&camera);
-
-	pipeline.add_renderable(engineer.get_layout_3d().get_scene());
-
-	GL::Pipeline::Pass *pass = &pipeline.add_pass(0);
-	pass->set_depth_test(&GL::DepthTest::lequal());
-	pass->set_lighting(&engineer.get_lighting());
-
-	GLtk::Image *image;
-	add(*(image = new GLtk::Image(&tex)));
-	image->set_geometry(GLtk::Geometry(10, 40, geom.w-20, geom.h-50));
-
-	GLtk::Button *btn;
-
-	add(*(btn = new GLtk::Button("Roof")));
-	btn->set_geometry(GLtk::Geometry(10, 10, 36, 25));
-	btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &TrainView::set_mode), ROOF));
-
-	add(*(btn = new GLtk::Button("Side")));
-	btn->set_geometry(GLtk::Geometry(46, 10, 36, 25));
-	btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &TrainView::set_mode), SIDE));
-
-	add(*(btn = new GLtk::Button("Head")));
-	btn->set_geometry(GLtk::Geometry(82, 10, 36, 25));
-	btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &TrainView::set_mode), HEAD));
-
-	add(*(tgl_forward = new GLtk::Toggle("Fwd")));
-	tgl_forward->set_geometry(GLtk::Geometry(118, 8, 36, 27));
-	tgl_forward->set_value(true);
-	tgl_forward->signal_toggled.connect(sigc::mem_fun(this, &TrainView::set_forward));
-
-	add(*(btn = new GLtk::Button("Close")));
-	btn->set_geometry(GLtk::Geometry(geom.w-46, 10, 36, 25));
-	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainView::close_clicked));
+	view.get_camera().set_depth_clip(0.01, 10);
 
-	engineer.add_train_view(*this);
+	dynamic_cast<GLtk::Image *>(get_item(widgets, "img_view"))->set_image(&tex);
 }
 
-TrainView::~TrainView()
+void TrainView::set_mode(Mode m)
 {
-	engineer.remove_train_view(*this);
+	mode = m;
 }
 
-void TrainView::set_mode(Mode m)
+void TrainView::ui_mode_toggled(bool v, Mode m)
 {
-	mode = m;
+	if(v)
+		set_mode(m);
 }
 
 void TrainView::set_forward(bool f)
@@ -82,7 +56,7 @@ void TrainView::set_forward(bool f)
 	forward = f;
 }
 
-void TrainView::prepare()
+void TrainView::update()
 {
 	const Vehicle &veh = train.get_vehicle(0);
 	const Vector &pos = veh.get_position();
@@ -93,14 +67,15 @@ void TrainView::prepare()
 	Vector side_vec = rotated_vector(Vector(0, -1, 0), angle);
 	float l = veh.get_type().get_length();
 
+	GL::Camera &camera = view.get_camera();
 	switch(mode)
 	{
 	case ROOF:
 		camera.set_position(pos-l*fwd_vec+Vector(0, 0, 0.07));
-		camera.set_look_direction(fwd_vec-Vector(0, 0, -0.2));
+		camera.set_look_direction(fwd_vec-Vector(0, 0, 0.2));
 		break;
 	case SIDE:
-		camera.set_position(pos-0.8f*fwd_vec+0.05f*side_vec+Vector(0, 0, 0.03));
+		camera.set_position(pos-0.08f*fwd_vec+0.05f*side_vec+Vector(0, 0, 0.03));
 		camera.set_look_direction(fwd_vec-side_vec*0.2f);
 		break;
 	case HEAD:
@@ -111,17 +86,5 @@ void TrainView::prepare()
 
 	GL::Bind _bind_fbo(fbo);
 	fbo.clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
-	pipeline.render();
-}
-
-void TrainView::button_release(int x, int y, unsigned btn)
-{
-	GLtk::Panel::button_release(x, y, btn);
-	if(stale)
-		delete this;
-}
-
-void TrainView::close_clicked()
-{
-	stale = true;
+	view.render();
 }