SFX Sabers

merge of commits, including fixes. glow/core size cvars added.
JKEnhanced · Jan 8, 2017 · c64a167 · c64a167
1 parent 7d35f8c
commit c64a167
Show file tree

Hide file tree

Showing 4 changed files with 584 additions and 15 deletions.
diff --git a/code/cgame/cg_main.cpp b/code/cgame/cg_main.cpp
@@ -341,6 +341,10 @@ vmCvar_t	cg_fovViewmodelAdjust;
 
 vmCvar_t	cg_scaleVehicleSensitivity;
 
+vmCvar_t	cg_SFXSabers;
+vmCvar_t	cg_SFXSabersGlowSize;
+vmCvar_t	cg_SFXSabersCoreSize;
+
 typedef struct {
 	vmCvar_t	*vmCvar;
 	const char	*cvarName;
@@ -460,6 +464,9 @@ static cvarTable_t cvarTable[] = {
 
 	{ &cg_scaleVehicleSensitivity, "cg_scaleVehicleSensitivity", "1", CVAR_ARCHIVE },
 
+	{ &cg_SFXSabers,	"cg_SFXSabers",	"0", CVAR_ARCHIVE },
+	{ &cg_SFXSabersGlowSize,	"cg_SFXSabersGlowSize",	"1.0", CVAR_ARCHIVE },
+	{ &cg_SFXSabersCoreSize,	"cg_SFXSabersCoreSize",	"1.0", CVAR_ARCHIVE },
 
 
 };
@@ -1387,7 +1394,11 @@ static void CG_RegisterGraphics( void ) {
 	//gore decal shaders -rww
 	cgs.media.bdecal_burnmark1		= cgi_R_RegisterShader( "gfx/damage/burnmark1" );
 	cgs.media.bdecal_saberglowmark	= cgi_R_RegisterShader( "gfx/damage/saberglowmark" );
-
+
+	cgs.media.SaberTrailShader = cgi_R_RegisterShader( "SFX_Sabers/saber_trail" );
+	cgs.media.SaberBladeShader = cgi_R_RegisterShader( "SFX_Sabers/saber_blade" );
+	cgs.media.SaberEndShader = cgi_R_RegisterShader( "SFX_Sabers/saber_end" );
+
 	cg.loadLCARSStage = 5;
 	CG_LoadingString( "game media models" );
 

diff --git a/code/cgame/cg_media.h b/code/cgame/cg_media.h
@@ -259,6 +259,11 @@ typedef struct {
 	qhandle_t	forceShell;
 	qhandle_t	sightShell;
 	qhandle_t	drainShader;
+
+	//SFX Sabers
+	qhandle_t SaberTrailShader;
+	qhandle_t SaberBladeShader;
+	qhandle_t SaberEndShader;
 
 	// sounds
 	sfxHandle_t disintegrateSound;