update GWaterVolumetric to use new vertex format

meetric1 · Jul 30, 2024 · 157250c · 157250c
1 parent b34c8f4
commit 157250c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/binary/src/shaders/GWaterFinalpass.h b/binary/src/shaders/GWaterFinalpass.h
@@ -159,7 +159,7 @@ SHADER_DRAW {
 
 		// pShaderAPI->SetPixelShaderStateAmbientLightCube( PSREG_AMBIENT_CUBE, false );	// Force to black if not bAmbientLight
 
-		pShaderAPI->CommitPixelShaderLighting( PSREG_LIGHT_INFO_ARRAY );
+		pShaderAPI->CommitPixelShaderLighting(PSREG_LIGHT_INFO_ARRAY);
 
 		DECLARE_DYNAMIC_VERTEX_SHADER(GWaterFinalpass_vs30);
 		SET_DYNAMIC_VERTEX_SHADER_COMBO(NUM_LIGHTS, lightState.m_nNumLights);

diff --git a/binary/src/shaders/GWaterVolumetric.h b/binary/src/shaders/GWaterVolumetric.h
@@ -8,14 +8,15 @@ BEGIN_VS_SHADER(GWaterVolumetric, "gwater2 helper")
 // Shader parameters
 BEGIN_SHADER_PARAMS
 	SHADER_PARAM(ALPHA, SHADER_PARAM_TYPE_FLOAT, "0.025", "Amount of transparency")
+	SHADER_PARAM(BASETEXTURE, SHADER_PARAM_TYPE_TEXTURE, "lights/white", "Base texture")
 END_SHADER_PARAMS
 
 SHADER_INIT_PARAMS() {
 
 }
 
 SHADER_INIT{
-
+	LoadTexture(BASETEXTURE);
 }
 
 SHADER_FALLBACK{
@@ -46,6 +47,7 @@ SHADER_DRAW {
 
 		// Transparent things (alpha = 0 or alpha = 1)
 		pShaderShadow->EnableAlphaTest(IS_FLAG_SET(MATERIAL_VAR_ALPHATEST));
+		pShaderShadow->EnableTexture(SHADER_SAMPLER0, true);
 
 		DECLARE_STATIC_VERTEX_SHADER(GWaterVolumetric_vs30);
 		SET_STATIC_VERTEX_SHADER(GWaterVolumetric_vs30);
@@ -59,6 +61,7 @@ SHADER_DRAW {
 		const float alpha = params[ALPHA]->GetFloatValue();
 
 		pShaderAPI->SetPixelShaderConstant(0, &alpha);
+		BindTexture(SHADER_SAMPLER0, BASETEXTURE);
 
 		DECLARE_DYNAMIC_VERTEX_SHADER(GWaterVolumetric_vs30);
 		SET_DYNAMIC_VERTEX_SHADER(GWaterVolumetric_vs30);

diff --git a/materials/gwater2/bubble.vmt b/materials/gwater2/bubble.vmt
@@ -1,6 +1,5 @@
-"UnlitGeneric" {
+GWaterVolumetric {
 	$basetexture "gwater2/bubble"
 	$additive 1
 	$alpha 0.3
-	$basetexturetransform "center .5 .5 scale 0.15 0.15  rotate 0 translate 0 0"
 }
diff --git a/materials/gwater2/mist.vmt b/materials/gwater2/mist.vmt
@@ -1,6 +1,5 @@
-UnlitGeneric {
+GWaterVolumetric {
 	$basetexture "gwater2/splash"
 	$additive 1
 	$alpha 0.3
-	$basetexturetransform "center .5 .5 scale 1 1 rotate 0 translate 0 0"
 }
diff --git a/materials/gwater2/sphere.png b/materials/gwater2/sphere.png
diff --git a/materials/gwater2/sphere.vmt b/materials/gwater2/sphere.vmt
@@ -0,0 +1,4 @@
+"LightmappedGeneric"
+{
+	"$basetexture" "gwater2/sphere"
+}
diff --git a/materials/gwater2/sphere.vtf b/materials/gwater2/sphere.vtf
diff --git a/materials/gwater2/volumetric.vmt b/materials/gwater2/volumetric.vmt
@@ -1,4 +1,5 @@
 GWaterVolumetric {
+	$basetexture gwater2/sphere
 	$additive 1
 	$alpha 0.125
 	$translucent 1