disable retina support

This commit is contained in:
2018-09-22 03:09:34 +07:00
parent 470e1f1d07
commit cf2f2e6fda
3 changed files with 23 additions and 22 deletions

View File

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

View File

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

View File

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