BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-14 16:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

rename window::frame_tick to window::poll_events

Browse Source
This commit is contained in:
Matvey Cherevko
2018-09-29 06:40:13 +07:00
parent 4da9442a31
commit 6482e0ea62
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headers/enduro2d/core/window.hpp
View File

@@ -64,7 +64,7 @@ namespace e2d
void bind_context() noexcept; void bind_context() noexcept;
void swap_buffers(bool vsync) noexcept; void swap_buffers(bool vsync) noexcept;
static bool frame_tick() noexcept; static bool poll_events() noexcept;
template < typename T, typename... Args > template < typename T, typename... Args >
T& register_event_listener(Args&&... args); T& register_event_listener(Args&&... args);

4
samples/sources/sample_00/sample_00.cpp
View File

@@ -20,9 +20,9 @@ int e2d_main() {
while ( !the<window>().should_close() && !k.is_key_just_released(keyboard_key::escape) ) { while ( !the<window>().should_close() && !k.is_key_just_released(keyboard_key::escape) ) {
the<render>().set_clear_color({1.f, 0.4f, 0.f}); the<render>().set_clear_color({1.f, 0.4f, 0.f});
the<render>().clear(true, true, true); the<render>().clear(true, true, true);
the<input>().frame_tick();
the<window>().swap_buffers(true); the<window>().swap_buffers(true);
window::frame_tick(); the<input>().frame_tick();
window::poll_events();
} }
return 0; return 0;
} }

29
samples/sources/sample_01/sample_01.cpp
View File

@@ -8,23 +8,24 @@
using namespace e2d; using namespace e2d;
int e2d_main() { int e2d_main() {
input& i = modules::initialize<input>(); modules::initialize<debug>();
debug& d = modules::initialize<debug>(); modules::initialize<input>();
window& w = modules::initialize<window>(v2u{640, 480}, "Enduro2D", false); modules::initialize<window>(v2u{640, 480}, "Enduro2D", false);
d.add_sink<debug_console_sink>(); the<debug>().add_sink<debug_console_sink>();
w.register_event_listener<window_input_source>(i); the<window>().register_event_listener<window_input_source>(the<input>());
w.register_event_listener<window_trace_event_listener>(d); the<window>().register_event_listener<window_trace_event_listener>(the<debug>());
d.trace("SAMPLE: window real size: %0", w.real_size()) the<debug>()
.trace("SAMPLE: window virtual size: %0", w.virtual_size()) .trace("SAMPLE: window real size: %0", the<window>().real_size())
.trace("SAMPLE: window framebuffer size: %0", w.framebuffer_size()); .trace("SAMPLE: window virtual size: %0", the<window>().virtual_size())
.trace("SAMPLE: window framebuffer size: %0", the<window>().framebuffer_size());
const keyboard& k = i.keyboard(); const keyboard& k = the<input>().keyboard();
while ( !w.should_close() && !k.is_key_just_released(keyboard_key::escape) ) { while ( !the<window>().should_close() && !k.is_key_just_released(keyboard_key::escape) ) {
i.frame_tick(); the<window>().swap_buffers(true);
w.swap_buffers(true); the<input>().frame_tick();
window::frame_tick(); window::poll_events();
} }
return 0; return 0;
} }

2
sources/enduro2d/core/window_impl/window_glfw.cpp
View File

@@ -573,7 +573,7 @@ namespace e2d
glfwSwapBuffers(state_->window.get()); glfwSwapBuffers(state_->window.get());
} }
bool window::frame_tick() noexcept { bool window::poll_events() noexcept {
return glfw_state::poll_events(); return glfw_state::poll_events();
} }

2
sources/enduro2d/core/window_impl/window_none.cpp
View File

@@ -164,7 +164,7 @@ namespace e2d
E2D_UNUSED(vsync); E2D_UNUSED(vsync);
} }
bool window::frame_tick() noexcept { bool window::poll_events() noexcept {
return false; return false;
} }