diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-11-16 13:20:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 13:20:20 +0100 |
| commit | 72c0a6a68099fdc125381e21ef779eb9dc102304 (patch) | |
| tree | 48934ff366d94d738a65fd2f68b2a2b906dd7985 | |
| parent | small fix (diff) | |
| parent | Use CLOCK_MONOTONIC_FAST when available (FreeBSD) (diff) | |
| download | re3-72c0a6a68099fdc125381e21ef779eb9dc102304.tar re3-72c0a6a68099fdc125381e21ef779eb9dc102304.tar.gz re3-72c0a6a68099fdc125381e21ef779eb9dc102304.tar.bz2 re3-72c0a6a68099fdc125381e21ef779eb9dc102304.tar.lz re3-72c0a6a68099fdc125381e21ef779eb9dc102304.tar.xz re3-72c0a6a68099fdc125381e21ef779eb9dc102304.tar.zst re3-72c0a6a68099fdc125381e21ef779eb9dc102304.zip | |
Diffstat (limited to '')
| -rw-r--r-- | premake5.lua | 5 | ||||
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/premake5.lua b/premake5.lua index 4e4417bf..51518a98 100644 --- a/premake5.lua +++ b/premake5.lua @@ -92,7 +92,10 @@ workspace "re3" filter { "system:bsd" }
platforms {
- "bsd-amd64-librw_gl3_glfw-oal"
+ "bsd-x86-librw_gl3_glfw-oal",
+ "bsd-amd64-librw_gl3_glfw-oal",
+ "bsd-arm-librw_gl3_glfw-oal",
+ "bsd-arm64-librw_gl3_glfw-oal"
}
filter { "system:macosx" }
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index 4d41a900..d8d168c5 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -244,8 +244,10 @@ double psTimer(void) { struct timespec start; -#ifdef __linux__ +#if defined(CLOCK_MONOTONIC_RAW) clock_gettime(CLOCK_MONOTONIC_RAW, &start); +#elif defined(CLOCK_MONOTONIC_FAST) + clock_gettime(CLOCK_MONOTONIC_FAST, &start); #else clock_gettime(CLOCK_MONOTONIC, &start); #endif @@ -893,7 +895,7 @@ void psPostRWinit(void) RwEngineGetVideoModeInfo(&vm, GcurSelVM); glfwSetKeyCallback(PSGLOBAL(window), keypressCB); - glfwSetWindowSizeCallback(PSGLOBAL(window), resizeCB); + glfwSetFramebufferSizeCallback(PSGLOBAL(window), resizeCB); glfwSetScrollCallback(PSGLOBAL(window), scrollCB); glfwSetCursorPosCallback(PSGLOBAL(window), cursorCB); glfwSetCursorEnterCallback(PSGLOBAL(window), cursorEnterCB); @@ -1414,8 +1416,11 @@ _InputTranslateShiftKeyUpDown(RsKeyCodes *rs) { // TODO this only works in frontend(and luckily only frontend use this). Fun fact: if I get pos manually in game, glfw reports that it's > 32000 void cursorCB(GLFWwindow* window, double xpos, double ypos) { - FrontEndMenuManager.m_nMouseTempPosX = xpos; - FrontEndMenuManager.m_nMouseTempPosY = ypos; + int bufw, bufh, winw, winh; + glfwGetWindowSize(window, &winw, &winh); + glfwGetFramebufferSize(window, &bufw, &bufh); + FrontEndMenuManager.m_nMouseTempPosX = xpos * (bufw / winw); + FrontEndMenuManager.m_nMouseTempPosY = ypos * (bufh / winh); } void @@ -1643,6 +1648,8 @@ main(int argc, char *argv[]) #endif { glfwPollEvents(); + glfwSetInputMode(PSGLOBAL(window), GLFW_CURSOR, + (FrontEndMenuManager.m_bMenuActive && !PSGLOBAL(fullScreen)) ? GLFW_CURSOR_HIDDEN : GLFW_CURSOR_DISABLED); if( ForegroundApp ) { switch ( gGameState ) |