From 11e1accdd1b8ee0325a1eb70d9dab7481ae8d386 Mon Sep 17 00:00:00 2001
From: NightFox <nightfox@dev.null>
Date: Fri, 8 Sep 2023 18:29:42 +0300
Subject: [PATCH] update materials

---
 valve/pbr/halflife.wad/GENERIC031B.png  |  3 +++
 valve/pbr/halflife.wad/halflife.wad.mat | 22 ++++++++++++++++------
 valve/pbr/maps/c0a0e.bsp/c0a0e.bsp.mat  | 13 +++++++++++++
 valve/pbr/maps/c1a0.bsp/c1a0.bsp.mat    |  5 +++--
 4 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 valve/pbr/halflife.wad/GENERIC031B.png

diff --git a/valve/pbr/halflife.wad/GENERIC031B.png b/valve/pbr/halflife.wad/GENERIC031B.png
new file mode 100644
index 0000000..05e2038
--- /dev/null
+++ b/valve/pbr/halflife.wad/GENERIC031B.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5cc55c068867e2ab008ac8c6f7d2e405799c2824735775ab316d8a9bad4fe0ee
+size 8161
diff --git a/valve/pbr/halflife.wad/halflife.wad.mat b/valve/pbr/halflife.wad/halflife.wad.mat
index 1ffc251..cc83514 100644
--- a/valve/pbr/halflife.wad/halflife.wad.mat
+++ b/valve/pbr/halflife.wad/halflife.wad.mat
@@ -1688,6 +1688,8 @@ include "-[~LIGHT]/-[~LIGHT].mat"
 //"normal_map" "C1A4_FAN_normal.png"
 //"metal_map" "C1A4_FAN_metal.png"
 //"roughness_map" "C1A4_FAN_roughness.png"
+"metalness" "0.7" // TODO: metal/roughness map
+"roughness" "0.3"
 }
 
 {
@@ -3419,6 +3421,8 @@ include "-[~LIGHT]/-[~LIGHT].mat"
 //"normal_map" "CA1X_CON_normal.png"
 //"metal_map" "CA1X_CON_metal.png"
 //"roughness_map" "CA1X_CON_roughness.png"
+"metalness" "0.5"
+"roughness" "0.4"
 }
 
 {
@@ -6177,6 +6181,7 @@ include "-[~LIGHT]/-[~LIGHT].mat"
 {
 "for" "GENERIC027" // FIXME: RENDERMODE!!!
 //"basecolor_map" "GENERIC027.png"
+//"base_color" "1 1 1 0.5"
 //"normal_map" "GENERIC027_normal.png"
 //"metal_map" "GENERIC027_metal.png"
 //"roughness_map" "GENERIC027_roughness.png"
@@ -6228,12 +6233,15 @@ include "-[~LIGHT]/-[~LIGHT].mat"
 
 {
 "for" "GENERIC031B"
-//"basecolor_map" "GENERIC031B.png"
+"basecolor_map" "GENERIC031B.png" // TODO: more seamless texture & upscale
+//"basecolor_map" "/colors/white.png"
+//"base_color" "0.5 0.5 0.5"
+//"base_color" "0.75 0.75 0.75"
 //"normal_map" "GENERIC031B_normal.png"
 //"metal_map" "GENERIC031B_metal.png"
 //"roughness_map" "GENERIC031B_roughness.png"
-"metalness" "1"
-"roughness" "0.5"
+"metalness" "0.6"
+"roughness" "0.45"
 }
 
 {
@@ -10567,11 +10575,12 @@ include "-[~LIGHT]/-[~LIGHT].mat"
 {
 "for" "ROCKETSTAGE1"
 //"basecolor_map" "ROCKETSTAGE1.png"
+//"basecolor_map" "/colors/white.png"
 //"base_color" "1.5 1.5 1.5"
 //"normal_map" "ROCKETSTAGE1_normal.png"
 //"metal_map" "ROCKETSTAGE1_metal.png"
 //"roughness_map" "ROCKETSTAGE1_roughness.png"
-"metalness" "1"
+"metalness" "0.3"
 "roughness" "0.4"
 }
 
@@ -12674,8 +12683,9 @@ include "-[~LIGHT]/-[~LIGHT].mat"
 "normal_map" "{GRATESTEP2_normal.png"
 //"metal_map" "{GRATESTEP2_metal.png"
 "roughness_map" "{GRATESTEP2_roughness.png"
-"metalness" "1"
-"roughness" "0.5"
+"metalness" "0.7"
+"roughness" "0.6"
+"normal_scale" "0.4"
 }
 
 {
diff --git a/valve/pbr/maps/c0a0e.bsp/c0a0e.bsp.mat b/valve/pbr/maps/c0a0e.bsp/c0a0e.bsp.mat
index 30231d2..afe6bdb 100644
--- a/valve/pbr/maps/c0a0e.bsp/c0a0e.bsp.mat
+++ b/valve/pbr/maps/c0a0e.bsp/c0a0e.bsp.mat
@@ -8,3 +8,16 @@
 "metalness" "1"
 "roughness" "0.6"
 }
+
+{
+"for" "LAB1_B4" // WARNING: generic material
+//"basecolor_map" "LAB1_B4.png" // TODO: need replace texture
+"basecolor_map" "/colors/white.png"
+"base_color" "0.6 0.6 0.6"
+//"normal_map" "LAB1_B4_normal.png"
+//"metal_map" "/colors/white.png"
+//"metal_map" "LAB1_B4_metal.png"
+//"roughness_map" "LAB1_B4_roughness.png"
+"metalness" "0.8"
+"roughness" "0.3"
+}
\ No newline at end of file
diff --git a/valve/pbr/maps/c1a0.bsp/c1a0.bsp.mat b/valve/pbr/maps/c1a0.bsp/c1a0.bsp.mat
index e10b02b..6fc1d85 100644
--- a/valve/pbr/maps/c1a0.bsp/c1a0.bsp.mat
+++ b/valve/pbr/maps/c1a0.bsp/c1a0.bsp.mat
@@ -1,8 +1,9 @@
 {
 "for" "LAB1_B4"
-//"basecolor_map" "LAB1_B4.png"
+//"basecolor_map" "LAB1_B4.png" // TODO: need replace texture
 "basecolor_map" "/colors/white.png"
-"base_color" "0.7 0.7 0.7"
+//"base_color" "0.7 0.7 0.7"
+"base_color" "0.6 0.6 0.6"
 //"normal_map" "LAB1_B4_normal.png"
 //"metal_map" "/colors/white.png"
 //"metal_map" "LAB1_B4_metal.png"