Placeholder
/
rnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

force_enable_vsync fix

This commit is contained in:
floralrainfall 2023-07-16 01:57:42 -04:00
parent 8b7fdd1d83
commit b8a489a6ec
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/Client/CMakeLists.txt
View File

@ -13,6 +13,10 @@ if(COMPILE_PLAYER OR COMPILE_STUDIO)
add_subdirectory(Common) add_subdirectory(Common)
if(FORCE_ENABLE_VSYNC)
target_compile_definitions(Common PUBLIC FORCE_ENABLE_VSYNC)
endif()
if(COMPILE_PLAYER) if(COMPILE_PLAYER)
add_subdirectory(Player) add_subdirectory(Player)
endif() endif()

3
Projects/Client/Common/Source/OgreWidget.cpp
View File

@ -119,6 +119,9 @@ namespace RNR
options["externalWindowHandle"] = getWindowHandle(); options["externalWindowHandle"] = getWindowHandle();
options["FSAA"] = "4"; options["FSAA"] = "4";
#ifdef FORCE_ENABLE_VSYNC
options["vsync"] = "true";
#endif
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
options["macAPI"] = "cocoa"; options["macAPI"] = "cocoa";
options["macAPICocoaUseNSView"] = "true"; options["macAPICocoaUseNSView"] = "true";

5
Projects/Client/Studio/CMakeLists.txt
View File

@ -16,12 +16,9 @@ if(WIN32)
list(APPEND HEADER Resource/Windows/Script.rc) list(APPEND HEADER Resource/Windows/Script.rc)
endif() endif()
if(FORCE_ENABLE_VSYNC)
target_compile_definitions(Studio PRIVATE FORCE_ENABLE_VSYNC)
endif()
qt_add_executable(Studio ${SOURCE} ${HEADER}) qt_add_executable(Studio ${SOURCE} ${HEADER})
target_include_directories(Studio PRIVATE Header) target_include_directories(Studio PRIVATE Header)
target_link_libraries(Studio PRIVATE Common Engine) target_link_libraries(Studio PRIVATE Common Engine)

1
Projects/Client/Studio/Source/MainWindow.cpp
View File

@ -13,6 +13,7 @@ MainWindow::MainWindow()
ogreRoot = new Ogre::Root(); ogreRoot = new Ogre::Root();
Ogre::ConfigDialog* config = OgreBites::getNativeConfigDialog(); Ogre::ConfigDialog* config = OgreBites::getNativeConfigDialog();
ogreRoot->showConfigDialog(config); ogreRoot->showConfigDialog(config);
ogreRoot->initialise(false); ogreRoot->initialise(false);
menubar = new QMenuBar(); menubar = new QMenuBar();