Commit a61ffbf2 authored by Georg Schäfer's avatar Georg Schäfer
Browse files

Merge branch 'development' of gitlab.fsi.hochschule-trier.de:GDW-SS-18/cpp/mirrage into HEAD

parents 26e7bcc5 bae09edd
......@@ -26,6 +26,10 @@
#include <memory>
extern nk_size nk_do_progress(nk_flags *state,
struct nk_command_buffer *out, struct nk_rect bounds,
nk_size value, nk_size max, int modifiable,
const struct nk_style_progress *style, struct nk_input *in);
struct nk_context;
......@@ -102,6 +106,8 @@ namespace mirrage::gui {
auto ctx() -> nk_context*;
auto viewport() -> glm::vec4 {return _viewport;}
void viewport(glm::vec4 new_viewport);
auto centered(int width, int height) -> struct nk_rect;
......
#define NK_IMPLEMENTATION
#define NK_LIB
#include <mirrage/gui/gui.hpp>
......
......@@ -181,7 +181,9 @@ namespace mirrage::input {
_pointer_world_pos[i] = _screen_to_world_coords(_pointer_screen_pos[i]);
for(auto& gp : _gamepads)
gp->update(dt);
if(gp){
gp->update(dt);
}
_mailbox.update_subscriptions();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment