Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update patches&rads #556

Merged
merged 2 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ref/vk/data/valve/luchiki/maps/c0a0a.bsp.patch
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,21 @@
{
"_xvk_surface_id" "1507 1508 1633 1634 1635" // +0~FIFTIES_LGT2 185 195 255 3000
"_light" "185 195 255 8000"
}


// smoothing
{
"_xvk_smoothing_group" "2117 2116 2115 2099"
}
{
"_xvk_smoothing_group" "2207 2202 2209 2208"
}


{
"_xvk_smoothing_group" "2707 2803 2804 2805 2806 2809 2704 2705 2727 2728 2714 2826 2824 2827 2828 2714 2715 2713 2703 2789 2790 2749 2771 2785 2764 2770 2751 2779 2736 2738 2708"
}
{
"_xvk_smoothing_group" "2819 2818 2816 2740 2741 2775 2753 2773 2754 2766 2786 2787 2794 2795 2725 2726 2729 2730 2799 2800 2801 2802"
}
5 changes: 5 additions & 0 deletions ref/vk/data/valve/luchiki/maps/c0a0e.bsp.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,9 @@
{
"_xvk_surface_id" "567" // +0LAB1_W6 150 160 210 8800
"_light" "150 160 210 35000"
}

// smoothing
{
"_xvk_smoothing_threshold" "55"
}
16 changes: 16 additions & 0 deletions ref/vk/data/valve/luchiki/maps/c1a0.bsp.patch
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,19 @@
"_cone" "0"
"_cone2" "50"
}


// smoothing
// gate
{
"_xvk_smoothing_group" "3135 3133 3131 3129 3130 3132 3134 3136"
}
{
"_xvk_smoothing_group" "3143 3141 3139 3140 3142 3144 3146 3145"
}
{
"_xvk_smoothing_group" "3123 3121 3119 3120 3122 3124 3126 3125"
}
{
"_xvk_smoothing_group" "3109 3107 3105 3103 3104 3106 3108 3110"
}
18 changes: 18 additions & 0 deletions ref/vk/data/valve/luchiki/maps/c1a0a.bsp.patch
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,22 @@
{
"_xvk_ent_id" "166 163"
"renderamt" "128"
}


// smoothing
{
"_xvk_smoothing_threshold" "50" // TODO: more manual smoothing
}
{
"_xvk_smoothing_group" "2159 2162 2156 2161 2169 2168 2160 2155 2158 2166 2165 2164"
}
{
"_xvk_smoothing_group" "2232 2231 2228 2229 2230 2227"
}
{
"_xvk_smoothing_group" "2286 2290 2291 2292 2284 2281 2285 2288 2294 2295 2287 2283"
}
{
"_xvk_smoothing_group" "2394 2392 2390 2388 2389 2391 2393 2395" // 2383 2384 2387
}
15 changes: 13 additions & 2 deletions ref/vk/data/valve/luchiki/maps/c1a0d.bsp.patch
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,16 @@
"_xvk_ent_id" "122 128 121 129 135 126 124 123 130 125 127"
}



// smoothing
{
"_xvk_smoothing_excluded_pairs" "918 924 922"
}
{
"_xvk_smoothing_excluded_pairs" "2550 2551 2549"
}
{
"_xvk_smoothing_excluded_pairs" "2634 2635 2562"
}
{
"_xvk_smoothing_excluded_pairs" "2647 2648 2646"
}
15 changes: 10 additions & 5 deletions ref/vk/data/valve/maps/c1a0.rad
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,21 @@
~LIGHT3C 198 215 74 14000
~SPOTYELLOW 189 231 253 20000
~SPOTBLUE 7 163 245 18000
LAB1_COMP3D 255 255 255 20
~LAB1_COMP7 255 255 255 20
//LAB1_COMP3D 255 255 255 20
LAB1_COMP3D 255 255 255 0 // TODO: emissive texture
//~LAB1_COMP7 255 255 255 20
~LAB1_COMP7 255 255 255 0 // TODO: emissive texture

CRYS_2TOP 171 254 168 14000

DRKMTL_SCRN3 1 111 220 200

+0~LAB1_CMP2 255 255 255 20
+1~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
+2~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
//+0~LAB1_CMP2 255 255 255 20
//+1~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
//+2~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
+0~LAB1_CMP2 255 255 255 0 // TODO: emissive texture
+1~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet
+2~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet

+0~LAB_CRT8 50 50 255 200
+1~LAB_CRT8 50 50 255 200 // hack, because no inheritance yet
Expand Down
12 changes: 8 additions & 4 deletions ref/vk/data/valve/maps/c1a0d.rad
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@ LITEPANEL1 190 170 120 2500
~LIGHT3F 200 190 140 2500
+0~GENERIC85 110 160 220 25500 // 11000 16000 22000
~SPOTBLUE 7 163 245 18000
+0~LAB1_CMP2 255 255 255 20
+1~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
+2~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
LAB1_COMP3D 255 255 255 20
//+0~LAB1_CMP2 255 255 255 20
//+1~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
//+2~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
+0~LAB1_CMP2 255 255 255 0 // TODO: emissive texture
+1~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet
+2~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet
//LAB1_COMP3D 255 255 255 20
LAB1_COMP3D 255 255 255 0 // TODO: emissive texture
~LAB1_COMP7 255 255 255 20
+0~FIFTS_LGHT5 255 255 255 10000

Expand Down
15 changes: 10 additions & 5 deletions ref/vk/data/valve/maps/lights.rad
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,12 @@
+0~GYMLIGHT 255 230 150 2500
+0~LAB_CRT8 50 50 255 100
+1~LAB_CRT8 50 50 255 100 // hack, because no inheritance yet
+0~LAB1_CMP2 255 255 255 20
+1~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
+2~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
//+0~LAB1_CMP2 255 255 255 20
//+1~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
//+2~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet
+0~LAB1_CMP2 255 255 255 0 // TODO: emissive texture
+1~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet
+2~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet
//+0~LIGHT1 40 60 150 3000
+0~LIGHT1 40 60 150 10000
+0~LIGHT2A 255 250 130 2000
Expand Down Expand Up @@ -100,13 +103,15 @@ SKKYLITEDAWN 210 175 195 2000
SUBWAY_LIGHTS 255 250 202 2000
//WHITE 255 255 255 100
//YELLOW 255 200 100 2000
LAB1_COMP3D 255 255 255 20
//LAB1_COMP3D 255 255 255 20
LAB1_COMP3D 255 255 255 0 // TODO: emissive texture
~GENERIC87 205 230 255 550
~GENERIC88 205 230 255 550
~LAB_CRT9A 225 150 150 100
~LAB_CRT9B 100 100 255 100
~LAB_CRT9C 100 200 150 100
~LAB1_COMP7 255 255 255 20
//~LAB1_COMP7 255 255 255 20
~LAB1_COMP7 255 255 255 0 // TODO: emissive texture
~LIGHT3A 190 20 20 3000
//~LIGHT3B 155 155 235 2000
~LIGHT3B 84 118 198 14000
Expand Down