Merge branch 'master' into feature/render

This commit is contained in:
2018-10-02 23:09:53 +07:00
8 changed files with 165 additions and 89 deletions

View File

@@ -13,7 +13,7 @@ int e2d_main() {
modules::initialize<render>(the<debug>());
modules::initialize<window>(v2u{640, 480}, "Enduro2D", false);
the<debug>().add_sink<debug_console_sink>();
the<debug>().register_sink<debug_console_sink>();
the<window>().register_event_listener<window_input_source>(the<input>());
const keyboard& k = the<input>().keyboard();

View File

@@ -12,7 +12,7 @@ int e2d_main() {
modules::initialize<input>();
modules::initialize<window>(v2u{640, 480}, "Enduro2D", false);
the<debug>().add_sink<debug_console_sink>();
the<debug>().register_sink<debug_console_sink>();
the<window>().register_event_listener<window_input_source>(the<input>());
the<window>().register_event_listener<window_trace_event_listener>(the<debug>());