Use a Camera rather than direct matrix manipulation

[libs/gltk.git] / source / root.cpp

diff --git a/source/root.cpp b/source/root.cpp
index 1dea150966a943b2093189fb4c90bc01f05334e8..f4bad55beb546dfa91ee0dd9d960a7a0451b2fed 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -15,33 +15,44 @@ Root::Root(const Resources &r, Graphics::Window &window):
        mouse(new Input::Mouse(window)),
        own_input(true)
 {
-       set_geometry(Geometry(0, 0, window.get_width(), window.get_height()));
-
-       init();
+       init(&window);
 }
 
-Root::Root(const Resources &r, Input::Keyboard *k, Input::Mouse *m):
+Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m):
        resources(r),
        keyboard(k),
        mouse(m),
        own_input(false)
 {
-       init();
+       init(window);
 }
 
-void Root::init()
+void Root::init(Graphics::Window *window)
 {
+       if(window)
+               set_geometry(Geometry(0, 0, window->get_width(), window->get_height()));
+
        lbl_tooltip = 0;
        tooltip_target = 0;
 
+       camera.set_orthographic(geom.w, geom.h);
+       update_camera();
+
        update_style();
 
-       mouse->signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event));
-       mouse->signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event));
-       mouse->signal_axis_motion.connect(sigc::mem_fun(this, &Root::axis_motion_event));
-       keyboard->signal_button_press.connect(sigc::mem_fun(this, &Root::key_press_event));
-       keyboard->signal_button_release.connect(sigc::mem_fun(this, &Root::key_release_event));
-       keyboard->signal_character.connect(sigc::mem_fun(this, &Root::character_event));
+       if(mouse)
+       {
+               mouse->signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event));
+               mouse->signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event));
+               mouse->signal_axis_motion.connect(sigc::mem_fun(this, &Root::axis_motion_event));
+       }
+
+       if(keyboard)
+       {
+               keyboard->signal_button_press.connect(sigc::mem_fun(this, &Root::key_press_event));
+               keyboard->signal_button_release.connect(sigc::mem_fun(this, &Root::key_release_event));
+               keyboard->signal_character.connect(sigc::mem_fun(this, &Root::character_event));
+       }
 }
 
 Root::~Root()
@@ -101,11 +112,9 @@ void Root::tick()
 
 void Root::render() const
 {
-       GL::MatrixStack::projection() = GL::Matrix::ortho_bottomleft(geom.w, geom.h);
-       GL::MatrixStack::modelview() = GL::Matrix();
        GL::Bind bind_blend(GL::Blend::alpha());
 
-       GL::Renderer renderer(0);
+       GL::Renderer renderer(&camera);
        Widget::render(renderer);
 }
 
@@ -223,5 +232,24 @@ void Root::get_pointer(int &x, int &y)
        y = (mouse->get_axis_value(1)*0.5+0.5)*geom.h;
 }
 
+void Root::update_camera()
+{
+       camera.set_position(GL::Vector3(geom.w/2.0f, geom.h/2.0f, geom.h/2.0f));
+       camera.set_depth_clip(geom.h*0.1f, geom.h*0.9f);
+       camera.set_orthographic(geom.w, geom.h);
+}
+
+void Root::on_geometry_change()
+{
+       Panel::on_geometry_change();
+       update_camera();
+}
+
+void Root::on_child_added(Widget &wdg)
+{
+       if(&wdg!=lbl_tooltip)
+               Panel::on_child_added(wdg);
+}
+
 } // namespace GLtk
 } // namespace Msp