Merge pull request #200 from victorlevasseur/bugfix/resolution-change…

…-and-fullscreen Fix Vsync and Max FPS not reactived after a sf::RenderWindow change
4ian · Sep 16, 2015 · 3b221ae · 3b221ae
2 parents a0246dd + 0092841
commit 3b221ae
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/Core/GDCore/PlatformDefinition/Project.cpp b/Core/GDCore/PlatformDefinition/Project.cpp
@@ -527,7 +527,7 @@ void Project::UnserializeFrom(const SerializerElement & element)
     SetDefaultHeight(propElement.GetChild("windowHeight", 0, "WindowH").GetValue().GetInt());
     SetMaximumFPS(propElement.GetChild("maxFPS", 0, "FPSmax").GetValue().GetInt());
     SetMinimumFPS(propElement.GetChild("minFPS", 0, "FPSmin").GetValue().GetInt());
-    SetVerticalSyncActivatedByDefault(propElement.GetChild("verticalSync").GetValue().GetInt());
+    SetVerticalSyncActivatedByDefault(propElement.GetChild("verticalSync").GetValue().GetBool());
     #if defined(GD_IDE_ONLY)
     SetAuthor(propElement.GetChild("author", 0, "Auteur").GetValue().GetString());
     SetPackageName(propElement.GetStringAttribute("packageName"));

diff --git a/GDCpp/GDCpp/BuiltinExtensions/RuntimeSceneTools.cpp b/GDCpp/GDCpp/BuiltinExtensions/RuntimeSceneTools.cpp
@@ -277,16 +277,12 @@ void GD_API SetWindowSize( RuntimeScene & scene, int windowWidth, int windowHeig
     if ( windowWidth == scene.renderWindow->getSize().x && windowHeight == scene.renderWindow->getSize().y )
         return;
 
-    if ( scene.RenderWindowIsFullScreen() )
-    {
-        scene.renderWindow->create( sf::VideoMode( windowWidth, windowHeight, 32 ), scene.GetWindowDefaultTitle(), sf::Style::Close | sf::Style::Fullscreen );
-        scene.ChangeRenderWindow(scene.renderWindow);
-    }
-    else
-    {
-        scene.renderWindow->create( sf::VideoMode( windowWidth, windowHeight, 32 ), scene.GetWindowDefaultTitle(), sf::Style::Close );
-        scene.ChangeRenderWindow(scene.renderWindow);
-    }
+
+    scene.renderWindow->create(
+        sf::VideoMode( windowWidth, windowHeight, 32 ),
+        scene.GetWindowDefaultTitle(),
+        sf::Style::Close | (scene.RenderWindowIsFullScreen() ? sf::Style::Fullscreen : 0) );
+    scene.ChangeRenderWindow(scene.renderWindow);
     #endif
 }
 

diff --git a/GDCpp/GDCpp/IDE/Dialogs/CppLayoutPreviewer.cpp b/GDCpp/GDCpp/IDE/Dialogs/CppLayoutPreviewer.cpp
@@ -275,7 +275,6 @@ void CppLayoutPreviewer::OnPreviewPlayWindowBtClick( wxCommandEvent & event )
         externalPreviewWindow = std::shared_ptr<RenderDialog>(new RenderDialog(editor.GetParentControl(), this) );
 
     externalPreviewWindow->Show(true);
-    externalPreviewWindow->renderCanvas->setFramerateLimit( previewGame.GetMaximumFPS() );
 
     externalPreviewWindow->SetSizeOfRenderingZone(editor.GetProject().GetMainWindowDefaultWidth(), editor.GetProject().GetMainWindowDefaultHeight());
     previewScene.ChangeRenderWindow(externalPreviewWindow->renderCanvas);

diff --git a/GDCpp/GDCpp/RuntimeScene.cpp b/GDCpp/GDCpp/RuntimeScene.cpp
@@ -92,6 +92,12 @@ void RuntimeScene::ChangeRenderWindow(sf::RenderWindow * newWindow)
     if (!renderWindow) return;
 
     renderWindow->setTitle(GetWindowDefaultTitle());
+
+    if(game)
+    {
+        renderWindow->setFramerateLimit(game->GetMaximumFPS());
+        renderWindow->setVerticalSyncEnabled(game->IsVerticalSynchronizationEnabledByDefault());
+    }
     SetupOpenGLProjection();
 }
 

diff --git a/GDCpp/Runtime/main.cpp b/GDCpp/Runtime/main.cpp
@@ -174,8 +174,6 @@ int main( int argc, char *p_argv[] )
     window.create(sf::VideoMode(game.GetMainWindowDefaultWidth(), game.GetMainWindowDefaultHeight(), 32),
         "", sf::Style::Close);
     window.setActive(true);
-    window.setFramerateLimit(game.GetMaximumFPS());
-    window.setVerticalSyncEnabled(game.IsVerticalSynchronizationEnabledByDefault());
 
     //Game main loop
     bool abort = false;