/* $Id$
This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
#include <msp/gl/matrix.h>
#include <msp/gl/misc.h>
#include <msp/gl/projection.h>
-#include <msp/gl/rendermode.h>
-#include <msp/gl/select.h>
#include <msp/gl/tests.h>
#include <msp/gl/texture2d.h>
#include <msp/input/keys.h>
cur_zone(0),
mode(SELECT),
manipulator(*this, root, selection),
- measure(*this),
- camera_ctl(*this, root, camera),
- track_wrap(*this, selection)
+ measure(*this)
{
window.set_title("Railway Designer");
window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
}
// Setup OpenGL
- pipeline = new GL::Pipeline(window.get_width(), window.get_height(), false);
- pipeline->set_camera(&camera);
- pipeline->add_renderable_for_pass(layout_3d->get_scene(), 0);
- if(base_object)
- pipeline->add_renderable(*base_object);
- pipeline->add_renderable_for_pass(track_wrap, "unlit");
- pipeline->add_renderable_for_pass(layout_3d->get_path_scene(), "unlit");
- pipeline->add_renderable_for_pass(layout_3d->get_endpoint_scene(), "unlit");
+ cat_view = new View3D(*cat_layout_3d, window.get_width(), window.get_height());
- light.set_position(0, -0.259, 0.966, 0);
- lighting.attach(0, light);
+ main_view = new View3D(*layout_3d, window.get_width(), window.get_height());
+ GL::Pipeline *pipeline = &main_view->get_pipeline();
- GL::PipelinePass *pass = &pipeline->add_pass(0);
- pass->lighting = &lighting;
- pass->depth_test = &GL::DepthTest::lequal();
-
- pass = &pipeline->add_pass("unlit");
+ GL::PipelinePass *pass = &pipeline->add_pass("unlit");
pass->depth_test = &GL::DepthTest::lequal();
pass->blend = &GL::Blend::alpha();
pass = &pipeline->add_pass("blended");
- pass->lighting = &lighting;
+ pass->lighting = &layout_3d->get_lighting();
pass->depth_test = &GL::DepthTest::lequal();
pass->blend = &GL::Blend::alpha();
- camera.set_up_direction(GL::Vector3(0, 0, 1));
- camera.set_look_direction(GL::Vector3(0, 0.5, -0.866));
+ pass = &pipeline->add_pass("overlay");
+ pass->blend = &GL::Blend::alpha();
+
+ if(base_object)
+ pipeline->add_renderable(*base_object);
+ pipeline->add_renderable_for_pass(layout_3d->get_path_scene(), "unlit");
+ pipeline->add_renderable_for_pass(layout_3d->get_endpoint_scene(), "unlit");
// Setup UI
root.signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press));
statusbar->add(*lbl_status);
lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16));
- overlay = new Overlay3D(window, camera, ui_res.get_default_font());
+ track_wrap = new TrackWrap(*layout_3d, selection);
+ pipeline->add_renderable_for_pass(*track_wrap, "unlit");
+ overlay = new Overlay3D(ui_res.get_default_font());
+ pipeline->add_renderable_for_pass(*overlay, "overlay");
- camera_ctl.view_all();
+ camera_ctl = new CameraController(*main_view, root);
+ cat_view->get_camera().set_look_direction(GL::Vector3(0, 0.13053, -0.99144));
+ cat_view->view_all(true);
+ main_view->view_all();
const Layout3D::TrackMap &tracks = layout_3d->get_tracks();
for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
for(vector<Toolbar *>::iterator i=toolbars.begin(); i!=toolbars.end(); ++i)
delete *i;
+ delete camera_ctl;
+ delete track_wrap;
delete overlay;
- delete pipeline;
+ delete main_view;
delete base_object;
delete layout_3d;
delete layout;
+ delete cat_view;
delete cat_layout_3d;
}
show_zone(*cur_zone);
}
-Point Designer::map_pointer_to_ground(int x, int y)
+Vector Designer::map_pointer_to_ground(int x, int y)
{
float xf = x*2.0/window.get_width()-1.0;
float yf = y*2.0/window.get_height()-1.0;
- GL::Vector4 vec = camera.unproject(GL::Vector4(xf, yf, 0, 0));
- const GL::Vector3 &pos = camera.get_position();
+ GL::Vector4 vec = main_view->get_camera().unproject(GL::Vector4(xf, yf, 0, 0));
+ const GL::Vector3 &pos = main_view->get_camera().get_position();
- return Point(pos.x-vec.x*pos.z/vec.z, pos.y-vec.y*pos.z/vec.z);
+ return Vector(pos.x-vec.x*pos.z/vec.z, pos.y-vec.y*pos.z/vec.z);
}
void Designer::tick()
window.tick();
root.tick();
- camera_ctl.tick(dt);
+ camera_ctl->tick(dt);
for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
layout_3d->get_track(**i).get_path().set_mask(0);
y = window.get_height()-y-1;
mod = Input::mod_from_sys(mod);
- Point ground = map_pointer_to_ground(x, y);
+ Vector ground = map_pointer_to_ground(x, y);
if(mode==CATALOGUE)
{
if(btn==1)
{
- Track3D *ctrack = pick_track(x, y);
+ Track *ctrack = pick_track(x, y);
if(ctrack)
{
- Track *track = new Track(*layout, ctrack->get_track().get_type());
+ Track *track = new Track(*layout, ctrack->get_type());
track->set_position(ground);
selection.clear();
{
if(btn==1)
{
- Track3D *track = pick_track(x, y);
+ Track *track = pick_track(x, y);
if(track)
{
if(!(mod&Input::MOD_SHIFT))
selection.clear();
- selection.toggle_track(&track->get_track());
+ selection.toggle_track(track);
}
}
}
if(!root.get_child_at(x, y))
{
- Point ground = map_pointer_to_ground(x, y);
+ Vector ground = map_pointer_to_ground(x, y);
measure.pointer_motion(x, y, ground.x, ground.y);
}
}
-void Designer::apply_camera()
-{
- if(mode==CATALOGUE)
- {
- GL::matrix_mode(GL::PROJECTION);
- GL::load_identity();
- GL::frustum_centered(0.11046, 0.082843, 0.1, 10);
- GL::matrix_mode(GL::MODELVIEW);
- GL::load_identity();
- GL::translate(0, 0, -1);
- }
- else
- camera.apply();
-}
-
void Designer::render()
{
GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
- if(mode==CATALOGUE)
- {
- apply_camera();
- cat_layout_3d->get_scene().render();
- }
- else
+ View3D *view = (mode==CATALOGUE ? cat_view : main_view);
+ view->render();
+ if(mode==MEASURE)
{
- pipeline->render_all();
- {
- GL::Bind bind_blend(GL::Blend::alpha());
- overlay->render(0);
- }
-
GL::Bind bind_depth(GL::DepthTest::lequal());
- if(mode==MEASURE)
- measure.render();
+ measure.render();
}
GL::matrix_mode(GL::PROJECTION);
new_tracks.erase(i);
}
-Track3D *Designer::pick_track(int x, int y)
+Track *Designer::pick_track(int x, int y)
{
- Layout3D *l = layout_3d;
- if(mode==CATALOGUE)
- l = cat_layout_3d;
-
- float xx = ((float(x)-window.get_width()/2)/window.get_height())*0.82843;
- float yy = (float(y)/window.get_height()-0.5)*0.82843;
- float size = 4.0/window.get_height()*0.82843;
+ float xx = x*2.0/window.get_width()-1.0;
+ float yy = y*2.0/window.get_height()-1.0;
- apply_camera();
+ View3D &view = *(mode==CATALOGUE ? cat_view : main_view);
+ const GL::Vector3 &cpos = view.get_camera().get_position();
+ GL::Vector4 cray = view.get_camera().unproject(GL::Vector4(xx, yy, 0, 0));
- return l->pick_track(xx, yy, size);
+ return view.get_layout().get_layout().pick_track(Vector(cpos.x, cpos.y, cpos.z), Vector(cray.x, cray.y, cray.z));
}
void Designer::update_track_icon(Track3D &track)
string Designer::tooltip(int x, int y)
{
- if(Track3D *t3d = pick_track(x, y))
+ if(Track *track = pick_track(x, y))
{
- const Track &track = t3d->get_track();
- const TrackType &ttype = track.get_type();
+ const TrackType &ttype = track->get_type();
string info = format("%d %s", ttype.get_article_number(), ttype.get_description());
- if(mode!=CATALOGUE && abs(track.get_slope())>1e-4)
- info += format(" (slope %.1f%%)", abs(track.get_slope()/ttype.get_total_length()*100));
- if(track.get_turnout_id())
- info += format(" (turnout %d)", track.get_turnout_id());
- else if(track.get_sensor_id())
- info += format(" (sensor %d)", track.get_sensor_id());
+ if(mode!=CATALOGUE && abs(track->get_slope())>1e-4)
+ info += format(" (slope %.1f%%)", abs(track->get_slope()/ttype.get_total_length()*100));
+ if(track->get_turnout_id())
+ info += format(" (turnout %d)", track->get_turnout_id());
+ else if(track->get_sensor_id())
+ info += format(" (sensor %d)", track->get_sensor_id());
return info;
}
projects / r2c2.git / blobdiff