From de09cba1d12af38ff2e7e4312d67624fe63bf0e4 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Tue, 17 Mar 2009 05:03:36 +0000 Subject: [PATCH] Convert designer to use mspgbase instead of sdl Add a missing file in libmarklin Compatibility with VertexArrayBuilder change Rename engineer.res to marklin.res for future use in designer too --- Build | 2 +- engineer.res => marklin.res | 0 source/3d/track.cpp | 4 +- source/designer/designer.cpp | 159 ++++++++++++++++---------------- source/designer/designer.h | 10 +- source/designer/input.cpp | 20 ++-- source/engineer/engineer.cpp | 2 +- source/libmarklin/constants.cpp | 64 +++++++++++++ 8 files changed, 164 insertions(+), 97 deletions(-) rename engineer.res => marklin.res (100%) create mode 100644 source/libmarklin/constants.cpp diff --git a/Build b/Build index 79f02e5..7f0fb86 100644 --- a/Build +++ b/Build @@ -42,7 +42,7 @@ package "märklin" { source "source/designer"; require "mspstrings"; - require "sdl"; + require "mspgbase"; build_info { incpath "source"; diff --git a/engineer.res b/marklin.res similarity index 100% rename from engineer.res rename to marklin.res diff --git a/source/3d/track.cpp b/source/3d/track.cpp index 5891360..d4b7079 100644 --- a/source/3d/track.cpp +++ b/source/3d/track.cpp @@ -135,7 +135,7 @@ void Track3D::prepare_render() const void Track3D::build_object() { varray.clear(); - RefPtr builder=varray.modify(); + GL::VertexArrayBuilder builder(varray); base_seq.clear(); rail_seq.clear(); @@ -145,7 +145,7 @@ void Track3D::build_object() const vector &parts=track.get_type().get_parts(); unsigned index=0; for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) - build_part(*i, *builder, index); + build_part(*i, builder, index); } void Track3D::build_part(const TrackPart &part, GL::VertexArrayBuilder &va_builder, unsigned &base_index) diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index f38dae9..180ed50 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -9,10 +9,10 @@ Distributed under the GPL #include #include #include -#include #include #include #include +#include #include #include #include @@ -103,12 +103,17 @@ Designer::~Designer() int Designer::main() { - setenv("__GL_SYNC_TO_VBLANK", "1", 0); - SDL_Init(SDL_INIT_VIDEO); - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4); - SDL_SetVideoMode(screen_w, screen_h, 32, SDL_OPENGL); - SDL_EnableUNICODE(1); + dpy=new Graphics::Display; + wnd=new Graphics::Window(*dpy, screen_w, screen_h); + glc=new Graphics::GLContext(*wnd); + + wnd->signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0)); + wnd->signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press)); + wnd->signal_key_release.connect(sigc::mem_fun(this, &Designer::key_release)); + wnd->signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press)); + wnd->signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion)); + + wnd->show(); glEnableClientState(GL_VERTEX_ARRAY); glEnable(GL_DEPTH_TEST); @@ -131,7 +136,9 @@ int Designer::main() delete font_tex; delete input; - SDL_Quit(); + delete glc; + delete wnd; + delete dpy; return exit_code; } @@ -163,36 +170,12 @@ void Designer::map_pointer_coords(int x, int y, float &gx, float &gy) void Designer::tick() { - SDL_Event event; - while(SDL_PollEvent(&event)) - { - float gx, gy; - switch(event.type) - { - case SDL_MOUSEBUTTONDOWN: - map_pointer_coords(event.button.x, event.button.y, gx, gy); - button_press(event.button.x, screen_h-1-event.button.y, gx, gy, event.button.button); - break; - case SDL_MOUSEMOTION: - map_pointer_coords(event.motion.x, event.motion.y, gx, gy); - pointer_motion(event.motion.x, screen_h-1-event.motion.y, gx, gy); - break; - case SDL_KEYDOWN: - key_press(event.key.keysym.sym, event.key.keysym.mod, event.key.keysym.unicode); - break; - case SDL_KEYUP: - key_release(event.key.keysym.sym, event.key.keysym.mod); - break; - case SDL_QUIT: - exit(0); - break; - } - } - - const Time::TimeStamp t=Time::now(); - float dt=(t-last_tick)/Time::sec; + const Msp::Time::TimeStamp t=Msp::Time::now(); + float dt=(t-last_tick)/Msp::Time::sec; last_tick=t; + dpy->tick(); + if(move_y) { cam_pos.x+=cos(cam_yaw)*dt*move_y; @@ -266,55 +249,57 @@ void Designer::tick() else tooltip=""; - tooltip_timeout=Time::TimeStamp(); + tooltip_timeout=Msp::Time::TimeStamp(); } render(); - SDL_GL_SwapBuffers(); + glc->swap_buffers(); } /*** private ***/ -void Designer::key_press(unsigned key, unsigned mod, wchar_t ch) +void Designer::key_press(unsigned code, unsigned mod, wchar_t ch) { + unsigned key=Msp::Input::key_from_sys(code); + if(mode==INPUT) { input->key_press(key, mod, ch); return; } - if(key==SDLK_RSHIFT || key==SDLK_LSHIFT) + if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R) shift=true; - if(key==SDLK_n) + if(key==Msp::Input::KEY_N) mode=CATALOGUE; - else if(key==SDLK_g) + else if(key==Msp::Input::KEY_G) { manipulator->start_move(); mode=MANIPULATE; } - else if(key==SDLK_r) + else if(key==Msp::Input::KEY_R) { manipulator->start_rotate(); mode=MANIPULATE; } - else if(key==SDLK_d) + else if(key==Msp::Input::KEY_D) { manipulator->duplicate(); manipulator->start_move(); mode=MANIPULATE; } - else if(key==SDLK_w) + else if(key==Msp::Input::KEY_W) { - input=new Input(*this, "Filename"); + input=new ::Input(*this, "Filename"); input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss)); input->signal_accept.connect(sigc::mem_fun(this, &Designer::save_accept)); mode=INPUT; } - else if(key==SDLK_PLUS) + else if(key==Msp::Input::KEY_PLUS) selection->select_more(); - else if(key==SDLK_l && (mod&KMOD_SHIFT)) + else if(key==Msp::Input::KEY_L && (mod&1)) { const set &tracks=layout->get_tracks(); float len=0; @@ -322,19 +307,19 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t ch) len+=(*i)->get_type().get_total_length(); cout<<"Total length: "<select_linked(); - else if(key==SDLK_m) + else if(key==Msp::Input::KEY_M) { measure->start(); mode=MEASURE; } - else if(key==SDLK_z) + else if(key==Msp::Input::KEY_Z) { manipulator->start_elevate(); mode=MANIPULATE; } - else if(key==SDLK_ESCAPE) + else if(key==Msp::Input::KEY_ESC) { if(mode==MANIPULATE) manipulator->cancel(); @@ -343,7 +328,7 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t ch) else selection->clear(); } - else if(key==SDLK_x) + else if(key==Msp::Input::KEY_X) { set tracks=selection->get_tracks(); selection->clear(); @@ -353,7 +338,7 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t ch) delete *i; } } - else if(key==SDLK_f && (mod&KMOD_SHIFT)) + else if(key==Msp::Input::KEY_F && (mod&1)) { const set &tracks=selection->get_tracks(); const set <racks=layout->get_tracks(); @@ -372,81 +357,88 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t ch) t3d.set_color(GL::Color(1, 1, 1)); } } - else if(key==SDLK_f) + else if(key==Msp::Input::KEY_F) manipulator->flatten(); - else if(key==SDLK_e && (mod&KMOD_SHIFT)) + else if(key==Msp::Input::KEY_E && (mod&1)) manipulator->even_slope(true); - else if(key==SDLK_e) + else if(key==Msp::Input::KEY_E) manipulator->even_slope(); - else if(key==SDLK_t) + else if(key==Msp::Input::KEY_T) { Track *track=selection->get_track(); if(selection->size()==1 && track->get_type().get_n_routes()>1) { ostringstream ss; ss<get_turnout_id(); - input=new Input(*this, "Turnout ID", ss.str()); + input=new ::Input(*this, "Turnout ID", ss.str()); input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss)); input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept)); mode=INPUT; } } - else if(key==SDLK_s) + else if(key==Msp::Input::KEY_S) { Track *track=selection->get_track(); if(selection->size()==1 && track->get_type().get_n_routes()==1) { ostringstream ss; ss<get_sensor_id(); - input=new Input(*this, "Sensor ID", ss.str()); + input=new ::Input(*this, "Sensor ID", ss.str()); input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss)); input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept)); mode=INPUT; } } - else if(key==SDLK_RIGHT) + else if(key==Msp::Input::KEY_RIGHT) rotate=-1; - else if(key==SDLK_LEFT) + else if(key==Msp::Input::KEY_LEFT) rotate=1; - else if(key==SDLK_UP) + else if(key==Msp::Input::KEY_UP) move_y=1; - else if(key==SDLK_DOWN) + else if(key==Msp::Input::KEY_DOWN) move_y=-1; - else if(key==SDLK_INSERT) + else if(key==Msp::Input::KEY_INSERT) zoom=-1; - else if(key==SDLK_PAGEUP) + else if(key==Msp::Input::KEY_PGUP) zoom=1; - else if(key==SDLK_HOME) + else if(key==Msp::Input::KEY_HOME) pitch=1; - else if(key==SDLK_END) + else if(key==Msp::Input::KEY_END) pitch=-1; - else if(key==SDLK_DELETE) + else if(key==Msp::Input::KEY_DELETE) move_x=-1; - else if(key==SDLK_PAGEDOWN) + else if(key==Msp::Input::KEY_PGDN) move_x=1; } -void Designer::key_release(unsigned key, unsigned) +void Designer::key_release(unsigned code, unsigned) { + unsigned key=Msp::Input::key_from_sys(code); + if(mode==INPUT) return; - if(key==SDLK_RSHIFT || key==SDLK_LSHIFT) + if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R) shift=false; - else if(key==SDLK_RIGHT || key==SDLK_LEFT) + else if(key==Msp::Input::KEY_RIGHT || key==Msp::Input::KEY_LEFT) rotate=0; - else if(key==SDLK_UP || key==SDLK_DOWN) + else if(key==Msp::Input::KEY_UP || key==Msp::Input::KEY_DOWN) move_y=0; - else if(key==SDLK_INSERT || key==SDLK_PAGEUP) + else if(key==Msp::Input::KEY_INSERT || key==Msp::Input::KEY_PGUP) zoom=0; - else if(key==SDLK_HOME || key==SDLK_END) + else if(key==Msp::Input::KEY_HOME || key==Msp::Input::KEY_END) pitch=0; - else if(key==SDLK_DELETE || key==SDLK_PAGEDOWN) + else if(key==Msp::Input::KEY_DELETE || key==Msp::Input::KEY_PGDN) move_x=0; } -void Designer::button_press(int x, int y, float gx, float gy, unsigned btn) +void Designer::button_press(int x, int y, unsigned btn, unsigned) { + y=screen_h-y-1; + + float gx, gy; + map_pointer_coords(x, y, gx, gy); + if(mode==CATALOGUE) { if(btn==1) @@ -486,13 +478,18 @@ void Designer::button_press(int x, int y, float gx, float gy, unsigned btn) measure->button_press(x, y, gx, gy, btn); } -void Designer::pointer_motion(int x, int y, float gx, float gy) +void Designer::pointer_motion(int x, int y) { + y=screen_h-y-1; + + float gx, gy; + map_pointer_coords(x, y, gx, gy); + if(mode==SELECT || mode==CATALOGUE) { pointer_x=x; pointer_y=y; - tooltip_timeout=Time::now()+100*Time::msec; + tooltip_timeout=Msp::Time::now()+100*Msp::Time::msec; } if(mode!=INPUT) diff --git a/source/designer/designer.h b/source/designer/designer.h index 6e4e78d..c2c949e 100644 --- a/source/designer/designer.h +++ b/source/designer/designer.h @@ -10,6 +10,9 @@ Distributed under the GPL #include #include +#include +#include +#include #include #include #include "libmarklin/catalogue.h" @@ -34,6 +37,9 @@ private: INPUT }; + Msp::Graphics::Display *dpy; + Msp::Graphics::Window *wnd; + Msp::Graphics::GLContext *glc; unsigned screen_w; unsigned screen_h; Msp::GL::Font *font; @@ -77,8 +83,8 @@ private: void tick(); void key_press(unsigned, unsigned, wchar_t); void key_release(unsigned, unsigned); - void button_press(int, int, float, float, unsigned); - void pointer_motion(int, int, float, float); + void button_press(int, int, unsigned, unsigned); + void pointer_motion(int, int); void project_3d(); void apply_camera(); void render(); diff --git a/source/designer/input.cpp b/source/designer/input.cpp index 5c2e921..d56cc1b 100644 --- a/source/designer/input.cpp +++ b/source/designer/input.cpp @@ -5,29 +5,29 @@ Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#include #include #include +#include #include "designer.h" #include "input.h" using namespace std; using namespace Msp; -Input::Input(Designer &d, const string &t, const string &e): +::Input::Input(Designer &d, const string &t, const string &e): designer(d), title(t), text(e), pos(text.size()) { } -void Input::key_press(unsigned key, unsigned, wchar_t ch) +void ::Input::key_press(unsigned key, unsigned, wchar_t ch) { - if(key==SDLK_RETURN) + if(key==Msp::Input::KEY_ENTER) signal_accept.emit(); - else if(key==SDLK_ESCAPE) + else if(key==Msp::Input::KEY_ESC) signal_cancel.emit(); - else if(key==SDLK_BACKSPACE) + else if(key==Msp::Input::KEY_BACKSPACE) { if(pos>0) { @@ -35,17 +35,17 @@ void Input::key_press(unsigned key, unsigned, wchar_t ch) --pos; } } - else if(key==SDLK_DELETE) + else if(key==Msp::Input::KEY_DELETE) { if(pos0) --pos; } - else if(key==SDLK_RIGHT) + else if(key==Msp::Input::KEY_RIGHT) { if(posset_visible(true); diff --git a/source/libmarklin/constants.cpp b/source/libmarklin/constants.cpp new file mode 100644 index 0000000..9107361 --- /dev/null +++ b/source/libmarklin/constants.cpp @@ -0,0 +1,64 @@ +#include "constants.h" + +using namespace std; + +namespace Marklin { + +ostream &operator<<(ostream &out, const Error &err) +{ + switch(err) + { + case ERR_NO_ERROR: out<<"ERR_NO_ERROR"; break; + case ERR_SYS_ERROR: out<<"ERR_SYS_ERROR"; break; + case ERR_BAD_PARAM: out<<"ERR_BAD_PARAM"; break; + case ERR_POWER_OFF: out<<"ERR_POWER_OFF"; break; + case ERR_NO_LOK_SPACE: out<<"ERR_NO_LOK_SPACE"; break; + case ERR_NO_TURNOUT_SPACE: out<<"ERR_NO_TURNOUT_SPACE"; break; + case ERR_NO_DATA: out<<"ERR_NO_DATA"; break; + case ERR_NO_SLOT: out<<"ERR_NO_SLOT"; break; + case ERR_BAD_LOK_ADDR: out<<"ERR_BAD_LOK_ADDR"; break; + case ERR_LOK_BUSY: out<<"ERR_LOK_BUSY"; break; + case ERR_BAD_TURNOUT_ADDR: out<<"ERR_BAD_TURNOUT_ADDR"; break; + case ERR_BAD_SO_VALUE: out<<"ERR_BAD_SO_VALUE"; break; + case ERR_NO_I2C_SPACE: out<<"ERR_NO_I2C_SPACE"; break; + case ERR_LOW_TURNOUT_SPACE: out<<"ERR_LOW_TURNOUT_SPACE"; break; + case ERR_LOK_HALTED: out<<"ERR_LOK_HALTED"; break; + case ERR_LOK_POWER_OFF: out<<"ERR_LOK_POWER_OFF"; break; + case ERR_UNKNOWN_ERROR: out<<"ERR_UNKNOWN_ERROR"; break; + default: out<<"Err("<(err)<<')'; break; + } + + return out; +} + +ostream &operator<<(ostream &out, const Cmd &cmd) +{ + switch(cmd) + { + case CMD_LOK: out<<"CMD_LOK"; break; + case CMD_LOK_STATUS: out<<"CMD_LOK_STATUS"; break; + case CMD_LOK_CONFIG: out<<"CMD_LOK_CONFIG"; break; + case CMD_FUNC: out<<"CMD_FUNC"; break; + case CMD_FUNC_STATUS: out<<"CMD_FUNC_STATUS"; break; + case CMD_TURNOUT: out<<"CMD_TURNOUT"; break; + case CMD_TURNOUT_FREE: out<<"CMD_TURNOUT_FREE"; break; + case CMD_TURNOUT_STATUS: out<<"CMD_TURNOUT_STATUS"; break; + case CMD_TURNOUT_GROUP_STATUS: out<<"CMD_TURNOUT_GROUP_STATUS"; break; + case CMD_SENSOR_STATUS: out<<"CMD_SENSOR_STATUS"; break; + case CMD_SENSOR_REPORT: out<<"CMD_SENSOR_REPORT"; break; + case CMD_SENSOR_PARAM_SET: out<<"CMD_SENSOR_PARAM_SET"; break; + case CMD_STATUS: out<<"CMD_STATUS"; break; + case CMD_POWER_OFF: out<<"CMD_POWER_OFF"; break; + case CMD_POWER_ON: out<<"CMD_POWER_ON"; break; + case CMD_NOP: out<<"CMD_NOP"; break; + case CMD_EVENT: out<<"CMD_EVENT"; break; + case CMD_EVENT_LOK: out<<"CMD_EVENT_LOK"; break; + case CMD_EVENT_TURNOUT: out<<"CMD_EVENT_TURNOUT"; break; + case CMD_EVENT_SENSOR: out<<"CMD_EVENT_SENSOR"; break; + default: out<<"Cmd("<(cmd)<<')'; break; + } + + return out; +} + +} // namespace Marklin -- 2.43.0