lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add app::options structure with creation options & add highdpi support

Browse source
This commit is contained in:
Nikita Lisitsa 2021-05-28 12:14:41 +03:00
parent 773bfc6971
commit 38f704c3ed
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libs/app/include/psemek/app/app.hpp
View file

@ -14,8 +14,15 @@ namespace psemek::app
struct app struct app
: scene_base : scene_base
{ {
struct options
{
int multisampling = 0;
bool highdpi = false;
};
app(std::string const & name); app(std::string const & name);
app(std::string const & name, int multisampling); app(std::string const & name, int multisampling);
app(std::string const & name, options const & opts);
~app() override; ~app() override;
virtual bool running() const; virtual bool running() const;

21
libs/app/source/app.cpp
View file

@ -52,6 +52,10 @@ namespace psemek::app
{} {}
app::app(std::string const & name, int multisampling) app::app(std::string const & name, int multisampling)
: app(name, options{multisampling})
{}
app::app(std::string const & name, options const & opts)
: pimpl_{make_impl(this)} : pimpl_{make_impl(this)}
{ {
impl().start_time = clock::now(); impl().start_time = clock::now();
@ -65,17 +69,20 @@ namespace psemek::app
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
if (multisampling == 0) if (opts.multisampling == 0)
{ {
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
} }
else else
{ {
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, multisampling); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, opts.multisampling);
} }
impl().window = SDL_CreateWindow(name.data(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 800, 600, SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL | SDL_WINDOW_MAXIMIZED | SDL_WINDOW_HIDDEN); std::uint32_t flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL | SDL_WINDOW_MAXIMIZED | SDL_WINDOW_HIDDEN;
if (opts.highdpi) flags |= SDL_WINDOW_ALLOW_HIGHDPI;
impl().window = SDL_CreateWindow(name.data(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 800, 600, flags);
if (!impl().window) if (!impl().window)
sdl2::fail("Failed to create window: "); sdl2::fail("Failed to create window: ");
@ -97,7 +104,7 @@ namespace psemek::app
log::info() << "Initialized OpenGL " << major << '.' << minor << ", " << vendor << ", " << renderer; log::info() << "Initialized OpenGL " << major << '.' << minor << ", " << vendor << ", " << renderer;
int width, height; int width, height;
SDL_GetWindowSize(impl().window, &width, &height); SDL_GL_GetDrawableSize(impl().window, &width, &height);
scene_base::on_resize(width, height); scene_base::on_resize(width, height);
} }
@ -138,7 +145,11 @@ namespace psemek::app
{ {
case SDL_WINDOWEVENT_RESIZED: case SDL_WINDOWEVENT_RESIZED:
impl().had_initial_resize = true; impl().had_initial_resize = true;
handler()->on_resize(e.window.data1, e.window.data2); {
int width, height;
SDL_GL_GetDrawableSize(impl().window, &width, &height);
handler()->on_resize(width, height);
}
break; break;
case SDL_WINDOWEVENT_FOCUS_GAINED: case SDL_WINDOWEVENT_FOCUS_GAINED:
handler()->on_focus_gained(); handler()->on_focus_gained();