mika/switch-examples
1
0
Fork 0
mirror of https://github.com/switchbrew/switch-examples.git synced 2025-07-01 17:22:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

sdl2: use SDL_SetWindowSize for window resolution change, minor cleanup

Browse Source
This commit is contained in:
cpasjuste 2019-01-07 15:10:56 +01:00
parent 8b3ea7b649
commit 4df65af939
1 changed files with 20 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
graphics/sdl2/source/main.cpp
View File

@ -3,37 +3,6 @@
#include <SDL.h> #include <SDL.h>
static SDL_DisplayMode modes[5];
static int mode_count = 0, current_mode = 0;
void print_info(SDL_Window *window, SDL_Renderer *renderer)
{
int w, h;
SDL_DisplayMode mode;
SDL_GetWindowSize(window, &w, &h);
SDL_Log("window size: %i x %i\n", w, h);
SDL_GetRendererOutputSize(renderer, &w, &h);
SDL_Log("renderer size: %i x %i\n", w, h);
SDL_GetCurrentDisplayMode(0, &mode);
SDL_Log("display mode: %i x %i @ %i bpp (%s)",
mode.w, mode.h,
SDL_BITSPERPIXEL(mode.format),
SDL_GetPixelFormatName(mode.format));
}
void change_mode(SDL_Window *window)
{
current_mode++;
if (current_mode == mode_count) {
current_mode = 0;
}
SDL_SetWindowDisplayMode(window, &modes[current_mode]);
}
void draw_rects(SDL_Renderer *renderer, int x, int y) void draw_rects(SDL_Renderer *renderer, int x, int y)
{ {
// R // R
@ -57,7 +26,7 @@ int main(int argc, char *argv[])
SDL_Event event; SDL_Event event;
SDL_Window *window; SDL_Window *window;
SDL_Renderer *renderer; SDL_Renderer *renderer;
int done = 0, x = 0, w, h; int done = 0, x = 0, w = 1920, h = 1080;
// mandatory at least on switch, else gfx is not properly closed // mandatory at least on switch, else gfx is not properly closed
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
@ -65,14 +34,12 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
// create a window (OpenGL always enabled) // create an SDL window (OpenGL ES2 always enabled)
// when SDL_FULLSCREEN flag is not set, viewport is automatically handled by SDL (use SDL_SetWindowSize to "change resolution")
// available switch SDL2 video modes : // available switch SDL2 video modes :
// 1920 x 1080 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888) (docked only) // 1920 x 1080 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
// 1280 x 720 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888) // 1280 x 720 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
// 960 x 540 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888) window = SDL_CreateWindow("sdl2_gles2", 0, 0, 1920, 1080, 0);
// 800 x 600 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
// 640 x 480 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
window = SDL_CreateWindow("sdl2_gles2", 0, 0, 640, 480, SDL_WINDOW_FULLSCREEN);
if (!window) { if (!window) {
SDL_Log("SDL_CreateWindow: %s\n", SDL_GetError()); SDL_Log("SDL_CreateWindow: %s\n", SDL_GetError());
SDL_Quit(); SDL_Quit();
@ -87,15 +54,6 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
// print some info about display/window/renderer, for "educational purpose"
print_info(window, renderer);
// list available display modes, for "educational purpose"
mode_count = SDL_GetNumDisplayModes(0);
for (int i = 0; i < mode_count; i++) {
SDL_GetDisplayMode(0, i, &modes[i]);
}
// open CONTROLLER_PLAYER_1 and CONTROLLER_PLAYER_2 // open CONTROLLER_PLAYER_1 and CONTROLLER_PLAYER_2
// when railed, both joycons are mapped to joystick #0, // when railed, both joycons are mapped to joystick #0,
// else joycons are individually mapped to joystick #0, joystick #1, ... // else joycons are individually mapped to joystick #0, joystick #1, ...
@ -120,15 +78,20 @@ int main(int argc, char *argv[])
case SDL_JOYBUTTONDOWN: case SDL_JOYBUTTONDOWN:
SDL_Log("Joystick %d button %d down\n", SDL_Log("Joystick %d button %d down\n",
event.jbutton.which, event.jbutton.button); event.jbutton.which, event.jbutton.button);
// seek for joystick #0 down (A) // seek for joystick #0
// https://github.com/devkitPro/SDL/blob/switch-sdl2/src/joystick/switch/SDL_sysjoystick.c#L52 // https://github.com/devkitPro/SDL/blob/switch-sdl2/src/joystick/switch/SDL_sysjoystick.c#L52
if (event.jbutton.which == 0 && event.jbutton.button == 0) { if (event.jbutton.which == 0) {
change_mode(window); if (event.jbutton.button == 0) {
print_info(window, renderer); // (A) button down
} if(w == 1920) {
// seek for joystick #0 down (B) SDL_SetWindowSize(window, 1280, 720);
if (event.jbutton.which == 0 && event.jbutton.button == 1) { } else {
done = 1; SDL_SetWindowSize(window, 1920, 1080);
}
} else if (event.jbutton.button == 1) {
// (B) button down
done = 1;
}
} }
break; break;
@ -140,9 +103,9 @@ int main(int argc, char *argv[])
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
SDL_RenderClear(renderer); SDL_RenderClear(renderer);
// Fill renderer bounds // fill window bounds
SDL_SetRenderDrawColor(renderer, 111, 111, 111, 255); SDL_SetRenderDrawColor(renderer, 111, 111, 111, 255);
SDL_GetRendererOutputSize(renderer, &w, &h); SDL_GetWindowSize(window, &w, &h);
SDL_Rect f = {0, 0, w, h}; SDL_Rect f = {0, 0, w, h};
SDL_RenderFillRect(renderer, &f); SDL_RenderFillRect(renderer, &f);