Skip to content

Commit b8f4ed8

Browse files
Aleph0xAleph0x
committed
Resolves https://github.com/Facepunch/sbox-issues/issues/9500 by adding specular to all tool materials.
1 parent 5c58563 commit b8f4ed8

34 files changed

+1297
-567
lines changed

‎game/core/materials/tools/fogvolume.vmat‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,43 @@
1-
"Layer0"
1+
// THIS FILE IS AUTO-GENERATED
2+
3+
Layer0
24
{
3-
"shader" "shaders/generic.shader_c"
4-
"F_TRANSLUCENT" "1"
5-
"g_vColorTint" "[1.000000 1.000000 1.000000 0.000000]"
6-
"TextureColor" "materials/tools/new/fogvolume_color.png"
7-
"g_bFogEnabled" "1"
8-
"g_flDirectionalLightmapMinZ" "0.050000"
9-
"g_flDirectionalLightmapStrength" "1.000000"
10-
"TextureNormal" "materials/default/default_normal.tga"
11-
"g_flBumpStrength" "1.000000"
12-
"g_flOpacityScale" "1.000000"
13-
"TextureTranslucency" "materials/tools/new/fogvolume_trans.png"
14-
"Attributes"
5+
shader "shaders/generic.shader"
6+
7+
//---- Specular ----
8+
F_SPECULAR 1
9+
10+
//---- Translucent ----
11+
F_TRANSLUCENT 1
12+
13+
//---- Color ----
14+
g_vColorTint "[1.000000 1.000000 1.000000 0.000000]"
15+
TextureColor "materials/tools/new/fogvolume_color.png"
16+
17+
//---- Fog ----
18+
g_bFogEnabled "1"
19+
20+
//---- Lighting ----
21+
g_vGlossinessRange "[0.000 1.000]"
22+
g_vMetalnessRange "[0.000 1.000]"
23+
TextureGlossiness "materials/default/default_gloss.tga"
24+
TextureMetalness "materials/default/default_metal.tga"
25+
TextureReflectance "materials/default/default_refl.tga"
26+
27+
//---- Normal ----
28+
TextureNormal "materials/default/default_normal.tga"
29+
30+
//---- Normal Map ----
31+
g_flBumpStrength "1.000"
32+
33+
//---- Translucent ----
34+
g_flOpacityScale "1.000"
35+
TextureTranslucency "materials/tools/new/fogvolume_trans.png"
36+
37+
Attributes
1538
{
16-
"mapbuilder.nodraw" "1"
17-
"mapbuilder.nonsolid" "1"
18-
"tools.toolsmaterial" "1"
39+
mapbuilder.nodraw "1"
40+
mapbuilder.nonsolid "1"
41+
tools.toolsmaterial "1"
1942
}
20-
}
43+
}

‎game/core/materials/tools/skyvisblocker.vmat‎

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,38 @@
1-
"Layer0"
1+
// THIS FILE IS AUTO-GENERATED
2+
3+
Layer0
24
{
3-
"shader" "shaders/generic.shader_c"
4-
"g_vColorTint" "[1.000000 1.000000 1.000000 0.000000]"
5-
"TextureColor" "materials/tools/new/skyvisblocker_color.png"
6-
"g_bFogEnabled" "1"
7-
"g_flDirectionalLightmapMinZ" "0.050000"
8-
"g_flDirectionalLightmapStrength" "1.000000"
9-
"TextureNormal" "materials/default/default_normal.tga"
10-
"g_flBumpStrength" "1.000000"
11-
"Attributes"
5+
shader "shaders/generic.shader"
6+
7+
//---- Specular ----
8+
F_SPECULAR 1
9+
10+
//---- Color ----
11+
g_vColorTint "[1.000000 1.000000 1.000000 0.000000]"
12+
TextureColor "materials/tools/new/skyvisblocker_color.png"
13+
14+
//---- Fog ----
15+
g_bFogEnabled "1"
16+
17+
//---- Lighting ----
18+
g_vGlossinessRange "[0.000 1.000]"
19+
g_vMetalnessRange "[0.000 1.000]"
20+
TextureGlossiness "materials/default/default_gloss.tga"
21+
TextureMetalness "materials/default/default_metal.tga"
22+
TextureReflectance "materials/default/default_refl.tga"
23+
24+
//---- Normal ----
25+
TextureNormal "materials/default/default_normal.tga"
26+
27+
//---- Normal Map ----
28+
g_flBumpStrength "1.000"
29+
30+
Attributes
1231
{
13-
"mapbuilder.visblocker" "1"
14-
"mapbuilder.nodraw" "1"
15-
"mapbuilder.tags" "sky"
16-
"tools.toolsmaterial" "1"
17-
"mapbuilder.sky" "1"
32+
mapbuilder.visblocker "1"
33+
mapbuilder.nodraw "1"
34+
mapbuilder.tags "sky"
35+
tools.toolsmaterial "1"
36+
mapbuilder.sky "1"
1837
}
19-
}
38+
}

‎game/core/materials/tools/tools_imageplane.vmat‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
"Layer0"
1+
// THIS FILE IS AUTO-GENERATED
2+
3+
Layer0
24
{
3-
"shader" "shaders/tools_textured_unlit.shader_c"
4-
"F_TRANSLUCENT" "1"
5-
"F_UNLIT" "1"
6-
"g_flOpacityScale" "1.000000"
7-
"Attributes"
5+
shader "shaders/tools_textured_unlit.shader"
6+
7+
//---- Translucent ----
8+
F_TRANSLUCENT 1
9+
10+
Attributes
811
{
9-
"mapbuilder.nodraw" "1"
10-
"mapbuilder.nonsolid" "1"
11-
"tools.toolsmaterial" "1"
12+
mapbuilder.nodraw "1"
13+
mapbuilder.nonsolid "1"
14+
tools.toolsmaterial "1"
1215
}
13-
}
16+
}

‎game/core/materials/tools/tools_spawn_volume.vmat‎

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,57 @@
1-
"Layer0"
1+
// THIS FILE IS AUTO-GENERATED
2+
3+
Layer0
24
{
3-
"shader" "shaders/generic.shader_c"
4-
"F_SELF_ILLUM" "1"
5-
"F_TRANSLUCENT" "1"
6-
"g_vColorTint" "[1.000000 1.000000 1.000000 0.000000]"
7-
"TextureColor" "materials/tools/new/spawnvolume_color.png"
8-
"g_bFogEnabled" "1"
9-
"g_flDirectionalLightmapMinZ" "0.050000"
10-
"g_flDirectionalLightmapStrength" "1.000000"
11-
"TextureNormal" "materials/default/default_normal.tga"
12-
"g_flBumpStrength" "1.000000"
13-
"g_flSelfIllumScale" "1.000000"
14-
"g_vSelfIllumTint" "[1.000000 1.000000 1.000000 0.000000]"
15-
"TextureSelfIllumMask" "[1.000000 1.000000 1.000000 0.000000]"
16-
"g_flOpacityScale" "0.462000"
17-
"TextureTranslucency" "materials/tools/new/spawnvolume_trans.png"
18-
"Attributes"
5+
shader "shaders/generic.shader"
6+
7+
//---- Self Illum ----
8+
F_SELF_ILLUM 1
9+
10+
//---- Specular ----
11+
F_SPECULAR 1
12+
13+
//---- Translucent ----
14+
F_TRANSLUCENT 1
15+
16+
//---- Color ----
17+
g_vColorTint "[1.000000 1.000000 1.000000 0.000000]"
18+
TextureColor "materials/tools/new/spawnvolume_color.png"
19+
20+
//---- Fog ----
21+
g_bFogEnabled "1"
22+
23+
//---- Lighting ----
24+
g_vGlossinessRange "[0.000 1.000]"
25+
g_vMetalnessRange "[0.000 1.000]"
26+
TextureGlossiness "materials/default/default_gloss.tga"
27+
TextureMetalness "materials/default/default_metal.tga"
28+
TextureReflectance "materials/default/default_refl.tga"
29+
30+
//---- Normal ----
31+
TextureNormal "materials/default/default_normal.tga"
32+
33+
//---- Normal Map ----
34+
g_flBumpStrength "1.000"
35+
36+
//---- Self Illum ----
37+
g_flSelfIllumScale "1.000"
38+
g_vSelfIllumTint "[1.000000 1.000000 1.000000 0.000000]"
39+
TextureSelfIllumMask "[1.000000 1.000000 1.000000 0.000000]"
40+
41+
//---- Translucent ----
42+
g_flOpacityScale "0.462"
43+
TextureTranslucency "materials/tools/new/spawnvolume_trans.png"
44+
45+
Attributes
1946
{
20-
"mapbuilder.nodraw" "1"
21-
"mapbuilder.nonsolid" "1"
22-
"tools.toolsmaterial" "1"
47+
mapbuilder.nodraw "1"
48+
mapbuilder.nonsolid "1"
49+
tools.toolsmaterial "1"
2350
}
24-
"SystemAttributes"
51+
52+
SystemAttributes
2553
{
26-
"WorldMappingWidth" "256"
27-
"WorldMappingHeight" "256"
54+
WorldMappingWidth "256"
55+
WorldMappingHeight "256"
2856
}
29-
}
57+
}

‎game/core/materials/tools/toolsblock_los.vmat‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,43 @@
1-
"Layer0"
1+
// THIS FILE IS AUTO-GENERATED
2+
3+
Layer0
24
{
3-
"shader" "shaders/generic.shader_c"
4-
"F_TRANSLUCENT" "1"
5-
"g_vColorTint" "[1.000000 1.000000 1.000000 0.000000]"
6-
"TextureColor" "materials/tools/new/blocklos_color.png"
7-
"g_bFogEnabled" "1"
8-
"g_flDirectionalLightmapMinZ" "0.050000"
9-
"g_flDirectionalLightmapStrength" "1.000000"
10-
"TextureNormal" "materials/default/default_normal.tga"
11-
"g_flBumpStrength" "1.000000"
12-
"g_flOpacityScale" "1.000000"
13-
"TextureTranslucency" "materials/tools/new/blocklos_trans.png"
14-
"Attributes"
5+
shader "shaders/generic.shader"
6+
7+
//---- Specular ----
8+
F_SPECULAR 1
9+
10+
//---- Translucent ----
11+
F_TRANSLUCENT 1
12+
13+
//---- Color ----
14+
g_vColorTint "[1.000000 1.000000 1.000000 0.000000]"
15+
TextureColor "materials/tools/new/blocklos_color.png"
16+
17+
//---- Fog ----
18+
g_bFogEnabled "1"
19+
20+
//---- Lighting ----
21+
g_vGlossinessRange "[0.000 1.000]"
22+
g_vMetalnessRange "[0.000 1.000]"
23+
TextureGlossiness "materials/default/default_gloss.tga"
24+
TextureMetalness "materials/default/default_metal.tga"
25+
TextureReflectance "materials/default/default_refl.tga"
26+
27+
//---- Normal ----
28+
TextureNormal "materials/default/default_normal.tga"
29+
30+
//---- Normal Map ----
31+
g_flBumpStrength "1.000"
32+
33+
//---- Translucent ----
34+
g_flOpacityScale "1.000"
35+
TextureTranslucency "materials/tools/new/blocklos_trans.png"
36+
37+
Attributes
1538
{
16-
"mapbuilder.nodraw" "1"
17-
"tools.toolsmaterial" "1"
18-
"mapbuilder.tags" "blocklos"
39+
mapbuilder.nodraw "1"
40+
tools.toolsmaterial "1"
41+
mapbuilder.tags "blocklos"
1942
}
20-
}
43+
}

‎game/core/materials/tools/toolsblockbullets.vmat‎

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,42 @@
1-
"Layer0"
1+
// THIS FILE IS AUTO-GENERATED
2+
3+
Layer0
24
{
3-
"shader" "shaders/generic.shader_c"
4-
"F_TRANSLUCENT" "1"
5-
"g_vColorTint" "[1.000000 1.000000 1.000000 0.000000]"
6-
"TextureColor" "materials/tools/new/blockbullets_color.png"
7-
"g_bFogEnabled" "1"
8-
"g_flDirectionalLightmapMinZ" "0.050000"
9-
"g_flDirectionalLightmapStrength" "1.000000"
10-
"TextureNormal" "materials/default/default_normal.tga"
11-
"g_flBumpStrength" "1.000000"
12-
"g_flOpacityScale" "1.000000"
13-
"TextureTranslucency" "materials/tools/new/blockbullets_trans.png"
14-
"Attributes"
5+
shader "shaders/generic.shader"
6+
7+
//---- Specular ----
8+
F_SPECULAR 1
9+
10+
//---- Translucent ----
11+
F_TRANSLUCENT 1
12+
13+
//---- Color ----
14+
g_vColorTint "[1.000000 1.000000 1.000000 0.000000]"
15+
TextureColor "materials/tools/new/blockbullets_color.png"
16+
17+
//---- Fog ----
18+
g_bFogEnabled "1"
19+
20+
//---- Lighting ----
21+
g_vGlossinessRange "[0.000 1.000]"
22+
g_vMetalnessRange "[0.000 1.000]"
23+
TextureGlossiness "materials/default/default_gloss.tga"
24+
TextureMetalness "materials/default/default_metal.tga"
25+
TextureReflectance "materials/default/default_refl.tga"
26+
27+
//---- Normal ----
28+
TextureNormal "materials/default/default_normal.tga"
29+
30+
//---- Normal Map ----
31+
g_flBumpStrength "1.000"
32+
33+
//---- Translucent ----
34+
g_flOpacityScale "1.000"
35+
TextureTranslucency "materials/tools/new/blockbullets_trans.png"
36+
37+
Attributes
1538
{
16-
"mapbuilder.nodraw" "1"
17-
"tools.toolsmaterial" "1"
39+
mapbuilder.nodraw "1"
40+
tools.toolsmaterial "1"
1841
}
19-
}
42+
}

0 commit comments

Comments
 (0)