cgame: Implement beam and corkscrew trails, add cg_beamTrail cvar to handle the number of beam segments, add shaders to test beam trails, use grappling hook trail as BFP beam trail, apply Quake3e patch for grappling hook and optimize trails code a bit

Author: LegendaryGuard

docs/bfp_cvars_task.md

@@ -9,6 +9,7 @@ For more, look in [cvar_bfp_list.txt](docs/cvar_bfp_list.txt)
 ## COMPLETED:
 
 - [x] ~~cg_superdeformed~~
+- [x] ~~cg_beamTrail~~
 - [x] ~~cg_kiTrail~~
 - [x] ~~cg_yrgolroxor~~
 - [x] ~~cg_thirdPersonHeight~~

source/cgame/cg_cvar.h

@@ -77,6 +77,7 @@ CG_CVAR( cg_explosionSmoke, "cg_explosionSmoke", "1", CVAR_ARCHIVE ) // BFP - Ex
 CG_CVAR( cg_lightExplosions, "cg_lightExplosions", "1", CVAR_ARCHIVE ) // BFP - Dynamic explosion lights
 CG_CVAR( cg_flytilt, "cg_flytilt", "1", CVAR_ARCHIVE ) // BFP - Fly tilt
 CG_CVAR( cg_kiTrail, "cg_kiTrail", "50", CVAR_ARCHIVE ) // BFP - Ki trail length
+CG_CVAR( cg_beamTrail, "cg_beamTrail", "50", CVAR_ARCHIVE ) // BFP - Beam trail length
 CG_CVAR( cg_playHitSound, "cg_playHitSound", "0", CVAR_ARCHIVE ) // BFP - Play hit sound
 CG_CVAR( cg_thirdPersonRange, "cg_thirdPersonRange", "110", CVAR_ARCHIVE ) // BFP
 CG_CVAR( cg_thirdPersonAngle, "cg_thirdPersonAngle", "0", CVAR_ARCHIVE ) // BFP

source/cgame/cg_ents.c

@@ -458,6 +458,8 @@ static void CG_Missile( centity_t *cent ) {
 	CG_AddRefEntityWithPowerups( ent, s1, TEAM_FREE );
 }
 
+// BFP - no hook
+#if 0
 /*
 ===============
 CG_Grapple
@@ -506,6 +508,7 @@ static void CG_Grapple( centity_t *cent ) {
 
 	trap_R_AddRefEntityToScene( &ent );
 }
+#endif
 
 /*
 ===============

source/cgame/cg_event.c

@@ -305,7 +305,7 @@ static void CG_Obituary( entityState_t *ent ) {
 		trap_Cvar_Set( "cg_lifedeaths", va( "%i", (int)( cg_lifedeaths.integer + 1 ) ) );
 	}
 	// BFP - Reset ki trails to avoid viewing other trails
-	CG_ResetKiTrail( target, vec3_origin );
+	CG_ResetTrail( 0, target, vec3_origin );
 }
 
 //==========================================================================
@@ -873,6 +873,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position, int entityNum ) {
 	case EV_MISSILE_HIT:
 		ByteToDir( es->eventParm, dir );
 		CG_MissileHitPlayer( es->weapon, position, dir, es->otherEntityNum );
+		CG_ResetTrail( 1, es->number, es->origin ); // BFP - Reset beam trail
 		break;
 
 	case EV_MISSILE_MISS:
@@ -903,6 +904,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position, int entityNum ) {
 					CG_SparksExplosion( position, dir );
 				}
 			}
+			CG_ResetTrail( 1, es->number, es->origin ); // BFP - Reset beam trail
 		}
 		break;
 
@@ -913,6 +915,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position, int entityNum ) {
 		CG_DebrisExplosion( position, dir );
 		// BFP - Spark particles explosion
 		CG_SparksExplosion( position, dir );
+		CG_ResetTrail( 1, es->number, es->origin ); // BFP - Reset beam trail
 		break;
 
 	// BFP - EV_MISSILE_DETONATE - used on ki grenade bounces and beams, 
@@ -922,6 +925,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position, int entityNum ) {
 		{
 			vec3_t	dirDetonate = {0, 0, 1}; // place the explosion position and size correctly
 			CG_MissileHitWall( es->weapon, 0, position, dirDetonate, IMPACTSOUND_DEFAULT );
+			CG_ResetTrail( 1, es->number, es->origin ); // BFP - Reset beam trail
 		}
 		break;
 

source/cgame/cg_local.h

@@ -144,6 +144,8 @@ typedef struct {
 	int				chargeSmokeTime;	// BFP - Charge smoke time
 	int				ultTierTransformTime;	// BFP - Ultimate tier transformation time
 
+	vec3_t			muzzleOrigin;	// BFP - Muzzle origin
+
 	// railgun trail spawning
 	vec3_t			railgunImpact;
 	qboolean		railgunFlash;
@@ -814,6 +816,11 @@ typedef struct {
 	qhandle_t	kiTrailBlueShader;
 	qhandle_t	kiTrailYellowShader;
 
+	// BFP - Ki attack beam and projectile shaders (for testing purposes)
+	qhandle_t	SSBSpiralShader;
+	qhandle_t	SSBBeamShader;
+	qhandle_t	PowerWaveBeamShader;
+
 	// scoreboard headers
 	qhandle_t	scoreboardName;
 	qhandle_t	scoreboardPing;
@@ -1273,6 +1280,7 @@ void CG_Bullet( vec3_t origin, int sourceEntityNum, vec3_t normal, qboolean fles
 
 void CG_RailTrail( clientInfo_t *ci, vec3_t start, vec3_t end );
 void CG_GrappleTrail( centity_t *ent, const weaponInfo_t *wi );
+void CG_BFPBeamTrail( centity_t *ent, const weaponInfo_t *wi ); // BFP - BFP Beam trail handling
 void CG_AddViewWeapon (playerState_t *ps);
 void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent, int team );
 void CG_DrawWeaponSelect( void );
@@ -1340,8 +1348,10 @@ void CG_ExplosionEffect( vec3_t origin, vec3_t dir );
 // cg_trails.c
 //
 void CG_InitTrails( void );
-void CG_ResetKiTrail( int entityNum, vec3_t origin );
+void CG_ResetTrail( int TRAIL_TYPE, int entityNum, vec3_t origin );
 void CG_KiTrail( int entityNum, vec3_t origin, qboolean remove, qhandle_t hShader );
+void CG_BeamTrail( int entityNum, vec3_t origin, vec3_t muzzleOrigin, qhandle_t hShader );
+void CG_CorkscrewTrail( int entityNum, vec3_t origin, vec3_t muzzleOrigin, qhandle_t beamShader, qhandle_t corkscrewShader );
 
 //
 // cg_snapshot.c

source/cgame/cg_main.c

@@ -682,6 +682,11 @@ static void CG_RegisterGraphics( void ) {
 	cgs.media.kiTrailRedShader = trap_R_RegisterShader( "powerups/redkitrail" );
 	cgs.media.kiTrailYellowShader = trap_R_RegisterShader( "powerups/yellowkitrail" );
 
+	// BFP - Ki attack beam and projectile shaders (for testing purposes)
+	cgs.media.PowerWaveBeamShader = trap_R_RegisterShader( "PowerWaveBeamShader");
+	cgs.media.SSBSpiralShader = trap_R_RegisterShader( "SSBSpiralShader");
+	cgs.media.SSBBeamShader = trap_R_RegisterShader( "SSBBeamShader");
+
 	memset( cg_items, 0, sizeof( cg_items ) );
 	memset( cg_weapons, 0, sizeof( cg_weapons ) );
 

source/cgame/cg_players.c

@@ -2557,7 +2557,7 @@ Handle aura animations, when idling it sets the aura vertical rotation, so the a
 */
 static void CG_RemoveKiTrails( centity_t *cent, int clientNum, vec3_t kiTrailOrigin, qhandle_t kiTrailShader, qboolean fastRemove ) { // BFP - Remove ki trails
 	if ( cg.time > cent->pe.kiTrailTime ) { // reset ki trail position avoid being zeroed
-		CG_ResetKiTrail( clientNum, kiTrailOrigin );
+		CG_ResetTrail( 0, clientNum, kiTrailOrigin );
 	} else { // ki trails keep running in that moment, but their segments are being removed
 		CG_KiTrail( clientNum, kiTrailOrigin, fastRemove, kiTrailShader );
 	}