OpenGL backgrounds (splash, menu, options) and cursor #50
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,49 +8,131 @@ | |
| #include "CIO/CMenu.h" | ||
| #include "CIO/CWindow.h" | ||
| #include "CMap.h" | ||
| #include "callbacks.h" | ||
| #include "globals.h" | ||
| #include "lua/GameDataLoader.h" | ||
| #include <glad/glad.h> | ||
| #include <iostream> | ||
|
|
||
| bool CGame::CreateWindow() | ||
| { | ||
| if(window_) | ||
| return false; | ||
|
|
||
| window_.reset(SDL_CreateWindow("Return to the Roots Map editor [BETA]", SDL_WINDOWPOS_CENTERED, | ||
| SDL_WINDOWPOS_CENTERED, GameResolution.x, GameResolution.y, | ||
| SDL_WINDOW_HIDDEN | SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE)); | ||
| if(!window_) | ||
| return false; | ||
|
|
||
| glContext_ = SDL_GL_CreateContext(window_.get()); | ||
| if(!glContext_ || !gladLoadGLLoader((GLADloadproc)SDL_GL_GetProcAddress)) | ||
| return false; | ||
|
|
||
| glEnable(GL_TEXTURE_2D); | ||
| glEnable(GL_BLEND); | ||
| glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); | ||
| glDisable(GL_DEPTH_TEST); | ||
| glClearColor(0, 0, 0, 1); | ||
|
|
||
| SDL_ShowWindow(window_.get()); | ||
|
|
||
| ApplyWindowChanges(); | ||
| if(!displayTexture_.isValid() || !Surf_Display) | ||
| return false; | ||
|
|
||
| SetAppIcon(); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| void CGame::ApplyWindowChanges() | ||
|
Flamefire marked this conversation as resolved.
|
||
| { | ||
| if(!window_) | ||
| return; | ||
|
|
||
| if(fullscreen) | ||
| { | ||
| SDL_DisplayMode dm; | ||
| SDL_zero(dm); | ||
| dm.w = static_cast<int>(GameResolution.x); | ||
| dm.h = static_cast<int>(GameResolution.y); | ||
| dm.format = 0; // let SDL pick a supported format | ||
| dm.refresh_rate = 0; | ||
| if(SDL_SetWindowDisplayMode(window_.get(), &dm) != 0) | ||
|
Flamefire marked this conversation as resolved.
|
||
| { | ||
| std::cerr << "SDL_SetWindowDisplayMode failed: " << SDL_GetError() << std::endl; | ||
| return; | ||
| } | ||
|
|
||
| const Uint32 flags = SDL_GetWindowFlags(window_.get()); | ||
| if(!(flags & SDL_WINDOW_FULLSCREEN)) | ||
| { | ||
| if(SDL_SetWindowFullscreen(window_.get(), SDL_WINDOW_FULLSCREEN) != 0) | ||
| { | ||
| std::cerr << "SDL_SetWindowFullscreen failed: " << SDL_GetError() << std::endl; | ||
| return; | ||
| } | ||
| } else if(GameResolution != appliedResolution_) | ||
| { | ||
| // Already fullscreen and the resolution changed. Toggle fullscreen off and | ||
| // back on so SDL/Wayland actually applies the new display mode. | ||
|
Member
There was a problem hiding this comment. Is that the part that fixed your issue with half-covered screen/rendering?
Contributor
Author
There was a problem hiding this comment. I think this is the async events which can cause reverting of resolution switch.
Contributor
Author
There was a problem hiding this comment. And as for what the fix was. Honestly not completely sure. My process is I prompt AI about issue, it reads code and reasons about it, makes changes, then I build, run and test, repeat.
Member
There was a problem hiding this comment. The problem is that if we don't know what exactly caused and/or fixed the issue we cannot apply it to e.g. s25client or document it in code such that not in 2yrs someone sees strange code and decides to remove it. If it's too much work then we'll just need to keep it as-is
Contributor
Author
There was a problem hiding this comment. I can do it again in s25client with AI or we can make a small test program that reproduces and validates best practice. Wayland doesn't even allow apps to change native monitor resolution, it instead rescales them, presumably in hardware. Which is also what modern LCD monitors do. If you want to keep improving res switching I can make a standalone test program for this purpose.
Member
There was a problem hiding this comment. If you can let your AI reduce the editor to a simple reproducer and minimal fix based on that commit that would great, yes. Like: Create fullscreen window with 2 textures, could be just red and blue where one rightclick you draw the other one and on leftclick you change the resolution. I expect this to be ~100 lines with most of it copied from s25edit.
Contributor
Author
There was a problem hiding this comment. Also it can automatically proceed resolution switch, get window events, log what actually happened/didn't happen. For us humans it might be extra work. For the AI it will save a lot of tokens making a tiny program it can work out without all the surrounding complexity in context. |
||
| if(SDL_SetWindowFullscreen(window_.get(), 0) != 0) | ||
| { | ||
| std::cerr << "SDL_SetWindowFullscreen(0) failed: " << SDL_GetError() << std::endl; | ||
| return; | ||
| } | ||
| SDL_SetWindowSize(window_.get(), GameResolution.x, GameResolution.y); | ||
| if(SDL_SetWindowFullscreen(window_.get(), SDL_WINDOW_FULLSCREEN) != 0) | ||
| { | ||
| std::cerr << "SDL_SetWindowFullscreen failed: " << SDL_GetError() << std::endl; | ||
| return; | ||
| } | ||
| } | ||
| } else | ||
| { | ||
| if(SDL_SetWindowFullscreen(window_.get(), 0) != 0) | ||
| { | ||
| std::cerr << "SDL_SetWindowFullscreen failed: " << SDL_GetError() << std::endl; | ||
| return; | ||
| } | ||
| SDL_SetWindowSize(window_.get(), GameResolution.x, GameResolution.y); | ||
| SDL_SetWindowPosition(window_.get(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED); | ||
| } | ||
|
|
||
| UpdateDisplaySize(GameResolution); | ||
| } | ||
|
|
||
| void CGame::setGLViewport() | ||
| { | ||
| if(!window_) | ||
| return; | ||
| int w = 0, h = 0; | ||
| SDL_GL_GetDrawableSize(window_.get(), &w, &h); | ||
| if(w == 0 || h == 0) | ||
| return; | ||
| glViewport(0, 0, w, h); | ||
| glMatrixMode(GL_PROJECTION); | ||
| glLoadIdentity(); | ||
| glOrtho(0, GameResolution.x, GameResolution.y, 0, -1, 1); | ||
| glMatrixMode(GL_MODELVIEW); | ||
| glLoadIdentity(); | ||
| } | ||
|
|
||
| void CGame::UpdateDisplaySize(const Extent& newSize) | ||
| { | ||
| GameResolution = newSize; | ||
| appliedResolution_ = GameResolution; | ||
| appliedFullscreen_ = fullscreen; | ||
|
|
||
| Surf_Display = makeRGBSurface(GameResolution.x, GameResolution.y, true); | ||
| displayTexture_.createEmpty(GameResolution); | ||
|
|
||
| setGLViewport(); | ||
| for(auto& menu : Menus) | ||
| { | ||
| menu->resetSurface(); | ||
| } | ||
| for(auto& wnd : Windows) | ||
| wnd->resetSurface(); | ||
| } | ||
|
|
@@ -62,7 +144,7 @@ bool CGame::Init() | |
| SDL_ShowCursor(SDL_DISABLE); | ||
|
|
||
| std::cout << "Create Window..."; | ||
| if(!CreateWindow()) | ||
| { | ||
| std::cout << "failure"; | ||
| return false; | ||
|
|
@@ -94,10 +176,14 @@ bool CGame::Init() | |
| } | ||
| } | ||
|
|
||
| // Create texture for splash background | ||
| splashBg_.load(global::bmpArray[SPLASHSCREEN_LOADING_S2SCREEN].surface.get(), true); | ||
|
|
||
| // std::cout << "\nShow loading screen..."; | ||
| showLoadScreen = true; | ||
| glClear(GL_COLOR_BUFFER_BIT); | ||
| splashBg_.Draw(Rect(0, 0, GameResolution.x, GameResolution.y)); | ||
| SDL_GL_SwapWindow(window_.get()); | ||
|
|
||
| GameDataLoader gdLoader(global::worldDesc); | ||
| if(!gdLoader.Load()) | ||
|
|
@@ -252,5 +338,10 @@ bool CGame::Init() | |
| // create the mainmenu | ||
| callback::mainmenu(INITIALIZING_CALL); | ||
|
|
||
| // Create textures for cursor | ||
| cursor_.load(global::bmpArray[CURSOR].surface.get()); | ||
| cursorClicked_.load(global::bmpArray[CURSOR_CLICKED].surface.get()); | ||
| cross_.load(global::bmpArray[CROSS].surface.get()); | ||
|
|
||
| return true; | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.