Unified functionality of g_extrashadows into r_shadows

Author: FriskTheFallenHuman

.github/README.md

@@ -80,15 +80,14 @@ Compared to the original _dhewm 3_, the changes of _D3Modding Kit_ worth mention
   - D3XP And Game dlls are in one folder.
   - WIP Template base for TC Games.
   - Update The Sys Console to use different colors and font.
-  - Restored Footsteps sounds by using Prey 06 Code.
   - Set gui_mediumFontLimit and gui_smallFontLimit to "0"
   - Added Missing Material Editor models.
   - Added .guide Support from Quake 4.
   - Refactored MFC Tools.
   - Backported fixes from d3xp and merge missed changes in d3xp/ from base/
   - Backported Water bullet impact from RoE ( see Examples/ folder for the water particle)
   - Made the player be in thirdperson when they die in multiplayer.
-  - Rename g_showPlayerShadow to g_showExtraShadows and make it default.
+  - Merge g_showPlayerShadow to r_shadows (Set r_shadows 2 to see it).
   - Added decl_warn_duplicates so warnings about duplicated entries are hide.
   - Removed TakeNotes system.
   - Added doxygen support.

.github/workflows/linux_build.yml

@@ -42,7 +42,6 @@ jobs:
           Copy-Item -Path "output/base" -Destination "output/linux/base" -Recurse
           Copy-Item -Path "output/d3xp" -Destination "output/linux/d3xp" -Recurse
           Copy-Item -Path "output/libs" -Destination "output/linux/libs" -Recurse
-          Copy-Item -Path "output/examples" -Destination "output/linux/examples" -Recurse
           Copy-Item -Path "blender" -Destination "output/linux/blender" -Recurse
           Copy-Item -Path ".github/CHANGELOG.md" -Destination "output/linux"
           Copy-Item -Path ".github/CONFIGURATION.md" -Destination "output/linux"

.github/workflows/windows_build.yml

@@ -49,7 +49,6 @@ jobs:
           cd ${{github.workspace}}
           Copy-Item -Path "output/base" -Destination "output/windows/base" -Recurse
           Copy-Item -Path "output/d3xp" -Destination "output/windows/d3xp" -Recurse
-          Copy-Item -Path "output/examples" -Destination "output/windows/examples" -Recurse
           Copy-Item -Path "blender" -Destination "output/windows/blender" -Recurse
           Copy-Item -Path ".github/CHANGELOG.md" -Destination "output/windows"
           Copy-Item -Path ".github/CONFIGURATION.md" -Destination "output/windows"

neo/d3xp/Player.cpp

@@ -7583,7 +7583,7 @@ void idPlayer::Think( void ) {
 		}
 	}
 
-	if ( g_showExtraShadows.GetBool() ) {
+	if ( cvarSystem->GetCVarInteger( "r_shadows" ) == 2 ) {
 		renderEntity.suppressShadowInViewID	= 0;
 		if ( headRenderEnt ) {
 			headRenderEnt->suppressShadowInViewID = 0;
@@ -9457,7 +9457,7 @@ void idPlayer::ClientPredictionThink( void ) {
 		}
 	}
 
-	if ( g_showExtraShadows.GetBool() ) {
+	if ( cvarSystem->GetCVarInteger( "r_shadows" ) == 2 ) {
 		renderEntity.suppressShadowInViewID	= 0;
 		if ( headRenderEnt ) {
 			headRenderEnt->suppressShadowInViewID = 0;

neo/d3xp/Weapon.cpp

@@ -2097,7 +2097,7 @@ void idWeapon::PresentWeapon( bool showViewModel ) {
 	if ( worldModel.GetEntity() && worldModel.GetEntity()->GetRenderEntity() ) {
 		// deal with the third-person visible world model
 		// don't show shadows of the world model in first person
-		if ( g_showExtraShadows.GetBool() || pm_thirdPerson.GetBool() ) {
+		if ( cvarSystem->GetCVarInteger( "r_shadows" ) == 2 || pm_thirdPerson.GetBool() ) {
 			worldModel.GetEntity()->GetRenderEntity()->suppressShadowInViewID	= 0;
 		} else {
 			worldModel.GetEntity()->GetRenderEntity()->suppressShadowInViewID	= owner->entityNumber+1;

neo/d3xp/gamesys/SysCvar.cpp

@@ -334,7 +334,6 @@ idCVar pm_thirdPersonDeath(			"pm_thirdPersonDeath",		"0",			CVAR_GAME | CVAR_NE
 idCVar pm_modelView(				"pm_modelView",				"0",			CVAR_GAME | CVAR_NETWORKSYNC | CVAR_INTEGER, "draws camera from POV of player model (1 = always, 2 = when dead)", 0, 2, idCmdSystem::ArgCompletion_Integer<0,2> );
 idCVar pm_airTics(					"pm_air",					"1800",			CVAR_GAME | CVAR_NETWORKSYNC | CVAR_INTEGER, "how long in milliseconds the player can go without air before he starts taking damage" );
 
-idCVar g_showExtraShadows(			"g_showExtraShadows",		"1",			CVAR_GAME | CVAR_ARCHIVE | CVAR_BOOL, "enables extra shadows for player model and world model weapon" );
 idCVar g_showHud(					"g_showHud",				"1",			CVAR_GAME | CVAR_ARCHIVE | CVAR_BOOL, "" );
 idCVar g_showProjectilePct(			"g_showProjectilePct",		"0",			CVAR_GAME | CVAR_ARCHIVE | CVAR_BOOL, "enables display of player hit percentage" );
 idCVar g_showBrass(					"g_showBrass",				"1",			CVAR_GAME | CVAR_ARCHIVE | CVAR_BOOL, "enables ejected shells from weapon" );

neo/d3xp/gamesys/SysCvar.h

@@ -211,7 +211,6 @@ extern idCVar	pm_thirdPersonDeath;
 extern idCVar	pm_modelView;
 extern idCVar	pm_airTics;
 
-extern idCVar	g_showExtraShadows;
 extern idCVar	g_showHud;
 extern idCVar	g_showProjectilePct;
 extern idCVar	g_showBrass;

neo/framework/Common.cpp

@@ -1527,9 +1527,9 @@ void Com_ExecMachineSpec_f( const idCmdArgs &args ) {
 	OSX_GetCPUIdentification( cpuId, oldArch );
 	bool isFX5200 = vendorId == 0x10DE && ( deviceId & 0x0FF0 ) == 0x0320;
 	if ( oldArch && ( com_machineSpec.GetInteger() == 0 ) ) {
-		cvarSystem->SetCVarBool( "r_shadows", false, CVAR_ARCHIVE );
+		cvarSystem->SetCVarInteger( "r_shadows", 0, CVAR_ARCHIVE );
 	} else {
-		cvarSystem->SetCVarBool( "r_shadows", true, CVAR_ARCHIVE );
+		cvarSystem->SetCVarInteger( "r_shadows", 1, CVAR_ARCHIVE );
 	}
 #endif
 }

neo/framework/Dhewm3SettingsMenu.cpp

@@ -1711,7 +1711,14 @@ static CVarOption videoOptionsImmediately[] = {
 			AddCVarOptionTooltips( cvar );
 		}),
 	CVarOption( "r_skipNewAmbient", "Disable High Quality Special Effects", OT_BOOL ),
-	CVarOption( "r_shadows", "Enable Shadows", OT_BOOL ),
+	CVarOption( "r_shadows", []( idCVar& cvar ) {
+		// "Enable Shadows. 0 = No Shadows, 1 = Draw Shadows (default), 2 = Shadows + Extra Shadows"
+		int shadows = idMath::ClampInt( 0, 2, cvar.GetInteger() );
+		if ( ImGui::Combo( "Enable Shadows", &shadows, "No Shadows\0Draw Shadows\0Shadows + Extra Shadows\0" ) ) {
+			cvar.SetInteger( shadows );
+		}
+		AddTooltip( "r_shadows" );
+	} ),
 	CVarOption( "r_skipSpecular", "Disable Specular", OT_BOOL ),
 	CVarOption( "r_skipBump", "Disable Bump Maps", OT_BOOL ),
 

neo/game/Player.cpp

@@ -6462,7 +6462,7 @@ void idPlayer::Think( void ) {
 		}
 	}
 
-	if ( g_showExtraShadows.GetBool() ) {
+	if ( cvarSystem->GetCVarInteger( "r_shadows" ) == 2 ) {
 		renderEntity.suppressShadowInViewID	= 0;
 		if ( headRenderEnt ) {
 			headRenderEnt->suppressShadowInViewID = 0;
@@ -7970,7 +7970,7 @@ void idPlayer::ClientPredictionThink( void ) {
 		}
 	}
 
-	if ( g_showExtraShadows.GetBool() ) {
+	if ( cvarSystem->GetCVarInteger( "r_shadows" ) == 2 ) {
 		renderEntity.suppressShadowInViewID	= 0;
 		if ( headRenderEnt ) {
 			headRenderEnt->suppressShadowInViewID = 0;