Merge branch 'master' into swf-as3-support

README.md

@@ -449,6 +449,8 @@ Recommended in this case is `cmake-vs2022-win64-no-ffmpeg.bat`
 		> # DXC compiler
 		> PATH="~/dxc-artifacts/bin:$PATH"
 
+	As an alternative to modifying your PATH, you can add -DDXC\_CUSTOM_PATH=\<path-to-dxc-binary> to the CMake options.
+
 2. You need the following dependencies in order to compile RBDoom3BFG with all features:
 
 	On Debian or Ubuntu:

RELEASE-NOTES.md

@@ -19,6 +19,61 @@ TBD - RBDOOM-3-BFG 1.6.0
 _______________________________
 
 
+## .plan - April 24, 2024
+
+Cudos to Stephen Saunders for most changes in this build. NVRHI was updated to the version on 25 February.
+The shader compiling part was also split out of NVRHI into a new ShaderMake tool by Nvidia.
+
+You can get Blender lights to work with the glTF workflow without the need to place fake light entities in Blender.
+VR options are stripped from the settings menu and com_showFPS > 2 show the VRAM memory usage.
+
+Optick has been improved for macOS and Vulkan and otherwise most changes are developer related.
+The renderdemo code has been removed and if you compile the engine without Classic Doom support then you will bypass the startup screen and get into the main menu immediatly.
+
+Changelog:
+
+* Read Blender lights directly through the KHR_lights_punctual glTF extension
+
+* Don't let VR options of other VR builds to break rendering of the non-VR master
+
+* Fix testVideo to check for viewDef->viewEntitys (i.e. 3D/2D) not console state
+
+* When playing testVideos, skip sRGB to linear conversion only when console active (i.e. 2D)
+
+* Check for valid allocations before freeing Bink Decoder bundles
+
+* Renamed DX12/Vulkan specific cvars with a r_vk/r_dx prefix
+
+* Set r_maxFrameLatency max value constraint to NUM_FRAME_DATA
+
+* Change r_maxFrameLatency cvar name and set to default value of 2 frames
+
+* Implement m_frameLatencyWaitableObject sync for reduced DX12 frame latency
+
+* Extend Optick to support data tags on custom storage events
+
+* Added CMake -DRETAIL option for shipping builds on Github/ModDB
+
+* Skip startup if not compiled with Doom Classic support, closes #874
+
+* More renderdemo code removed
+
+* Killed hard to maintain renderdemo code
+
+* Fix for cinematic audio when playing Bink video files with ffmpeg decoder, improve ffmpeg a/v resync
+
+* Show VRAM memory usage with com_showFPS > 2 in separate line
+
+* Correct some uint64 types and add Optick frame tag for DX12 / Vulkan Present()
+
+* Optick: Eliminate need for blocking sleep wait at start of Vulkan clock sync
+
+* Optick: Remove blocking sleep wait at start of Vulkan clock synchronization
+
+* Complete Optick instrumentation and align with HUD GPU timers
+
+
+
 ## .plan - January 20, 2024
 
 Cudos to Stephen Saunders for this build and to reeFridge for finding the issue.

base/def/misc.def

@@ -38,8 +38,10 @@ entityDef light {
 	"editor_var shaderParm7"	"shaderParm 7"
 	"editor_var count"			"how many times light must be triggered to toggle."
 	"editor_var break"			"break when triggered."
-	"editor_model model"			"model to use."
-	"editor_model broken"			"model to use when the light is broken (defaults to model name with '_broken' appended to name)"
+	// RB: modelTarget key to support light groups of lights and func_static models in TrenchBroom
+	"editor_var modelTarget"	"name of func_static entity as a replacement for model on this entity"
+	"editor_model model"		"model to use."
+	"editor_model broken"		"model to use when the light is broken (defaults to model name with '_broken' appended to name)"
 	"editor_var hideModelOnBreak" "hides the model when broken"
 	"editor_var health"			"amount of damage to recieve before becoming broken.  0 is nonbreakable."
 	"editor_var target"			"entities to trigger if shot."

base/devtools.cfg

@@ -3,7 +3,7 @@ bind "I" "toggle r_showSurfaceInfo"
 bind "N" "noclip"
 bind "M" "spawn moveable_macbethchart"
 
-bind "F1" "toggle editLights"
+bind "F1" "editLights"
 bind "F2" "toggle r_showTris 1 2 0"
 bind "F3" "toggle r_forceAmbient 0.5 1.0 0"
 bind "F4" "toggle r_skipInteractions"

base/extract_resources.cfg

@@ -1,65 +1,66 @@
-extractResourceFile _common.resources basedev 1
-extractResourceFile _ordered.resources basedev 1
-extractResourceFile _sound_pc.resources basedev 1
-extractResourceFile _sound_pc_en.resources basedev 1
+extractResourceFile _common.resources baseref
+extractResourceFile _ordered.resources baseref
+extractResourceFile _sound_pc.resources baseref copysound
+extractResourceFile _sound_pc_en.resources baseref copysound
+extractResourceFile _sound_pc_gr.resources baseref copysound
 
-extractResourceFile maps/admin.resources basedev 1 
-extractResourceFile maps/alphalabs1.resources basedev 1
-extractResourceFile maps/alphalabs2.resources basedev 1
-extractResourceFile maps/alphalabs3.resources basedev 1
-extractResourceFile maps/alphalabs4.resources basedev 1
-extractResourceFile maps/caverns1.resources basedev 1 1
-extractResourceFile maps/caverns2.resources basedev 1
-extractResourceFile maps/comm1.resources basedev 1
-extractResourceFile maps/commoutside.resources basedev 1
-extractResourceFile maps/cpu.resources basedev 1
-extractResourceFile maps/cpuboss.resources basedev 1
-extractResourceFile maps/d3ctf1.resources basedev 1
-extractResourceFile maps/d3ctf2.resources basedev 1
-extractResourceFile maps/d3ctf3.resources basedev 1
-extractResourceFile maps/d3ctf4.resources basedev 1
-extractResourceFile maps/d3dm1.resources basedev 1
-extractResourceFile maps/d3dm2.resources basedev 1
-extractResourceFile maps/d3dm3.resources basedev 1
-extractResourceFile maps/d3dm4.resources basedev 1
-extractResourceFile maps/d3dm5.resources basedev 1
-extractResourceFile maps/d3xpdm1.resources basedev 1
-extractResourceFile maps/d3xpdm2.resources basedev 1
-extractResourceFile maps/d3xpdm3.resources basedev 1
-extractResourceFile maps/d3xpdm4.resources basedev 1
-extractResourceFile maps/delta1.resources basedev 1
-extractResourceFile maps/delta2a.resources basedev 1
-extractResourceFile maps/delta2b.resources basedev 1
-extractResourceFile maps/delta3.resources basedev 1
-extractResourceFile maps/delta4.resources basedev 1
-extractResourceFile maps/delta5.resources basedev 1
-extractResourceFile maps/deltax.resources basedev 1
-extractResourceFile maps/enpro.resources basedev 1
-extractResourceFile maps/erebus1.resources basedev 1
-extractResourceFile maps/erebus2.resources basedev 1
-extractResourceFile maps/erebus3.resources basedev 1
-extractResourceFile maps/erebus4.resources basedev 1
-extractResourceFile maps/erebus5.resources basedev 1
-extractResourceFile maps/erebus6.resources basedev 1
-extractResourceFile maps/hell.resources basedev 1
-extractResourceFile maps/hell1.resources basedev 1
-extractResourceFile maps/hellhole.resources basedev 1
-extractResourceFile maps/le_enpro1.resources basedev 1
-extractResourceFile maps/le_enpro2.resources basedev 1
-extractResourceFile maps/le_exis1.resources basedev 1
-extractResourceFile maps/le_exis2.resources basedev 1
-extractResourceFile maps/le_hell.resources basedev 1
-extractResourceFile maps/le_hell_post.resources basedev 1
-extractResourceFile maps/le_underground.resources basedev 1
-extractResourceFile maps/le_underground2.resources basedev 1
-extractResourceFile maps/mars_city1.resources basedev 1
-extractResourceFile maps/mars_city2.resources basedev 1
-extractResourceFile maps/mc_underground.resources basedev 1
-extractResourceFile maps/monorail.resources basedev 1
-extractResourceFile maps/phobos1.resources basedev 1
-extractResourceFile maps/phobos2.resources basedev 1
-extractResourceFile maps/phobos3.resources basedev 1
-extractResourceFile maps/phobos4.resources basedev 1
-extractResourceFile maps/recycling1.resources basedev 1
-extractResourceFile maps/recycling2.resources basedev 1
-extractResourceFile maps/site3.resources basedev 1
+extractResourceFile maps/admin.resources baseref 
+extractResourceFile maps/alphalabs1.resources baseref
+extractResourceFile maps/alphalabs2.resources baseref
+extractResourceFile maps/alphalabs3.resources baseref
+extractResourceFile maps/alphalabs4.resources baseref
+extractResourceFile maps/caverns1.resources baseref 1
+extractResourceFile maps/caverns2.resources baseref
+extractResourceFile maps/comm1.resources baseref
+extractResourceFile maps/commoutside.resources baseref
+extractResourceFile maps/cpu.resources baseref
+extractResourceFile maps/cpuboss.resources baseref
+extractResourceFile maps/d3ctf1.resources baseref
+extractResourceFile maps/d3ctf2.resources baseref
+extractResourceFile maps/d3ctf3.resources baseref
+extractResourceFile maps/d3ctf4.resources baseref
+extractResourceFile maps/d3dm1.resources baseref
+extractResourceFile maps/d3dm2.resources baseref
+extractResourceFile maps/d3dm3.resources baseref
+extractResourceFile maps/d3dm4.resources baseref
+extractResourceFile maps/d3dm5.resources baseref
+extractResourceFile maps/d3xpdm1.resources baseref
+extractResourceFile maps/d3xpdm2.resources baseref
+extractResourceFile maps/d3xpdm3.resources baseref
+extractResourceFile maps/d3xpdm4.resources baseref
+extractResourceFile maps/delta1.resources baseref
+extractResourceFile maps/delta2a.resources baseref
+extractResourceFile maps/delta2b.resources baseref
+extractResourceFile maps/delta3.resources baseref
+extractResourceFile maps/delta4.resources baseref
+extractResourceFile maps/delta5.resources baseref
+extractResourceFile maps/deltax.resources baseref
+extractResourceFile maps/enpro.resources baseref
+extractResourceFile maps/erebus1.resources baseref
+extractResourceFile maps/erebus2.resources baseref
+extractResourceFile maps/erebus3.resources baseref
+extractResourceFile maps/erebus4.resources baseref
+extractResourceFile maps/erebus5.resources baseref
+extractResourceFile maps/erebus6.resources baseref
+extractResourceFile maps/hell.resources baseref
+extractResourceFile maps/hell1.resources baseref
+extractResourceFile maps/hellhole.resources baseref
+extractResourceFile maps/le_enpro1.resources baseref
+extractResourceFile maps/le_enpro2.resources baseref
+extractResourceFile maps/le_exis1.resources baseref
+extractResourceFile maps/le_exis2.resources baseref
+extractResourceFile maps/le_hell.resources baseref
+extractResourceFile maps/le_hell_post.resources baseref
+extractResourceFile maps/le_underground.resources baseref
+extractResourceFile maps/le_underground2.resources baseref
+extractResourceFile maps/mars_city1.resources baseref
+extractResourceFile maps/mars_city2.resources baseref
+extractResourceFile maps/mc_underground.resources baseref
+extractResourceFile maps/monorail.resources baseref
+extractResourceFile maps/phobos1.resources baseref
+extractResourceFile maps/phobos2.resources baseref
+extractResourceFile maps/phobos3.resources baseref
+extractResourceFile maps/phobos4.resources baseref
+extractResourceFile maps/recycling1.resources baseref
+extractResourceFile maps/recycling2.resources baseref
+extractResourceFile maps/site3.resources baseref

doomclassic/doom/d_ticcmd.h

@@ -41,8 +41,8 @@ If you have questions concerning this license or the applicable additional terms
 // plus a checksum for internal state consistency.
 typedef struct
 {
-	char	forwardmove;	// *2048 for move
-	char	sidemove;	// *2048 for move
+	signed char	forwardmove;	// *2048 for move
+	signed char	sidemove;	// *2048 for move
 	short	angleturn;	// <<16 for angle delta
 	short	consistancy;	// checks for net game
 	byte	buttons;