From 2216894ccfbe464acd944a608deac1c368201a41 Mon Sep 17 00:00:00 2001 From: VReaperV Date: Wed, 7 Feb 2024 15:25:23 +0300 Subject: [PATCH 1/2] Add translucent option for weapons Adds a cg_drawGun 3 parameter that makes the first-person gun model translucent. Also adds cg_drawGun 4 that renders both translucent guns and claws. --- src/cgame/cg_main.cpp | 2 +- src/cgame/cg_weapons.cpp | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/cgame/cg_main.cpp b/src/cgame/cg_main.cpp index e06fcc18ed7..7d44056414f 100644 --- a/src/cgame/cg_main.cpp +++ b/src/cgame/cg_main.cpp @@ -69,7 +69,7 @@ Cvar::Cvar cg_noPlayerAnims("cg_noplayeranims", "disable player animations Cvar::Cvar cg_footsteps("cg_footsteps", "make footstep sounds", Cvar::CHEAT, true); Cvar::Cvar cg_addMarks("cg_marks", "enable marks (e.g. bullet holes)", Cvar::NONE, true); Cvar::Cvar cg_viewsize("cg_viewsize", "size of rectangle the world is drawn in", Cvar::NONE, 100); -Cvar::Range> cg_drawGun("cg_drawGun", "draw 1st-person weapon (1 = guns, 2 = guns & claws)", Cvar::NONE, 1, 0, 2); +Cvar::Range> cg_drawGun("cg_drawGun", "draw 1st-person weapon (1 = guns, 2 = guns & claws, 3 = translucent guns, 4 = translucent guns and claws)", Cvar::NONE, 1, 0, 4); Cvar::Cvar cg_gun_x("cg_gunX", "model debugging: gun x offset", Cvar::CHEAT, 0); Cvar::Cvar cg_gun_y("cg_gunY", "model debugging: gun y offset", Cvar::CHEAT, 0); Cvar::Cvar cg_gun_z("cg_gunZ", "model debugging: gun z offset", Cvar::CHEAT, 0); diff --git a/src/cgame/cg_weapons.cpp b/src/cgame/cg_weapons.cpp index 0e6d8cffefa..ae09d9f90e9 100644 --- a/src/cgame/cg_weapons.cpp +++ b/src/cgame/cg_weapons.cpp @@ -1414,6 +1414,12 @@ void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent CG_TransformSkeleton( &gun.skeleton, weapon->scale ); } + if ( cg_drawGun.Get() >= 3 && ps ) { + gun.shaderRGBA = Color::White; + gun.shaderRGBA.SetAlpha( 32 ); + gun.customShader = cgs.media.plainColorShader; + } + trap_R_AddRefEntityToScene( &gun ); if ( !ps ) @@ -1428,6 +1434,12 @@ void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent else { barrel.hModel = weapon->barrelModel; + + if ( cg_drawGun.Get() >= 3 ) { + barrel.shaderRGBA = Color::White; + barrel.shaderRGBA.SetAlpha( 32 ); + barrel.customShader = cgs.media.plainColorShader; + } } // add the spinning barrel @@ -1585,10 +1597,12 @@ void CG_AddViewWeapon( playerState_t *ps ) wi = &cg_weapons[ weapon ]; - /* cg_drawGun has 3 values: + /* cg_drawGun has 5 values: - 0 : draw no gun at all - 1 : draw gun for humans - - 2 : draw gun for humans and aliens */ + - 2 : draw gun for humans and aliens + - 3 : draw translucent gun for humans + - 4 : draw translucent gun for humans and aliens */ switch ( cg_drawGun.Get() ) { case 0: // none @@ -1608,6 +1622,12 @@ void CG_AddViewWeapon( playerState_t *ps ) drawGun = true; break; */ + + case 3: // humans only + if ( BG_Weapon( weapon )->team == TEAM_ALIENS ) { + drawGun = false; + } + break; } if ( !wi->registered ) From 01c717d425bcaf6b5e47ee347b76cdb60e5b193d Mon Sep 17 00:00:00 2001 From: VReaperV Date: Thu, 8 Feb 2024 04:05:41 +0300 Subject: [PATCH 2/2] Add translucent weapon options to settings --- pkg/unvanquished_src.dpkdir/ui/options_movements_cosmetic.rml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/unvanquished_src.dpkdir/ui/options_movements_cosmetic.rml b/pkg/unvanquished_src.dpkdir/ui/options_movements_cosmetic.rml index ad43665a8be..a2d4d72aa7e 100644 --- a/pkg/unvanquished_src.dpkdir/ui/options_movements_cosmetic.rml +++ b/pkg/unvanquished_src.dpkdir/ui/options_movements_cosmetic.rml @@ -38,6 +38,8 @@ + +

First-person weapons

Show gun, pincer, hand and mandible models in first-person.