mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 18:15:37 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'swick/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-07-01 10:16:39 +02:00
commit 847ec9fa56
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/engine.cpp
View file

@ -369,6 +369,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
windowSettings.fullscreen = settings.getBool("fullscreen", "Video"); windowSettings.fullscreen = settings.getBool("fullscreen", "Video");
windowSettings.window_x = settings.getInt("resolution x", "Video"); windowSettings.window_x = settings.getInt("resolution x", "Video");
windowSettings.window_y = settings.getInt("resolution y", "Video"); windowSettings.window_y = settings.getInt("resolution y", "Video");
windowSettings.screen = settings.getInt("screen", "Video");
windowSettings.vsync = settings.getBool("vsync", "Video"); windowSettings.vsync = settings.getBool("vsync", "Video");
windowSettings.icon = "openmw.png"; windowSettings.icon = "openmw.png";
std::string aa = settings.getString("antialiasing", "Video"); std::string aa = settings.getString("antialiasing", "Video");

16
libs/openengine/ogre/renderer.cpp
View file

@ -266,11 +266,23 @@ void OgreRenderer::createWindow(const std::string &title, const WindowSettings&
params.insert(std::make_pair("FSAA", settings.fsaa)); params.insert(std::make_pair("FSAA", settings.fsaa));
params.insert(std::make_pair("vsync", settings.vsync ? "true" : "false")); params.insert(std::make_pair("vsync", settings.vsync ? "true" : "false"));
int pos_x = SDL_WINDOWPOS_UNDEFINED,
pos_y = SDL_WINDOWPOS_UNDEFINED;
if(settings.fullscreen)
{
SDL_Rect display_bounds;
if(SDL_GetDisplayBounds(settings.screen, &display_bounds) != 0)
throw std::runtime_error("Couldn't get display bounds!");
pos_x = display_bounds.x;
pos_y = display_bounds.y;
}
// Create an application window with the following settings: // Create an application window with the following settings:
mSDLWindow = SDL_CreateWindow( mSDLWindow = SDL_CreateWindow(
"OpenMW", // window title "OpenMW", // window title
SDL_WINDOWPOS_UNDEFINED, // initial x position pos_x, // initial x position
SDL_WINDOWPOS_UNDEFINED, // initial y position pos_y, // initial y position
settings.window_x, // width, in pixels settings.window_x, // width, in pixels
settings.window_y, // height, in pixels settings.window_y, // height, in pixels
SDL_WINDOW_SHOWN SDL_WINDOW_SHOWN

1
libs/openengine/ogre/renderer.hpp
View file

@ -56,6 +56,7 @@ namespace OEngine
bool vsync; bool vsync;
bool fullscreen; bool fullscreen;
int window_x, window_y; int window_x, window_y;
int screen;
std::string fsaa; std::string fsaa;
std::string icon; std::string icon;
}; };