Rebase Changes from the Prey Fork

Author: FriskTheFallenHuman

.github/workflows/auto-update-vcpkg.yml

@@ -3,6 +3,9 @@ on:
   schedule:
     - cron: "0 0 1,25,29 * *"
 
+permissions:
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/linux_build.yml

@@ -3,11 +3,16 @@ on:
   push:
     branches:
       - "master"
+    paths-ignore:
+      - .github/workflows/windows_build.yml
   pull_request:
     types:
       - edited
       - opened
       - synchronize
+    paths-ignore:
+      - .github/workflows/windows_build.yml
+  workflow_dispatch:
 concurrency:
   # Cancel concurrent workflows for the same PR or commit hash.
   group: ${{github.workflow}}-${{github.event_name == 'pull_request' && github.head_ref || github.sha}}
@@ -23,7 +28,7 @@ jobs:
         os: [ubuntu-latest]
     steps:
       - name: Download dependencies
-        run: sudo apt install libgl1-mesa-dev libsdl2-dev libopenal-dev libcurl4-openssl-dev cmake ninja-build libfreetype6-dev
+        run: sudo apt update && sudo apt install libgl1-mesa-dev libsdl2-dev libopenal-dev libcurl4-openssl-dev cmake ninja-build libfreetype6-dev
 
       - name: Check out repository code
         uses: actions/checkout@v4

.github/workflows/windows_build.yml

@@ -3,11 +3,16 @@ on:
   push:
     branches:
       - "master"
+    paths-ignore:
+      - .github/workflows/linux_build.yml
   pull_request:
     types:
       - edited
       - opened
       - synchronize
+    paths-ignore:
+      - .github/workflows/linux_build.yml
+  workflow_dispatch:
 concurrency:
   # Cancel concurrent workflows for the same PR or commit hash.
   group: ${{github.workflow}}-${{github.event_name == 'pull_request' && github.head_ref || github.sha}}
@@ -32,16 +37,16 @@ jobs:
       - name: Restore from cache and setup vcpkg executable and data files.
         uses: lukka/run-vcpkg@v11
         with:
-          vcpkgDirectory: "${{github.workspace}}/vcpkg"
+          vcpkgDirectory: '${{github.workspace}}/vcpkg'
           runVcpkgInstall: true
-          vcpkgJsonGlob: "**/neo/vcpkg.json"
+          vcpkgJsonGlob: '**/neo/vcpkg.json'
 
       - name: Run CMake+vcpkg+Ninja to build the engine.
         uses: lukka/run-cmake@v10
         with:
-          cmakeListsTxtPath: "${{github.workspace}}/neo/CMakeLists.txt"
-          configurePreset: "ninja-multi-vcpkg"
-          buildPreset: "ninja-vcpkg-release"
+          cmakeListsTxtPath: '${{github.workspace}}/neo/CMakeLists.txt'
+          configurePreset: 'ninja-multi-vcpkg'
+          buildPreset: 'ninja-vcpkg-release'
 
       - name: Copy base files to the output folder
         shell: pwsh

neo/CMakeLists.txt

@@ -256,7 +256,7 @@ if(NOT MSVC)
 	check_c_source_compiles("#include <SDL_syswm.h>
 		int main() { SDL_SysWMinfo wmInfo = {}; wmInfo.info.x11.display = NULL; return 0; }" HAVE_SDL_X11)
 	unset(CMAKE_REQUIRED_LIBRARIES)
-		
+
 	if (HAVE_SDL_X11)
 		message(STATUS "This SDL2 has X11 support")
 		add_definitions(-DD3_SDL_X11)
@@ -322,7 +322,7 @@ if(D3_COMPILER_IS_GCC_OR_CLANG)
 	if(cxx_has_fp-contract)
 		add_compile_options(-ffp-contract=off)
 	endif()
-	
+
 	if(ASAN)
 		# if this doesn't work, ASan might not be available on your platform, don't set ASAN then..
 		add_compile_options(-fsanitize=address)
@@ -349,7 +349,7 @@ if(D3_COMPILER_IS_GCC_OR_CLANG)
 	if(cxx_has_Woverload_virtual)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual")
 	endif()
-	
+
 	# shut up about using memcpy() on classes, in the cases doom3 uses it it seems to be fine
 	CHECK_CXX_COMPILER_FLAG("-Wno-class-memaccess" cxx_has_Wno-class-memaccess)
 	if(cxx_has_Wno-class-memaccess)
@@ -432,20 +432,21 @@ elseif(MSVC)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4286 /ignore:4217")
 	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /ignore:4286 /ignore:4217")
 	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4286 /ignore:4217")
-	
+
+
 	add_definitions(-D_ALLOW_KEYWORD_MACROS) # because of the "#define private public" and "#define protected public" in TypeInfo.cpp
-	
+
 	set(CMAKE_C_FLAGS_DEBUG "-D_DEBUG /Od /Zi /MDd")
 	set(CMAKE_C_FLAGS_RELEASE "/Ox /Oy /MD")
 	set(CMAKE_C_FLAGS_RELWITHDEBINFO "/Ox /Oy /Zi /MD")
 	set(CMAKE_C_FLAGS_MINSIZEREL "/Ox /Oy /Os /MD")
-	
+
 	# use 8MB stack instead of 1MB, so big models don't overflow it with _alloca()
 	set(ldflags "${ldflags} /STACK:8388608")
-	
+
 	# let the 32bit app use more than 2gb of ram
 	set(ldflags "${ldflags} /LARGEADDRESSAWARE")
-	
+
 	# Don't let the linker generate manifest files for shared dlls
 	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO")
 else()
@@ -583,7 +584,7 @@ set(src_renderer
 	renderer/tr_turboshadow.cpp
 )
 
-# Don't use precompiled headers for renderer/stblib_impls.c
+# Don't use precompiled headers for renderer/stblib_impls.c source.
 set_source_files_properties(
 	renderer/stblib_impls.c
 	PROPERTIES
@@ -730,7 +731,7 @@ set(src_snd
 	sound/stbvorbis_impl.c
 )
 
-# Don't use precompiled headers for sound/stbvorbis_impl.c
+# Don't use precompiled headers for sound/stbvorbis_impl.c source.
 set_source_files_properties(
 	sound/stbvorbis_impl.c
 	PROPERTIES
@@ -1366,9 +1367,9 @@ if(ENGINE)
 		${src_imgui}
 		${src_editor_tools}
 	)
-	
+
 	if(MSVC)
-		# set MSVC default debug directory on executable	
+		# set MSVC default debug directory on executable
 		set_target_properties(${DHEWM3BINARY} PROPERTIES VS_STARTUP_PROJECT ${DHEWM3BINARY})
 		set_target_properties(${DHEWM3BINARY} PROPERTIES VS_DEBUGGER_COMMAND "${OUTPUT_FOLDER}/${DHEWM3BINARY}.exe")
 		set_target_properties(${DHEWM3BINARY} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${OUTPUT_FOLDER}")
@@ -1378,13 +1379,13 @@ if(ENGINE)
 	endif()
 
 	target_precompile_headers(${DHEWM3BINARY} PRIVATE "${CMAKE_SOURCE_DIR}/idlib/precompiled.h")
-	
+
 	target_include_directories(${DHEWM3BINARY} PRIVATE "${CMAKE_SOURCE_DIR}/idlib" "${CMAKE_SOURCE_DIR}/libs/imgui")
 
 	if(HARDLINK_GAME)
 		set_target_properties(${DHEWM3BINARY} PROPERTIES COMPILE_DEFINITIONS "${TOOLS_DEFINES}")
 		target_include_directories(${DHEWM3BINARY} PRIVATE ${game_includes})
-	
+
 		# Hack to get .natvis added
 		if (MSVC)
 			target_sources(${DHEWM3BINARY} PRIVATE "sys/win32/natvis/game.natvis")
@@ -1427,19 +1428,19 @@ if(DEDICATED)
 		${src_sys_base}
 		${src_debuggerServer}
 	)
-	
+
 	if(MSVC)
 		source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX neo FILES ${src_core} ${src_sys_base} ${src_stub_openal} ${src_stub_gl} ${src_debuggerServer})
 	endif()
-	
+
 	target_precompile_headers(${DHEWM3BINARY}ded PRIVATE "${CMAKE_SOURCE_DIR}/idlib/precompiled.h")
-	
+
 	target_include_directories(${DHEWM3BINARY}ded PRIVATE "${CMAKE_SOURCE_DIR}/idlib")
 
 	if(HARDLINK_GAME)
 		set_target_properties(${DHEWM3BINARY}ded PROPERTIES COMPILE_DEFINITIONS "IMGUI_DISABLE;ID_DEDICATED")
 		target_include_directories(${DHEWM3BINARY}ded PRIVATE ${game_includes})
-	
+
 		# Hack to get .natvis added
 		if (MSVC)
 			target_sources(${DHEWM3BINARY} PRIVATE "sys/win32/natvis/game.natvis")
@@ -1455,7 +1456,7 @@ if(DEDICATED)
 	set_target_properties(${DHEWM3BINARY}ded PROPERTIES LINK_FLAGS "${ldflags}")
 	set_target_properties(${DHEWM3BINARY}ded PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<1:>${OUTPUT_FOLDER})
 	set_target_properties(${DHEWM3BINARY}ded PROPERTIES FOLDER "exes")
-	
+
 	list(REMOVE_ITEM sys_thirdparty_libs ${OPENAL_LIBRARY})
 
 	target_link_libraries(${DHEWM3BINARY}ded
@@ -1549,16 +1550,16 @@ endif()
 
 if(BASE AND NOT HARDLINK_GAME)
 	add_library(Game${cpu} SHARED ${src_game})
-	
+
 	if (MSVC)
 		target_sources(Game${cpu} PRIVATE "sys/win32/natvis/game.natvis")
 		source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX neo FILES ${src_game})
 	endif()
-	
+
 	target_precompile_headers(Game${cpu} PRIVATE "${CMAKE_SOURCE_DIR}/idlib/precompiled.h")
-	
+
 	target_include_directories(Game${cpu} PRIVATE "${CMAKE_SOURCE_DIR}/idlib")
-	
+
 	set_target_properties(Game${cpu} PROPERTIES PREFIX "")
 	set_target_properties(Game${cpu} PROPERTIES COMPILE_DEFINITIONS "GAME_DLL")
 	target_include_directories(Game${cpu} PRIVATE "${CMAKE_SOURCE_DIR}/game")

neo/cm/CollisionModel_contents.cpp

@@ -502,6 +502,8 @@ int idCollisionModelManagerLocal::ContentsTrm( trace_t *results, const idVec3 &s
 	tw.trace.fraction = 1.0f;
 	tw.trace.c.contents = 0;
 	tw.trace.c.type = CONTACT_NONE;
+	tw.trace.c.material = NULL;
+	tw.trace.c.id = 0;
 	tw.contents = contentMask;
 	tw.isConvex = true;
 	tw.rotation = false;

neo/cm/CollisionModel_load.cpp

@@ -775,6 +775,7 @@ void idCollisionModelManagerLocal::SetupTrmModelStructure( void ) {
 	trmBrushes[0]->b->bounds.Clear();
 	trmBrushes[0]->b->checkcount = 0;
 	trmBrushes[0]->b->contents = -1;		// all contents
+	trmBrushes[0]->b->material = trmMaterial;
 	trmBrushes[0]->b->numPlanes = 0;
 }
 
@@ -3071,7 +3072,7 @@ cm_model_t *idCollisionModelManagerLocal::LoadRenderModel( const char *fileName
 	// shutdown the hash
 	ShutdownHash();
 
-	common->DPrintf( "...loaded collision model: " S_COLOR_WHITE "'%s'\n", model->name.c_str() );
+	common->DPrintf( "..loaded collision model: '%s'\n", model->name.c_str() );
 
 	return model;
 }

neo/cm/CollisionModel_rotate.cpp

@@ -324,7 +324,12 @@ int idCollisionModelManagerLocal::RotateEdgeThroughEdge( cm_traceWork_t *tw, con
 			q = - b - sqrtd;
 		}
 		frac1 = q / a;
-		frac2 = c / q;
+		if ( q == 0.0f ) {
+			frac2 = 0.0f;
+		}
+		else {
+			frac2 = c / q;
+		}
 	}
 
 	if ( tw->angle < 0.0f ) {

neo/cm/CollisionModel_translate.cpp

@@ -802,6 +802,8 @@ void idCollisionModelManagerLocal::Translation( trace_t *results, const idVec3 &
 	tw.trace.fraction = 1.0f;
 	tw.trace.c.contents = 0;
 	tw.trace.c.type = CONTACT_NONE;
+	tw.trace.c.material = NULL;
+	tw.trace.c.id = 0;
 	tw.contents = contentMask;
 	tw.isConvex = true;
 	tw.rotation = false;
@@ -889,8 +891,8 @@ void idCollisionModelManagerLocal::Translation( trace_t *results, const idVec3 &
 		if ( session->rw ) {
 			session->rw->DebugArrow( colorRed, start, end, 1 );
 		}
-		common->Printf( "idCollisionModelManagerLocal::Translation: huge translation from (%.2f %.2f %.2f) to (%.2f %.2f %.2f)\n",
-				start.x, start.y, start.z, end.x, end.y, end.z);
+		common->Printf( "idCollisionModelManagerLocal::Translation: huge translation from (%.2f %.2f %.2f) to (%.2f %.2f %.2f) of entity: %s\n",
+				start.x, start.y, start.z, end.x, end.y, end.z, tw.model->name.c_str() );
 		return;
 	}