diff --git a/valve/pbr/halflife.wad/halflife.mat b/valve/pbr/halflife.wad/halflife.mat index cc83514..b395cb8 100644 --- a/valve/pbr/halflife.wad/halflife.mat +++ b/valve/pbr/halflife.wad/halflife.mat @@ -6551,7 +6551,19 @@ include "-[~LIGHT]/-[~LIGHT].mat" //"metal_map" "GENERIC108_metal.png" //"roughness_map" "GENERIC108_roughness.png" } - +{ +"for" "GENERIC108" +//"basecolor_map" "GENERIC108.png" +//"normal_map" "GENERIC108_normal.png" +//"metal_map" "GENERIC108_metal.png" +//"roughness_map" "GENERIC108_roughness.png" +// FIXME +"for_rendermode" "kRenderTransTexture" +"basecolor_map" "/colors/white.png" +"base_color" "1 1 1 0.5" +"roughness" "0.05" +"metalness" "0.8" +} { "for" "GENERIC108A" //"basecolor_map" "GENERIC108A.png" @@ -7207,6 +7219,12 @@ include "-[~LIGHT]/-[~LIGHT].mat" //"roughness_map" "GLASSBLUE1_roughness.png" //"metalness" "1" //"roughness" "0.1" +"for_rendermode" "kRenderTransTexture" +"basecolor_map" "/colors/white.png" +//"base_color" "2 2 2 1" +"base_color" "0.7 0.8 0.9 1" +"roughness" "0.01" +"metalness" "1" } { @@ -7231,6 +7249,13 @@ include "-[~LIGHT]/-[~LIGHT].mat" //"normal_map" "GLASS_BRIGHT_normal.png" //"metal_map" "GLASS_BRIGHT_metal.png" //"roughness_map" "GLASS_BRIGHT_roughness.png" +// FIXME +"for_rendermode" "kRenderTransTexture" +"basecolor_map" "/colors/white.png" +//"base_color" "2 2 2 1" +"base_color" "0.7 0.8 0.9 1" +"roughness" "0.01" +"metalness" "1" } { @@ -7247,6 +7272,13 @@ include "-[~LIGHT]/-[~LIGHT].mat" //"normal_map" "GLASS_MED_normal.png" //"metal_map" "GLASS_MED_metal.png" //"roughness_map" "GLASS_MED_roughness.png" +// FIXME +"for_rendermode" "kRenderTransTexture" +"basecolor_map" "/colors/white.png" +//"base_color" "1 1 1 0.5" +"base_color" "0.7 0.8 0.9 1" +"roughness" "0.01" +"metalness" "1" } { diff --git a/valve/pbr/maps/c1a0b.bsp/c1a0b.mat b/valve/pbr/maps/c1a0b.bsp/c1a0b.mat index 4d78435..8501e6a 100644 --- a/valve/pbr/maps/c1a0b.bsp/c1a0b.mat +++ b/valve/pbr/maps/c1a0b.bsp/c1a0b.mat @@ -1,4 +1,12 @@ // TODO: fix smooth normal { "for" "trrm_pan1" // reset material +} +{ +"for_rendermode" "kRenderTransTexture" +"for" "generic027" // TODO +"base_color" "2 2 2 0" +//"basecolor_map" "/colors/white.png" +"metalness" "0.5" +"roughness" "0.1" } \ No newline at end of file diff --git a/valve/pbr/maps/c1a0c.bsp/c1a0c.mat b/valve/pbr/maps/c1a0c.bsp/c1a0c.mat new file mode 100644 index 0000000..72c837c --- /dev/null +++ b/valve/pbr/maps/c1a0c.bsp/c1a0c.mat @@ -0,0 +1,7 @@ +{ +"for_rendermode" "kRenderTransTexture" +"for" "generic028" +"basecolor_map" "/colors/white.png" +"metalness" "0.8" +"roughness" "0.1" +} \ No newline at end of file diff --git a/valve/pbr/maps/c1a0d.bsp/c1a0d.mat b/valve/pbr/maps/c1a0d.bsp/c1a0d.mat index 7012a98..d22522c 100644 --- a/valve/pbr/maps/c1a0d.bsp/c1a0d.mat +++ b/valve/pbr/maps/c1a0d.bsp/c1a0d.mat @@ -1,15 +1,7 @@ -// Mirror hack { -"for" "mirror" +"for_rendermode" "kRenderTransTexture" +"for" "table2" "basecolor_map" "/colors/white.png" -"metal_map" "/colors/white.png" -"roughness_map" "/colors/black.png" -} - -// test map material patch -//{ -//"for" "c1a0_labflre" -//"basecolor_map" "/colors/white.png" -//"metal_map" "/colors/white.png" -//"roughness_map" "/colors/black.png" -//} +"metalness" "0.6" +"roughness" "0" +} \ No newline at end of file diff --git a/valve/pbr/maps/c1a3.bsp/c1a3.mat b/valve/pbr/maps/c1a3.bsp/c1a3.mat index e595487..22bbd24 100644 --- a/valve/pbr/maps/c1a3.bsp/c1a3.mat +++ b/valve/pbr/maps/c1a3.bsp/c1a3.mat @@ -1,9 +1,4 @@ { -"for" "generic028" // FIXME: is used for both the fan and the table -"metalness" "1" -"roughness" "0.1" -} -{ "for" "-0silo2_cor2" "metalness" "1" "roughness" "0.4" diff --git a/valve/pbr/materials.mat b/valve/pbr/materials.mat index 8bdcf51..670398e 100644 --- a/valve/pbr/materials.mat +++ b/valve/pbr/materials.mat @@ -1,2 +1,12 @@ include "debug/debug.mat" include "mirror.mat" + + +// generic materials (new) +{ +"new" "generic_metal1" +"basecolor_map" "/colors/white.png" +"base_color" "0.6 0.6 0.6" +"metalness" "1" +"roughness" "0.2" +} \ No newline at end of file diff --git a/valve/pbr/mirror.mat b/valve/pbr/mirror.mat index 39d1e64..dc0b15e 100644 --- a/valve/pbr/mirror.mat +++ b/valve/pbr/mirror.mat @@ -4,24 +4,31 @@ "for" "mirror" "new" "mirror" "basecolor_map" "/colors/white.png" -"metal_map" "/colors/white.png" -"roughness_map" "/colors/black.png" +"metalness" "1" +"roughness" "0" +} +{ +"for" "mirror_broken" // TODO: normal, displacement, metalness, roughness maps +"new" "mirror_broken" +"basecolor_map" "/colors/white.png" +"metalness" "1" +"roughness" "0" } { "for" "reflect" "basecolor_map" "/colors/white.png" -"metal_map" "/colors/white.png" -"roughness_map" "/colors/black.png" +"metalness" "1" +"roughness" "0" } { "for" "!reflect" "basecolor_map" "/colors/white.png" -"metal_map" "/colors/white.png" -"roughness_map" "/colors/black.png" +"metalness" "1" +"roughness" "0" } { "for" "reflect1" "basecolor_map" "/colors/white.png" -"metal_map" "/colors/white.png" -"roughness_map" "/colors/black.png" +"metalness" "1" +"roughness" "0" }