diff --git a/valve/pbr/debug/colors/000.png b/valve/pbr/colors/000.png similarity index 100% rename from valve/pbr/debug/colors/000.png rename to valve/pbr/colors/000.png diff --git a/valve/pbr/debug/colors/111.png b/valve/pbr/colors/111.png similarity index 100% rename from valve/pbr/debug/colors/111.png rename to valve/pbr/colors/111.png diff --git a/valve/pbr/debug/colors/151515.png b/valve/pbr/colors/151515.png similarity index 100% rename from valve/pbr/debug/colors/151515.png rename to valve/pbr/colors/151515.png diff --git a/valve/pbr/debug/colors/222.png b/valve/pbr/colors/222.png similarity index 100% rename from valve/pbr/debug/colors/222.png rename to valve/pbr/colors/222.png diff --git a/valve/pbr/debug/colors/333.png b/valve/pbr/colors/333.png similarity index 100% rename from valve/pbr/debug/colors/333.png rename to valve/pbr/colors/333.png diff --git a/valve/pbr/debug/colors/444.png b/valve/pbr/colors/444.png similarity index 100% rename from valve/pbr/debug/colors/444.png rename to valve/pbr/colors/444.png diff --git a/valve/pbr/debug/colors/555.png b/valve/pbr/colors/555.png similarity index 100% rename from valve/pbr/debug/colors/555.png rename to valve/pbr/colors/555.png diff --git a/valve/pbr/debug/colors/666.png b/valve/pbr/colors/666.png similarity index 100% rename from valve/pbr/debug/colors/666.png rename to valve/pbr/colors/666.png diff --git a/valve/pbr/debug/colors/777.png b/valve/pbr/colors/777.png similarity index 100% rename from valve/pbr/debug/colors/777.png rename to valve/pbr/colors/777.png diff --git a/valve/pbr/debug/colors/888.png b/valve/pbr/colors/888.png similarity index 100% rename from valve/pbr/debug/colors/888.png rename to valve/pbr/colors/888.png diff --git a/valve/pbr/debug/colors/999.png b/valve/pbr/colors/999.png similarity index 100% rename from valve/pbr/debug/colors/999.png rename to valve/pbr/colors/999.png diff --git a/valve/pbr/debug/colors/aaa.png b/valve/pbr/colors/aaa.png similarity index 100% rename from valve/pbr/debug/colors/aaa.png rename to valve/pbr/colors/aaa.png diff --git a/valve/pbr/debug/colors/bbb.png b/valve/pbr/colors/bbb.png similarity index 100% rename from valve/pbr/debug/colors/bbb.png rename to valve/pbr/colors/bbb.png diff --git a/valve/pbr/debug/colors/black.png b/valve/pbr/colors/black.png similarity index 100% rename from valve/pbr/debug/colors/black.png rename to valve/pbr/colors/black.png diff --git a/valve/pbr/debug/colors/brass.png b/valve/pbr/colors/brass.png similarity index 100% rename from valve/pbr/debug/colors/brass.png rename to valve/pbr/colors/brass.png diff --git a/valve/pbr/debug/colors/ccc.png b/valve/pbr/colors/ccc.png similarity index 100% rename from valve/pbr/debug/colors/ccc.png rename to valve/pbr/colors/ccc.png diff --git a/valve/pbr/debug/colors/copper.png b/valve/pbr/colors/copper.png similarity index 100% rename from valve/pbr/debug/colors/copper.png rename to valve/pbr/colors/copper.png diff --git a/valve/pbr/debug/colors/copper_hack.png b/valve/pbr/colors/copper_hack.png similarity index 100% rename from valve/pbr/debug/colors/copper_hack.png rename to valve/pbr/colors/copper_hack.png diff --git a/valve/pbr/debug/colors/copper_hack2.png b/valve/pbr/colors/copper_hack2.png similarity index 100% rename from valve/pbr/debug/colors/copper_hack2.png rename to valve/pbr/colors/copper_hack2.png diff --git a/valve/pbr/debug/colors/ddd.png b/valve/pbr/colors/ddd.png similarity index 100% rename from valve/pbr/debug/colors/ddd.png rename to valve/pbr/colors/ddd.png diff --git a/valve/pbr/debug/colors/eee.png b/valve/pbr/colors/eee.png similarity index 100% rename from valve/pbr/debug/colors/eee.png rename to valve/pbr/colors/eee.png diff --git a/valve/pbr/debug/colors/fff.png b/valve/pbr/colors/fff.png similarity index 100% rename from valve/pbr/debug/colors/fff.png rename to valve/pbr/colors/fff.png diff --git a/valve/pbr/debug/colors/gold.png b/valve/pbr/colors/gold.png similarity index 100% rename from valve/pbr/debug/colors/gold.png rename to valve/pbr/colors/gold.png diff --git a/valve/pbr/debug/colors/gray.png b/valve/pbr/colors/gray.png similarity index 100% rename from valve/pbr/debug/colors/gray.png rename to valve/pbr/colors/gray.png diff --git a/valve/pbr/debug/colors/iron.png b/valve/pbr/colors/iron.png similarity index 100% rename from valve/pbr/debug/colors/iron.png rename to valve/pbr/colors/iron.png diff --git a/valve/pbr/debug/colors/mirror.png b/valve/pbr/colors/mirror.png similarity index 100% rename from valve/pbr/debug/colors/mirror.png rename to valve/pbr/colors/mirror.png diff --git a/valve/pbr/debug/colors/white.png b/valve/pbr/colors/white.png similarity index 100% rename from valve/pbr/debug/colors/white.png rename to valve/pbr/colors/white.png diff --git a/valve/pbr/debug/debug.mat b/valve/pbr/debug/debug.mat index 7723bc3..2cb76bd 100644 --- a/valve/pbr/debug/debug.mat +++ b/valve/pbr/debug/debug.mat @@ -10,33 +10,33 @@ } { "for" "debug_mat_n" -"basecolor_map" "colors/white.png" +"basecolor_map" "/colors/white.png" "normal_map" "debug_normal.png" //"normal_map" "debug_normal_16bit.png" -"metal_map" "colors/white.png" -"roughness_map" "colors/black.png" +"metal_map" "/colors/white.png" +"roughness_map" "/colors/black.png" } { "for" "debug_normal1" -"basecolor_map" "colors/gray.png" +"basecolor_map" "/colors/gray.png" //"normal_map" "debug_circle_normal1.png" //"normal_map" "debug_circle_normal2.png" //"normal_map" "debug_circle_normal3.png" "normal_map" "debug_circle_normal3_1.tga" -"metal_map" "colors/black.png" -"roughness_map" "colors/white.png" +"metal_map" "/colors/black.png" +"roughness_map" "/colors/white.png" } { "for" "debug_c2a3_gar3" //"basecolor_map" "debug_c2a3_gar3.png" //"normal_map" "debug_c2a3_gar3_normal.png" -//"metal_map" "colors/black.png" +//"metal_map" "/colors/black.png" //"roughness_map" "debug_c2a3_gar3_roughness.png" // standard c2a3_gar3 "basecolor_map" "/halflife.wad/c2a3_gar3.png" "normal_map" "/halflife.wad/c2a3_gar3_normal_512.png" "normal_map" "/halflife.wad/c2a3_gar3_normal.png" -"metal_map" "colors/black.png" +"metal_map" "/colors/black.png" "roughness_map" "/halflife.wad/c2a3_gar3_roughness_512.png" "roughness_map" "/halflife.wad/c2a3_gar3_roughness.png" } @@ -77,6 +77,6 @@ //{ //"for" "debug_512x512_c" -//"basecolor_map" "colors/gray.png" +//"basecolor_map" "/colors/gray.png" //"base_color" "0.7 0.7 0.7" //} diff --git a/valve/pbr/mirror.mat b/valve/pbr/mirror.mat index e28bec5..b39cc86 100644 --- a/valve/pbr/mirror.mat +++ b/valve/pbr/mirror.mat @@ -2,32 +2,32 @@ // Mirrors for patch and mods { "for" "mirror" -"basecolor_map" "/debug/colors/white.png" -"metal_map" "/debug/colors/white.png" -"roughness_map" "/debug/colors/black.png" +"basecolor_map" "/colors/white.png" +"metal_map" "/colors/white.png" +"roughness_map" "/colors/black.png" } { "for" "reflect" -"basecolor_map" "/debug/colors/white.png" -"metal_map" "/debug/colors/white.png" -"roughness_map" "/debug/colors/black.png" +"basecolor_map" "/colors/white.png" +"metal_map" "/colors/white.png" +"roughness_map" "/colors/black.png" } { "for" "!reflect" -"basecolor_map" "/debug/colors/white.png" -"metal_map" "/debug/colors/white.png" -"roughness_map" "/debug/colors/black.png" +"basecolor_map" "/colors/white.png" +"metal_map" "/colors/white.png" +"roughness_map" "/colors/black.png" } { "for" "reflect1" -"basecolor_map" "/debug/colors/white.png" -"metal_map" "/debug/colors/white.png" -"roughness_map" "/debug/colors/black.png" +"basecolor_map" "/colors/white.png" +"metal_map" "/colors/white.png" +"roughness_map" "/colors/black.png" } // MIRROR HACK (temporal workaround) { -"for" "pbr/debug/colors/white.png" +"for" "pbr/colors/white.png" "metalness" "1" "roughness" "0" } \ No newline at end of file diff --git a/valve/pbr/models/v_357.mdl/v_357.mdl.mat b/valve/pbr/models/v_357.mdl/v_357.mdl.mat index fb1ccdd..612cce7 100644 --- a/valve/pbr/models/v_357.mdl/v_357.mdl.mat +++ b/valve/pbr/models/v_357.mdl/v_357.mdl.mat @@ -2,7 +2,7 @@ { "for" "#models/v_357/bluesteelchrome.mdl" //"basecolor_map" "bluesteelchrome.png" -"basecolor_map" "/debug/colors/iron.png" +"basecolor_map" "/colors/iron.png" //"base_color" "1.2 1.2 1.2" "base_color" "0.8 0.8 0.8" //"normal_map" "bluesteelchrome_normal.png" @@ -16,7 +16,7 @@ { "for" "#models/v_357/bulletCHROME.mdl" //"basecolor_map" "bulletCHROME.png" -"basecolor_map" "/debug/colors/copper_hack.png" +"basecolor_map" "/colors/copper_hack.png" //"normal_map" "bulletCHROME_normal.png" //"metal_map" "bulletCHROME_metal.png" //"roughness_map" "bulletCHROME_roughness.png" diff --git a/valve/pbr/models/v_9mmar.mdl/v_9mmar.mdl.mat b/valve/pbr/models/v_9mmar.mdl/v_9mmar.mdl.mat index cc357a1..495d33a 100644 --- a/valve/pbr/models/v_9mmar.mdl/v_9mmar.mdl.mat +++ b/valve/pbr/models/v_9mmar.mdl/v_9mmar.mdl.mat @@ -65,7 +65,7 @@ { "for" "#models/v_9mmar/HK_chrome.mdl" //"basecolor_map" "HK_chrome.png" -"basecolor_map" "/debug/colors/gray.png" +"basecolor_map" "/colors/gray.png" "base_color" "0.5 0.5 0.5" //"normal_map" "HK_chrome_normal.png" //"metal_map" "HK_chrome_metal.png" @@ -109,7 +109,7 @@ { "for" "#models/v_9mmar/sighttop.mdl" //"basecolor_map" "sighttop.png" -"basecolor_map" "/debug/colors/gray.png" +"basecolor_map" "/colors/gray.png" "base_color" "0.5 0.5 0.5" //"normal_map" "sighttop_normal.png" //"metal_map" "sighttop_metal.png" diff --git a/valve/pbr/models/v_9mmhandgun.mdl/v_9mmhandgun.mdl.mat b/valve/pbr/models/v_9mmhandgun.mdl/v_9mmhandgun.mdl.mat index 155ddcd..b5d8877 100644 --- a/valve/pbr/models/v_9mmhandgun.mdl/v_9mmhandgun.mdl.mat +++ b/valve/pbr/models/v_9mmhandgun.mdl/v_9mmhandgun.mdl.mat @@ -13,7 +13,7 @@ { "for" "#models/v_9mmhandgun/bulletCHROME.mdl" //"basecolor_map" "bulletCHROME.png" -"basecolor_map" "/debug/colors/copper_hack.png" +"basecolor_map" "/colors/copper_hack.png" //"normal_map" "bulletCHROME_normal.png" //"metal_map" "bulletCHROME_metal.png" //"roughness_map" "bulletCHROME_roughness.png" @@ -24,7 +24,7 @@ { "for" "#models/v_9mmhandgun/chrome.mdl" //"basecolor_map" "chrome.png" -"basecolor_map" "/debug/colors/white.png" +"basecolor_map" "/colors/white.png" //"normal_map" "chrome_normal.png" //"metal_map" "chrome_metal.png" //"roughness_map" "chrome_roughness.png" diff --git a/valve/pbr/models/v_crowbar.mdl/v_crowbar.mdl.mat b/valve/pbr/models/v_crowbar.mdl/v_crowbar.mdl.mat index fe5ca44..9a91cb4 100644 --- a/valve/pbr/models/v_crowbar.mdl/v_crowbar.mdl.mat +++ b/valve/pbr/models/v_crowbar.mdl/v_crowbar.mdl.mat @@ -2,7 +2,7 @@ { "for" "#models/v_crowbar/chrome.mdl" //"basecolor_map" "chrome.png" -"basecolor_map" "/debug/colors/white.png" +"basecolor_map" "/colors/white.png" "base_color" "0.5 0.5 0.5" //"normal_map" "chrome_normal.png" //"metal_map" "chrome_metal.png" @@ -15,7 +15,7 @@ { "for" "#models/v_crowbar/chrome_red.mdl" //"basecolor_map" "chrome_red.png" -"basecolor_map" "/debug/colors/white.png" +"basecolor_map" "/colors/white.png" "base_color" "0.6 0.0 0.0" //"base_color" "0.75 0.0 0.0" //"normal_map" "chrome_red_normal.png" diff --git a/valve/pbr/models/v_egon.mdl/v_egon.mdl.mat b/valve/pbr/models/v_egon.mdl/v_egon.mdl.mat index 2ad4744..2668114 100644 --- a/valve/pbr/models/v_egon.mdl/v_egon.mdl.mat +++ b/valve/pbr/models/v_egon.mdl/v_egon.mdl.mat @@ -2,7 +2,7 @@ { "for" "#models/v_egon/blueChrome.mdl" //"basecolor_map" "blueChrome.png" -"basecolor_map" "/debug/colors/iron.png" +"basecolor_map" "/colors/iron.png" "base_color" "0.5 0.5 0.5" //"normal_map" "blueChrome_normal.png" //"metal_map" "blueChrome_metal.png" @@ -85,7 +85,7 @@ { "for" "#models/v_egon/egonchrome2.mdl" //"basecolor_map" "egonchrome2.png" -"basecolor_map" "/debug/colors/gold.png" +"basecolor_map" "/colors/gold.png" "base_color" "1.3 1.0 1.0" //"normal_map" "egonchrome2_normal.png" //"metal_map" "egonchrome2_metal.png" diff --git a/valve/pbr/models/v_gauss.mdl/v_gauss.mdl.mat b/valve/pbr/models/v_gauss.mdl/v_gauss.mdl.mat index 345aa9f..8fcee00 100644 --- a/valve/pbr/models/v_gauss.mdl/v_gauss.mdl.mat +++ b/valve/pbr/models/v_gauss.mdl/v_gauss.mdl.mat @@ -2,7 +2,7 @@ { "for" "#models/v_gauss/barrelCHROME.mdl" //"basecolor_map" "barrelCHROME.png" -"basecolor_map" "/debug/colors/copper_hack.png" +"basecolor_map" "/colors/copper_hack.png" "base_color" "1.0 0.5 0.5" //"normal_map" "barrelCHROME_normal.png" //"metal_map" "barrelCHROME_metal.png" @@ -176,7 +176,7 @@ { "for" "#models/v_gauss/wire_chrome.mdl" //"basecolor_map" "wire_chrome.png" -"basecolor_map" "/debug/colors/iron.png" +"basecolor_map" "/colors/iron.png" //"base_color" "0.7 0.5 0.5" //"normal_map" "wire_chrome_normal.png" //"metal_map" "wire_chrome_metal.png" diff --git a/valve/pbr/models/v_grenade.mdl/v_grenade.mdl.mat b/valve/pbr/models/v_grenade.mdl/v_grenade.mdl.mat index 7543207..dc0c39c 100644 --- a/valve/pbr/models/v_grenade.mdl/v_grenade.mdl.mat +++ b/valve/pbr/models/v_grenade.mdl/v_grenade.mdl.mat @@ -26,7 +26,7 @@ { "for" "#models/v_grenade/grenCHROME.mdl" //"basecolor_map" "grenCHROME.png" -"basecolor_map" "/debug/colors/white.png" +"basecolor_map" "/colors/white.png" "base_color" "0.5 0.5 0.5" //"normal_map" "grenCHROME_normal.png" //"metal_map" "grenCHROME_metal.png" diff --git a/valve/pbr/models/v_hgun.mdl/v_hgun.mdl.mat b/valve/pbr/models/v_hgun.mdl/v_hgun.mdl.mat index a4a0f36..b75d475 100644 --- a/valve/pbr/models/v_hgun.mdl/v_hgun.mdl.mat +++ b/valve/pbr/models/v_hgun.mdl/v_hgun.mdl.mat @@ -5,7 +5,7 @@ "normal_map" "HGUN_Back1_normal.png" "metal_map" "HGUN_Back1_metal.png" //"roughness_map" "HGUN_Back1_roughness.png" -"roughness_map" "/debug/colors/999.png" +"roughness_map" "/colors/999.png" } { @@ -22,7 +22,7 @@ "normal_map" "HGUN_Cheek1_normal.png" "metal_map" "HGUN_Cheek1_metal.png" //"roughness_map" "HGUN_Cheek1_roughness.png" -"roughness_map" "/debug/colors/999.png" +"roughness_map" "/colors/999.png" } { @@ -31,5 +31,5 @@ "normal_map" "HGUN_Horn1_normal.png" "metal_map" "HGUN_Horn1_metal.png" //"roughness_map" "HGUN_Horn1_roughness.png" -"roughness_map" "/debug/colors/999.png" +"roughness_map" "/colors/999.png" } diff --git a/valve/pbr/models/v_shotgun.mdl/v_shotgun.mdl.mat b/valve/pbr/models/v_shotgun.mdl/v_shotgun.mdl.mat index a6493a4..7353401 100644 --- a/valve/pbr/models/v_shotgun.mdl/v_shotgun.mdl.mat +++ b/valve/pbr/models/v_shotgun.mdl/v_shotgun.mdl.mat @@ -13,7 +13,7 @@ { "for" "#models/v_shotgun/barrel_chrome.mdl" //"basecolor_map" "barrel_chrome.png" -"basecolor_map" "/debug/colors/white.png" +"basecolor_map" "/colors/white.png" "base_color" "0.2 0.2 0.2" //"normal_map" "barrel_chrome_normal.png" //"metal_map" "barrel_chrome_metal.png" diff --git a/valve/pbr/models/v_squeak.mdl/v_squeak.mdl.mat b/valve/pbr/models/v_squeak.mdl/v_squeak.mdl.mat index 5d4296e..08d3151 100644 --- a/valve/pbr/models/v_squeak.mdl/v_squeak.mdl.mat +++ b/valve/pbr/models/v_squeak.mdl/v_squeak.mdl.mat @@ -2,7 +2,7 @@ { "for" "#models/v_squeak/Chrome1.mdl" //"basecolor_map" "Chrome1.png" -//"basecolor_map" "/debug/colors/white.png" +//"basecolor_map" "/colors/white.png" //"base_color" "0.4 0.55 0.4" //"normal_map" "Chrome1_normal.png" //"metal_map" "Chrome1_metal.png" @@ -46,7 +46,7 @@ { "for" "#models/v_squeak/SQK_Eye1.mdl" "basecolor_map" "SQK_Eye1.png" -//"basecolor_map" "/debug/colors/gray.png" +//"basecolor_map" "/colors/gray.png" //"base_color" "0.0 1 0.0" "normal_map" "SQK_Eye1_normal.png" //"metal_map" "SQK_Eye1_metal.png" @@ -58,7 +58,7 @@ { "for" "#models/v_squeak/SQK_Mouth1.mdl" //"basecolor_map" "SQK_Mouth1.png" -//"basecolor_map" "/debug/colors/white.png" +//"basecolor_map" "/colors/white.png" //"base_color" "0.4 0.55 0.4" //"normal_map" "SQK_Mouth1_normal.png" //"metal_map" "SQK_Mouth1_metal.png" diff --git a/valve/pbr/models/v_tripmine.mdl/v_tripmine.mdl.mat b/valve/pbr/models/v_tripmine.mdl/v_tripmine.mdl.mat index f047d27..a62aaa3 100644 --- a/valve/pbr/models/v_tripmine.mdl/v_tripmine.mdl.mat +++ b/valve/pbr/models/v_tripmine.mdl/v_tripmine.mdl.mat @@ -42,7 +42,7 @@ { "for" "#models/v_tripmine/lensCHROME.mdl" //"basecolor_map" "lensCHROME.png" -"basecolor_map" "/debug/colors/gray.png" +"basecolor_map" "/colors/gray.png" "base_color" "0.3 0.3 0.4" //"normal_map" "lensCHROME_normal.png" //"metal_map" "lensCHROME_metal.png"