X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=e92c0ae161674c1b70d967f7fad5746245b5431a;hb=eb9c7f5200da4f3f31b41233be8cee397cb6abb9;hp=40011ce9ce1e58768281f7c01a8e57203c51aba1;hpb=b14059de03324aecde3efc649293d98ce5b7aaf2;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index 40011ce..e92c0ae 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -1,32 +1,23 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #include #include #include #include #include -#include #include #include -#include -#include +#include +#include #include #include #include #include -#include #include -#include #include -#include +#include #include #include #include "libr2c2/driver.h" +#include "libr2c2/trackcircuit.h" #include "libr2c2/tracktype.h" #include "3d/path.h" #include "3d/track.h" @@ -41,11 +32,12 @@ using namespace std; using namespace R2C2; using namespace Msp; -Application::RegApp Engineer::reg; - Engineer::Engineer(int argc, char **argv): options(argc, argv), window(options.screen_w, options.screen_h, options.fullscreen), + keyboard(window), + mouse(window), + ui_res("r2c2.res"), layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))), layout_3d(layout), server(0), @@ -54,18 +46,15 @@ Engineer::Engineer(int argc, char **argv): picking_track(0), picking_entry(0), picking_path(0), - pointer_x(0), - pointer_y(0), pointer_moved(false) { // Setup GUI window.set_title("Railroad Engineer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0)); - DataFile::load(ui_res, "r2c2.res"); root = new GLtk::Root(ui_res, window); - root->signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press)); - root->signal_pointer_motion.connect(sigc::mem_fun(this, &Engineer::pointer_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); @@ -83,8 +72,10 @@ Engineer::Engineer(int argc, char **argv): layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added)); layout.signal_block_reserved.connect(sigc::hide<1>(sigc::mem_fun(this, &Engineer::reset_block_color))); - layout.signal_block_state_changed.connect(sigc::hide<1>(sigc::mem_fun(this, &Engineer::reset_block_color))); layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status)); + const set &blocks = layout.get_all(); + for(set::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) + (*i)->get_sensor().signal_state_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &Engineer::reset_block_color), sigc::ref(**i)))); if(FS::exists(options.state_fn)) DataFile::load(layout, options.state_fn); @@ -108,15 +99,15 @@ Engineer::Engineer(int argc, char **argv): lighting.set_ambient(GL::Color(0.4)); lighting.attach(0, light); - GL::PipelinePass *pass = &pipeline.add_pass(0); - pass->depth_test = &GL::DepthTest::lequal(); - pass->lighting = &lighting; + GL::Pipeline::Pass *pass = &pipeline.add_pass(0); + pass->set_depth_test(&GL::DepthTest::lequal()); + pass->set_lighting(&lighting); pass = &pipeline.add_pass("unlit"); - pass->depth_test = &GL::DepthTest::lequal(); + pass->set_depth_test(&GL::DepthTest::lequal()); pass = &pipeline.add_pass("overlay"); - pass->blend = &GL::Blend::alpha(); + pass->set_blend(&GL::Blend::alpha()); view_all(); @@ -192,6 +183,10 @@ void Engineer::tick() { window.get_display().tick(); + for(list::iterator i=new_trains.begin(); i!=new_trains.end(); ++i) + process_new_train(**i); + new_trains.clear(); + layout.tick(); event_disp.tick(Time::zero); @@ -206,7 +201,7 @@ void Engineer::tick() GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT); - pipeline.render_all(); + pipeline.render(); if(pointer_moved) { @@ -214,7 +209,7 @@ void Engineer::tick() if(picking) { - Track *track = pick_track(pointer_x, window.get_height()-pointer_y-1); + Track *track = pick_track(pointer); if(track && track!=picking_track) { picking_track = track; @@ -235,34 +230,23 @@ void Engineer::tick() if(picking && picking_track && picking_entry>=0) { - GL::PushMatrix push_mat; + camera.apply(); + GL::MatrixStack::Push push_mat(GL::MatrixStack::modelview()); - float rot = picking_track->get_endpoint_direction(picking_entry); - Vector pos = picking_track->get_endpoint_position(picking_entry); + Snap sn = picking_track->get_snap_node(picking_entry); - GL::translate(pos.x, pos.y, pos.z+0.03); - GL::rotate(rot*180/M_PI+180, 0, 0, 1); + GL::MatrixStack::modelview() *= GL::Matrix::translation(sn.position+GL::Vector3(0, 0, 0.03)); + GL::MatrixStack::modelview() *= GL::Matrix::rotation(sn.rotation+Angle::half_turn(), 0, 0, 1); arrow_mesh.draw(); } - const GLtk::Geometry &rgeom = root->get_geometry(); - GL::matrix_mode(GL::PROJECTION); - GL::load_identity(); - GL::ortho_bottomleft(rgeom.w, rgeom.h); - GL::matrix_mode(GL::MODELVIEW); - GL::load_identity(); - - { - GL::Bind blend(GL::Blend::alpha()); - root->render(); - GL::Texture::unbind(); - } + root->render(); window.swap_buffers(); } -void Engineer::button_press(int x, int y, unsigned btn, unsigned) +void Engineer::button_press(unsigned btn) { if(picking) { @@ -281,7 +265,7 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned) } else { - Track *track = pick_track(x, window.get_height()-y-1); + Track *track = pick_track(pointer); if(track) { if(track->get_turnout_id()) @@ -314,10 +298,12 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned) } } -void Engineer::pointer_motion(int x, int y) +void Engineer::axis_motion(unsigned axis, float value, float) { - pointer_x = x; - pointer_y = y; + if(axis==0) + pointer.x = value; + if(axis==1) + pointer.y = value; pointer_moved = true; } @@ -330,24 +316,18 @@ void Engineer::view_all() float best_score = 0; GL::Vector3 pos; GL::Vector3 up; - for(float angle=0; anglesecond->get_bounds(angle, minp, maxp); - min_x = min(min_x, minp.x); - max_x = max(max_x, maxp.x); - min_y = min(min_y, minp.y); - max_y = max(max_y, maxp.y); - } + bbox = bbox|trans.transform(i->second->get_track().get_bounding_box()); + + const Vector &minp = bbox.get_minimum_point(); + const Vector &maxp = bbox.get_maximum_point(); - float width = max_x-min_x; - float height = max_y-min_y; + float width = maxp.x-minp.x; + float height = maxp.y-minp.y; float aspect = width/height; float score = min(aspect/view_aspect, view_aspect/aspect); @@ -358,8 +338,8 @@ void Engineer::view_all() float size = max(width/view_aspect, height); float c = cos(angle); float s = sin(angle); - float x = (min_x+max_x)/2-size*105/window.get_height(); - float y = (min_y+max_y)/2; + float x = (minp.x+maxp.x)/2-size*105/window.get_height(); + float y = (minp.y+maxp.y)/2; float z = max(size*1.05/view_height, 0.15); pos = GL::Vector3(c*x-s*y, s*x+c*y, z); @@ -383,7 +363,7 @@ void Engineer::set_block_color(const Block &block, const GL::Color &color) void Engineer::reset_block_color(const Block &block) { - bool active = block.get_state()>Block::INACTIVE; + bool active = block.get_sensor().get_state()>Sensor::INACTIVE; if(block.get_train()) { @@ -403,17 +383,15 @@ void Engineer::reset_block_color(const Block &block) set_block_color(block, GL::Color(1)); } -Track *Engineer::pick_track(int x, int y) +Track *Engineer::pick_track(const Vector &p) { const GL::Vector3 &start = camera.get_position(); - float xx = x*2.0/window.get_width()-1.0; - float yy = y*2.0/window.get_height()-1.0; - GL::Vector4 ray = camera.unproject(GL::Vector4(xx, yy, 0, 0)); + GL::Vector4 ray = camera.unproject(GL::Vector4(p.x, p.y, 0, 0)); - return layout.pick_track(Vector(start.x, start.y, start.z), Vector(ray.x, ray.y, ray.z)); + return layout.pick(Ray(start, Vector(ray))); } -void Engineer::train_added(Train &train) +void Engineer::process_new_train(Train &train) { TrainPanel *tpanel = new TrainPanel(*this, train); root->add(*tpanel); @@ -423,15 +401,21 @@ void Engineer::train_added(Train &train) Vehicle3D &loco3d = layout_3d.get_vehicle(train.get_vehicle(0)); overlay->set_label(loco3d, train.get_name()); train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(loco3d))); +} + +void Engineer::train_added(Train &train) +{ + new_trains.push_back(&train); GL::Color best_color; float best_d_sq = 0; 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::const_iterator j=train_colors.begin(); j!=train_colors.end(); ++j)