From 1c95ddacb8a2ced158775d87dc1f511a9663e5eb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 7 Mar 2017 10:26:03 +0100 Subject: [PATCH 1/2] Revert "Moved some ancient playsim mouse input code around so that it works properly with input events" This reverts commit 2e0eb742ebe4d090f266cd5900a461c3d16a929e. This effectively nullifies the attempt to get a higher mouse update rate for the display. --- src/d_main.cpp | 53 ++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index ac423d10b..77e0edda0 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -258,35 +258,6 @@ static int pagetic; // //========================================================================== -// [ZZ] this handles the mouse changes in the playsim. -// I have no idea why it had to be done before events are dispatched... also no idea why is this not in G_Responder or something. -static bool D_ProcessMouseForPlaysim(event_t *ev) -{ - //if (ev->type == EV_Mouse && !paused && menuactive == MENU_Off && ConsoleState != c_down && ConsoleState != c_falling && !E_CheckUiProcessors()) - if (ev->type == EV_Mouse && !paused) // [ZZ] the other checks are replaced with responders eating the event. - { - if (Button_Mlook.bDown || freelook) - { - int look = int(ev->y * m_pitch * mouse_sensitivity * 16.0); - if (invertmouse) - look = -look; - G_AddViewPitch(look); - events[eventhead].y = 0; - } - if (!Button_Strafe.bDown && !lookstrafe) - { - G_AddViewAngle(int(ev->x * m_yaw * mouse_sensitivity * 8.0)); - events[eventhead].x = 0; - } - if ((events[eventhead].x | events[eventhead].y) == 0) - { - return false; - } - } - - return true; -} - void D_ProcessEvents (void) { event_t *ev; @@ -319,9 +290,7 @@ void D_ProcessEvents (void) // check events if (E_Responder(ev)) // [ZZ] ZScript ate the event continue; - // before passing this further, do some magic - if (D_ProcessMouseForPlaysim(ev)) - G_Responder (ev); + G_Responder (ev); } } @@ -341,6 +310,26 @@ void D_PostEvent (const event_t *ev) return; } events[eventhead] = *ev; + if (ev->type == EV_Mouse && !paused && menuactive == MENU_Off && ConsoleState != c_down && ConsoleState != c_falling && !E_CheckUiProcessors()) + { + if (Button_Mlook.bDown || freelook) + { + int look = int(ev->y * m_pitch * mouse_sensitivity * 16.0); + if (invertmouse) + look = -look; + G_AddViewPitch (look); + events[eventhead].y = 0; + } + if (!Button_Strafe.bDown && !lookstrafe) + { + G_AddViewAngle (int(ev->x * m_yaw * mouse_sensitivity * 8.0)); + events[eventhead].x = 0; + } + if ((events[eventhead].x | events[eventhead].y) == 0) + { + return; + } + } eventhead = (eventhead+1)&(MAXEVENTS-1); } From e5a3d2244e0af266fb5b93e94f3724167ff0e79f Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 7 Mar 2017 11:59:52 +0200 Subject: [PATCH 2/2] Updated AppVeyor configuration Add dependencies for sound backends Exclude travis test branches from build Set git clone depth to one --- .appveyor.yml | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 508746db6..608f8d0fc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,5 +1,11 @@ version: "{build}" +branches: + except: + - /^travis.*$/ + +clone_depth: 1 + os: Visual Studio 2015 platform: @@ -10,12 +16,37 @@ configuration: - Debug - Release +cache: + - ci_deps_win_v01.zip + +environment: + # Update dependencies here: https://github.com/coelckers/gzdoom/releases/tag/ci_deps + DEPS_URL: https://github.com/coelckers/gzdoom/releases/download/ci_deps/ + DEPS_FILENAME: ci_deps_win_v01.zip + +install: + - if not exist "%DEPS_FILENAME%" + appveyor DownloadFile "%DEPS_URL%%DEPS_FILENAME%" + - 7z x -y "%DEPS_FILENAME%" + before_build: - - cmd: md build - - cmd: cd build - - cmd: if "%platform%"=="Win32" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 - - cmd: if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64 - - cmd: cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% .. + - md build + - cd build + - if "%PLATFORM%"=="Win32" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 + - if "%PLATFORM%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64 + - set DEPS_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\ci_deps_win\include + - set DEPS_LIB_DIR=%APPVEYOR_BUILD_FOLDER%\ci_deps_win\lib\%PLATFORM% + - cmake -G "%CMAKE_GENERATOR_NAME%" -T "v140_xp" + -DCMAKE_BUILD_TYPE="%CONFIGURATION%" + -DFMOD_INCLUDE_DIR="%DEPS_INCLUDE_DIR%" + -DFMOD_LIBRARY="%DEPS_LIB_DIR%\fmodex.lib" + -DOPENAL_INCLUDE_DIR="%DEPS_INCLUDE_DIR%" + -DOPENAL_LIBRARY="%DEPS_LIB_DIR%\OpenAL32.lib" + -DMPG123_INCLUDE_DIR="%DEPS_INCLUDE_DIR%" + -DMPG123_LIBRARIES="%DEPS_LIB_DIR%\libmpg123-0.lib" + -DSNDFILE_INCLUDE_DIR="%DEPS_INCLUDE_DIR%" + -DSNDFILE_LIBRARY="%DEPS_LIB_DIR%\libsndfile-1.lib" + .. build: project: build\GZDoom.sln