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

disable retina support

Browse Source
This commit is contained in:
Matvey Cherevko
2018-09-22 03:09:34 +07:00
parent 470e1f1d07
commit cf2f2e6fda
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
headers/enduro2d/core/debug.hpp
View File

@@ -41,19 +41,19 @@ namespace e2d
level min_level() const noexcept; level min_level() const noexcept;
template < typename... Args > template < typename... Args >
void log(level lvl, str_view fmt, Args&&... args); debug& log(level lvl, str_view fmt, Args&&... args);
template < typename... Args > template < typename... Args >
void trace(str_view fmt, Args&&... args); debug& trace(str_view fmt, Args&&... args);
template < typename... Args > template < typename... Args >
void warning(str_view fmt, Args&&... args); debug& warning(str_view fmt, Args&&... args);
template < typename... Args > template < typename... Args >
void error(str_view fmt, Args&&... args); debug& error(str_view fmt, Args&&... args);
template < typename... Args > template < typename... Args >
void fatal(str_view fmt, Args&&... args); debug& fatal(str_view fmt, Args&&... args);
private: private:
mutable std::mutex mutex_; mutable std::mutex mutex_;
level min_level_ = level::trace; level min_level_ = level::trace;
@@ -100,7 +100,7 @@ namespace e2d
} }
template < typename... Args > template < typename... Args >
void debug::log(level lvl, str_view fmt, Args&&... args) { debug& debug::log(level lvl, str_view fmt, Args&&... args) {
std::lock_guard<std::mutex> guard(mutex_); std::lock_guard<std::mutex> guard(mutex_);
if ( lvl >= min_level_ && !sinks_.empty() ) { if ( lvl >= min_level_ && !sinks_.empty() ) {
str text = strings::rformat(fmt, std::forward<Args>(args)...); str text = strings::rformat(fmt, std::forward<Args>(args)...);
@@ -110,25 +110,26 @@ namespace e2d
} }
} }
} }
return *this;
} }
template < typename... Args > template < typename... Args >
void debug::trace(str_view fmt, Args&&... args) { debug& debug::trace(str_view fmt, Args&&... args) {
log(level::trace, fmt, std::forward<Args>(args)...); return log(level::trace, fmt, std::forward<Args>(args)...);
} }
template < typename... Args > template < typename... Args >
void debug::warning(str_view fmt, Args&&... args) { debug& debug::warning(str_view fmt, Args&&... args) {
log(level::warning, fmt, std::forward<Args>(args)...); return log(level::warning, fmt, std::forward<Args>(args)...);
} }
template < typename... Args > template < typename... Args >
void debug::error(str_view fmt, Args&&... args) { debug& debug::error(str_view fmt, Args&&... args) {
log(level::error, fmt, std::forward<Args>(args)...); return log(level::error, fmt, std::forward<Args>(args)...);
} }
template < typename... Args > template < typename... Args >
void debug::fatal(str_view fmt, Args&&... args) { debug& debug::fatal(str_view fmt, Args&&... args) {
log(level::fatal, fmt, std::forward<Args>(args)...); return log(level::fatal, fmt, std::forward<Args>(args)...);
} }
} }

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

@@ -14,15 +14,13 @@ int main() {
window& w = modules::initialize<window>( window& w = modules::initialize<window>(
v2u{640, 480}, "Enduro2D", false, false); v2u{640, 480}, "Enduro2D", false, false);
for ( std::size_t i = 0; i < 2; ++i ) { the<debug>()
w.swap_buffers(); .trace("SAMPLE: window real size: %0", w.real_size())
window::poll_events(); .trace("SAMPLE: window virtual size: %0", w.virtual_size())
std::this_thread::sleep_for(time::to_chrono(make_seconds(2))); .trace("SAMPLE: window framebuffer size: %0", w.framebuffer_size());
w.toggle_fullscreen(!w.fullscreen());
}
auto current_time = time::now_s(); auto closing_time = time::now_s() + make_seconds<i64>(5);
while ( !w.should_close() && current_time + make_seconds<i64>(5) < time::now_s() ) { while ( !w.should_close() && time::now_s() < closing_time ) {
w.swap_buffers(); w.swap_buffers();
window::poll_events(); window::poll_events();
} }

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

@@ -112,6 +112,8 @@ namespace e2d
glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE); glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
glfwWindowHint(GLFW_SCALE_TO_MONITOR, GLFW_FALSE);
glfwWindowHint(GLFW_COCOA_RETINA_FRAMEBUFFER, GLFW_FALSE);
v2i real_size = fullscreen v2i real_size = fullscreen
? make_vec2(video_mode->width, video_mode->height) ? make_vec2(video_mode->width, video_mode->height)
: virtual_size.cast_to<i32>(); : virtual_size.cast_to<i32>();