Quake VR v0.0.5 (#35)

* Add map menu for DOPA

* Menu improvements

* Add keep and arcane dimension source files

* Reorganize defs

* WIP new item management system

* update touch bindings

* suggestion

* update make_pak

* Major QC refactoring

* QC refactoring, fix armor pickup bug

* Fix weapon pickup bugs, fix superhealth hipnotic issue

* TODOs

* More QC refactoring

* Rogue merge WIP

* More rogue merging

* WIP rogue merge (weapons missing)

* DOE fixes

* Rogue support progress, open hand model

* Lava weapons and weaponflags

* Implement all weapons

* Weapon buttons!

* Fixes/refactoring

* Update readme

* Cvars

* Honey merge - part 1

* Honey merge part 2

* Honey merge

* WIP finger tracking, model offset issues..

* Major progress on finger tracking

* Progress...

* Fix 2H aiming, add particle effects to Rogue weapons

* Initial work on frikbot

* update custom maps

* Progress on MP and finger tracking

* Multiplayer stuff

* QC refactoring and CVar handle WIP

* Remove large file

* WIP

* Animation blending with zero frame WIP

* Reduce Recoil animation in 2H aiming

* Multiplayer progress

* Only use SDL2, use GLEW, also more

* GLSL particle system

* Add particlehandle

* WIP

* WIP

* SOA particle impl

* Implement texture atlas for particles

* progress

* Add copper quake source

* Change progs.dat to vrprogs.dat

* 2H throw and 2H spread reduction

* Headbutt mechanic

* Map menu paging and improvements

* Formatting

* Start map customization

* Fix bot bugs, improve fakevr

* Update readme

* Formatting, restore color-coded explosions

* Fix Honey door delay bug, fix bug with enemies stuck and items disappearing, tweak item hitboxes, check add fakehandtouch in fakevr and for bots, fix holster hovering with multiple player, fix bot item priority, code cleanup

* Show message when holster is full and trying to put gun in it

* Fix some opengl issues

* Also check center in new droptofloor

* OpenGL issues / TODOs

* Config

* Fix more bugs

* Beta 2

* Add finger idx bias

* WIP

* linux compilation fix

* Investigate and work around bot carsh

* Fix ammo box weapon spawning and improve chance calculations

* Formatting

* Cleanup

* Update compilation

* Remove local keyword

* Formatting

* Reproduce crash

* Fix broken sky textures

* WorldText WIP

* Cleanup

* WIP

* Header cleanup

* Compile

* More header cleanup

* More header cleanup

* Add shader component

* Major progress on banners

* Fix linux build

* Remove test stuff

* Fix particle rendering bug, add bat files

* Formatting

* Directory structure change

* Fix pak start map crash (probably)

* Fix scourge spazing bug

* WIP stuff

* Make weapon colliders bigger, WIP work on parabola grab, add option to disable 2H angle threshold (requested)

* Major cleanup

* Fix typo

* TODOs

* Implement autosave

* Header cleanup

* Add autosave on changelevel

* Fix TODOs & warnings

* Tutorial map WIP

* Tutorial map progress

* Tweak drop rates

* Tweak drop rates

* Add shotgun pickup model

* Credit Spike for help

* Tweak drop rates and ammo hitboxes

* Wip rubble stuff

* Change default force grab to linear

* WIP quick settings menu

* TODOs

* Fix swimming direction

* Implement blended throwing and menu action set

* cfg

* Menu action set for Index

* Formatting

* Add time threshold to hand grabs

* Dat

* Fix linear force grab touching other hand

* Add CVar for throw center of mass

* Add menu support for reference entries

* Optimize worldtext drawing

* TODOs

* Cleanup forcegrab stuff

* Implement force grab for ammo and health

* Config

* Add finger blending, add glow to holsters, add WMR bindings

* Bin

* Virtual Keyboard

* Fixed boss crash

* Update console cvars

* Fix console message

* Move QC files

* Move stuff around

* Readme and webpage

* Bindings...

* Final touches/bugfixes

* Fix weapon firing bug

.clang-format

@@ -20,7 +20,7 @@ IndentCaseLabels: true
 IndentWidth: 4
 IndentWrappedFunctionNames: false
 MaxEmptyLinesToKeep: 3
-NamespaceIndentation: All
+NamespaceIndentation: None
 PenaltyBreakBeforeFirstCallParameter: 1000000000
 PointerAlignment: "Left"
 PointerBindsToType: true

.gitignore

@@ -1,5 +1,7 @@
+build
 Windows/build
 .fuse*
+Windows/buildlxcl
 Windows/buildlx
 Debug/id1
 Debug/Id1
@@ -12,6 +14,7 @@ Build-qu*
 *.blend10
 *.blend11
 *.blend12
+map_src/autosave
 
 # Linux objects
 .vs

CMakeLists.txt

@@ -0,0 +1,253 @@
+cmake_minimum_required(VERSION 3.8)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+project(quakevr VERSION 0.0.5 LANGUAGES CXX)
+
+set(source_list
+    "Quake/bgmusic.cpp"
+    "Quake/byteorder.cpp"
+    "Quake/cd_sdl.cpp"
+    "Quake/cfgfile.cpp"
+    "Quake/chase.cpp"
+    "Quake/cl_demo.cpp"
+    "Quake/cl_input.cpp"
+    "Quake/cl_main.cpp"
+    "Quake/cl_parse.cpp"
+    "Quake/cl_tent.cpp"
+    "Quake/cmd.cpp"
+    "Quake/common.cpp"
+    "Quake/console.cpp"
+    "Quake/crc.cpp"
+    "Quake/cvar.cpp"
+    "Quake/fshandle.cpp"
+    "Quake/gl_draw.cpp"
+    "Quake/gl_fog.cpp"
+    "Quake/gl_mesh.cpp"
+    "Quake/gl_model.cpp"
+    "Quake/gl_refrag.cpp"
+    "Quake/gl_rlight.cpp"
+    "Quake/gl_rmain.cpp"
+    "Quake/gl_rmisc.cpp"
+    "Quake/gl_screen.cpp"
+    "Quake/gl_sky.cpp"
+    "Quake/gl_texmgr.cpp"
+    "Quake/gl_util.cpp"
+    "Quake/gl_vidsdl.cpp"
+    "Quake/gl_warp.cpp"
+    "Quake/host_cmd.cpp"
+    "Quake/host.cpp"
+    "Quake/image.cpp"
+    "Quake/in_sdl.cpp"
+    "Quake/keys.cpp"
+    "Quake/main_sdl.cpp"
+    "Quake/mathlib.cpp"
+    "Quake/menu_util.cpp"
+    "Quake/menu.cpp"
+    "Quake/menu_keyboard.cpp"
+    "Quake/msg.cpp"
+    "Quake/net_dgrm.cpp"
+    "Quake/net_loop.cpp"
+    "Quake/net_main.cpp"
+    "Quake/pr_cmds.cpp"
+    "Quake/pr_edict.cpp"
+    "Quake/pr_exec.cpp"
+    "Quake/quakeglm.cpp"
+    "Quake/r_alias.cpp"
+    "Quake/r_brush.cpp"
+    "Quake/r_part.cpp"
+    "Quake/r_sprite.cpp"
+    "Quake/r_world.cpp"
+    "Quake/saveutil.cpp"
+    "Quake/sbar.cpp"
+    "Quake/server.cpp"
+    "Quake/shader.cpp"
+    "Quake/sizebuf.cpp"
+    "Quake/snd_codec.cpp"
+    "Quake/snd_dma.cpp"
+    "Quake/snd_flac.cpp"
+    "Quake/snd_mem.cpp"
+    "Quake/snd_mikmod.cpp"
+    "Quake/snd_mix.cpp"
+    "Quake/snd_modplug.cpp"
+    "Quake/snd_mp3.cpp"
+    "Quake/snd_mp3tag.cpp"
+    "Quake/snd_opus.cpp"
+    "Quake/snd_sdl.cpp"
+    "Quake/snd_umx.cpp"
+    "Quake/snd_vorbis.cpp"
+    "Quake/snd_wave.cpp"
+    "Quake/snd_xmp.cpp"
+    "Quake/strlcat.cpp"
+    "Quake/strlcpy.cpp"
+    "Quake/sv_main.cpp"
+    "Quake/sv_move.cpp"
+    "Quake/sv_phys.cpp"
+    "Quake/sv_user.cpp"
+    "Quake/view.cpp"
+    "Quake/vr_cvars.cpp"
+    "Quake/vr_showfn.cpp"
+    "Quake/vr.cpp"
+    "Quake/wad.cpp"
+    "Quake/world.cpp"
+    "Quake/zone.cpp"
+)
+
+if (WIN32)
+    list(APPEND source_list
+        "Quake/net_win.cpp"
+        "Quake/net_wins.cpp"
+        "Quake/net_wipx.cpp"
+        "Quake/pl_win.cpp"
+        "Quake/sys_sdl_win.cpp"
+    )
+else()
+    list(APPEND source_list
+        "Quake/net_bsd.cpp"
+        "Quake/pl_linux.cpp"
+        "Quake/sys_sdl_unix.cpp"
+        "Quake/net_udp.cpp"
+        "Quake/snd_mpg123.cpp"
+    )
+endif()
+
+
+set_source_files_properties(${source_list} PROPERTIES LANGUAGE CXX )
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(QUAKEVR_TARGET_NAME "quakevr-debug")
+else()
+    set(QUAKEVR_TARGET_NAME "quakevr")
+endif()
+
+add_executable(${QUAKEVR_TARGET_NAME} "${source_list}")
+set_target_properties(${QUAKEVR_TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
+
+target_compile_features(${QUAKEVR_TARGET_NAME} PUBLIC cxx_std_17)
+target_compile_options(${QUAKEVR_TARGET_NAME}
+    PRIVATE -Wall -Wextra -Wno-missing-field-initializers -Wpedantic -Wimplicit-fallthrough
+    -Wno-language-extension-token -Wno-nested-anon-types -Wno-gnu-anonymous-struct -Wno-deprecated-declarations -Wno-microsoft-enum-value # WIN32 only
+    -Wno-implicit-fallthrough -Wno-c++98-compat -Wno-c++98-compat-pedantic
+)
+
+# -g -fsanitize=address -fdiagnostics-color=always
+
+# -Wfallthrough
+
+target_compile_definitions(${QUAKEVR_TARGET_NAME} PRIVATE
+    USE_SDL2=1
+    _AMD64_=1
+    -DPARANOID=1
+    WIN32=1
+    NDEBUG=1
+    _WINDOWS=1
+    _USE_WINSOCK2=1
+    _CRT_NONSTDC_NO_DEPRECATE=1
+    _CRT_SECURE_NO_WARNINGS=1
+    _WINSOCK_DEPRECATED_NO_WARNINGS=1
+    USE_SDL2=1
+    USE_CODEC_MP3=1
+    USE_CODEC_VORBIS=1
+    USE_CODEC_WAVE=1
+    USE_CODEC_FLAC=1
+    USE_CODEC_OPUS=1
+    USE_CODEC_MIKMOD=1
+    USE_CODEC_UMX=1
+    __clang__=1
+)
+
+target_include_directories(
+    ${QUAKEVR_TARGET_NAME} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Quake/>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+target_include_directories(
+    ${QUAKEVR_TARGET_NAME} SYSTEM PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Windows/SDL2/include/>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Windows/glew/include/>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Windows/codecs/include/>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/glm/>
+)
+
+
+# target_compile_options(${QUAKEVR_TARGET_NAME} PRIVATE
+#     "-isystem $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Windows/SDL2/include/>"
+#     "-isystem $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Windows/glew/include/>"
+#     "-isystem $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Windows/codecs/include/>"
+#     "-isystem $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/glm/>"
+# )
+
+set_property(TARGET ${QUAKEVR_TARGET_NAME} PROPERTY CXX_STANDARD 17)
+
+include(FindOpenGL)
+
+if (WIN32)
+    set(SDL2_LIBRARIES
+        "C:/OHWorkspace/quakevr/Windows/SDL2/lib64/SDL2main.lib"
+        "C:/OHWorkspace/quakevr/Windows/SDL2/lib64/SDL2.lib"
+    )
+
+    target_link_libraries(${QUAKEVR_TARGET_NAME}
+        ${OPENGL_gl_LIBRARY} ${SDL2_LIBRARIES} wsock32 winmm ws2_32
+    )
+
+    set(OPENVR_LIBRARIES
+        "C:/OHWorkspace/quakevr/Windows/OpenVR/lib/win64/openvr_api.lib"
+    )
+
+    # find_package(GLEW)
+    # if (GLEW_FOUND)
+    #     include_directories(${GLEW_INCLUDE_DIRS})
+    # endif()
+
+    set(OTHER_LIBS
+        "openvr_api.lib"
+        "libvorbisfile.lib"
+        "libvorbis.lib"
+        "libopusfile.lib"
+        "libopus.lib"
+        "libFLAC.lib"
+        "libogg.lib"
+        "libmad.lib"
+        "libmikmod.lib"
+        "ws2_32.lib"
+        "opengl32.lib"
+        "winmm.lib"
+        "SDL2.lib"
+        "SDL2main.lib"
+        "glew32.lib"
+    )
+
+    target_link_directories(${QUAKEVR_TARGET_NAME} PUBLIC
+        "C:/OHWorkspace/openvr/lib/win64"
+        "Windows/codecs/x64"
+        "Windows/SDL2/lib64"
+        "Windows/glew/lib"
+    )
+
+    target_link_libraries(${QUAKEVR_TARGET_NAME}
+        ${OPENGL_gl_LIBRARY} ${SDL2_LIBRARIES} ${OPENVR_LIBRARIES} ${GLEW_LIBRARIES} ${OTHER_LIBS}
+    )
+else()
+    find_package(SDL2 REQUIRED)
+    include_directories(${SDL2_INCLUDE_DIRS})
+
+    # FIND_PACKAGE(PkgConfig)
+    # PKG_SEARCH_MODULE(OPENVR REQUIRED openvr)
+
+    set(OPENVR_LIBRARIES
+        "/home/vittorioromeo/Repos/openvr/bin/linux64/libopenvr_api.so"
+    )
+
+    find_package(GLEW REQUIRED)
+    if (GLEW_FOUND)
+        include_directories(${GLEW_INCLUDE_DIRS})
+    endif()
+
+    target_link_libraries(${QUAKEVR_TARGET_NAME}
+        asan ${OPENGL_gl_LIBRARY} SDL2::SDL2 ${OPENVR_LIBRARIES} ${GLEW_LIBRARIES}
+    )
+endif()
+
+

CUSTOM_MAPS.md

@@ -0,0 +1,66 @@
+<a href="https://vittorioromeo.info/quakevr">
+    <p align="center">
+        <img width="460" height="250" src="https://vittorioromeo.info/Misc/quakevrlogo.png">
+    </p>
+</a>
+
+# [quakevr](https://vittorioromeo.info/quakevr)
+
+## Recommended Custom Maps
+
+In general, any map that doesn't have a custom `progs.dat` will be compatible.
+
+A good starting point is to visit <https://www.quaddicted.com/reviews/>, sort by rating, and check if the map you're looking at doesn't have a custom `progs.dat`. There is an icon towards the bottom of each map's page that will tell you. Also, the map should not have any "dependency".
+
+For maps with `.pak`: extracting any `.pak` to the `Id1` folder is the recommended way to install custom maps, but you can also rename the `XX` in `.pakXX` to some unique number which comes before the Quake VR `.pak` files and after the regular Quake ones.
+
+If you try any of the maps below, please let me know if they work and we can list them under "confirmed working".
+
+### Confirmed Working
+
+- https://www.quaddicted.com/reviews/dopa.html
+- https://www.quaddicted.com/reviews/honey.html
+
+### Should Work
+
+- https://www.quaddicted.com/reviews/ac.html
+- https://www.quaddicted.com/reviews/bindingtower2.html
+- https://www.quaddicted.com/reviews/could.html
+- https://www.quaddicted.com/reviews/czg03.html
+- https://www.quaddicted.com/reviews/czgtoxic.html
+- https://www.quaddicted.com/reviews/digs05.html
+- https://www.quaddicted.com/reviews/dm6rmx.html
+- https://www.quaddicted.com/reviews/drearydisposition.html
+- https://www.quaddicted.com/reviews/e1m1rmx.html
+- https://www.quaddicted.com/reviews/endofsolace.html
+- https://www.quaddicted.com/reviews/explorejam1.html
+- https://www.quaddicted.com/reviews/fmb_bdg2.html
+- https://www.quaddicted.com/reviews/func_mapjam2.html
+- https://www.quaddicted.com/reviews/gmsp3tw.html
+- https://www.quaddicted.com/reviews/gotshun-never-released_levels.html (requires Scourge of Armagon)
+- https://www.quaddicted.com/reviews/grim_rezipped.html
+- https://www.quaddicted.com/reviews/ivory1b.html
+- https://www.quaddicted.com/reviews/ksp1.html
+- https://www.quaddicted.com/reviews/mapjam6.html
+- https://www.quaddicted.com/reviews/megad2lvl3.html
+- https://www.quaddicted.com/reviews/menk.html
+- https://www.quaddicted.com/reviews/nastrond.html
+- https://www.quaddicted.com/reviews/qump.html
+- https://www.quaddicted.com/reviews/quoffee.html
+- https://www.quaddicted.com/reviews/retrojam2.html
+- https://www.quaddicted.com/reviews/retrojam3.html
+- https://www.quaddicted.com/reviews/retrojam3dlc.html
+- https://www.quaddicted.com/reviews/retrojam4dlc_pulsar.html
+- https://www.quaddicted.com/reviews/simplex.html
+- https://www.quaddicted.com/reviews/sm185_pack.html
+- https://www.quaddicted.com/reviews/sm82.html
+- https://www.quaddicted.com/reviews/tofaz.html
+- https://www.quaddicted.com/reviews/uwjam.html
+- https://www.quaddicted.com/reviews/winbbcoh.html
+- https://www.quaddicted.com/reviews/zendar1d.html
+
+### Likely Not Working (Needs Minor Tweaking)
+
+- https://www.quaddicted.com/reviews/copper.html
+- https://www.quaddicted.com/reviews/udob.html
+