From 0927e25ce2fc482fd49be5ef5416a71d6f0309d9 Mon Sep 17 00:00:00 2001 From: NightFox <0x4E69676874466F78@users.noreply.github.com> Date: Sat, 4 Nov 2023 19:23:21 +0300 Subject: [PATCH 1/4] update patches Improvement geometry smoothing (normals) --- ref/vk/data/valve/luchiki/maps/c1a0.patch | 13 ++ ref/vk/data/valve/luchiki/maps/c1a0a.patch | 25 +++- ref/vk/data/valve/luchiki/maps/c1a0b.patch | 115 ++++++++++++++- ref/vk/data/valve/luchiki/maps/c1a0c.patch | 75 ++++++++++ ref/vk/data/valve/luchiki/maps/c1a0d.patch | 44 ++++++ ref/vk/data/valve/luchiki/maps/c1a0e.patch | 14 +- ref/vk/data/valve/luchiki/maps/c1a1.patch | 92 ++++++++++++ ref/vk/data/valve/luchiki/maps/c1a1a.patch | 7 + ref/vk/data/valve/luchiki/maps/c1a1b.patch | 158 ++++++++++++++++++++- ref/vk/data/valve/luchiki/maps/c1a1f.patch | 9 ++ 10 files changed, 541 insertions(+), 11 deletions(-) diff --git a/ref/vk/data/valve/luchiki/maps/c1a0.patch b/ref/vk/data/valve/luchiki/maps/c1a0.patch index 31ecb769..d996a34a 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a0.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a0.patch @@ -100,3 +100,16 @@ { "_xvk_smoothing_group" "3109 3107 3105 3103 3104 3106 3108 3110" } + +{ +"_xvk_smoothing_excluded" "937" // wall near sector B sign // TODO: bad autosmooth +} +{ +"_xvk_smoothing_excluded" "1588 2707 2736 2711 1619 1552 1515 1511 1555 2713" // wall // TODO: bad autosmooth +} +{ +"_xvk_smoothing_excluded" "1022 1038" // walls after transition // TODO: bad autosmooth +} +{ +"_xvk_smoothing_group" "2167 2171 2168 2204" // maybe slightly incorrect +} \ No newline at end of file diff --git a/ref/vk/data/valve/luchiki/maps/c1a0a.patch b/ref/vk/data/valve/luchiki/maps/c1a0a.patch index e3a6e522..add39d6b 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a0a.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a0a.patch @@ -74,4 +74,27 @@ //} //{ //"_xvk_smoothing_excluded_pairs" "1200 1220 1221 1199 1207 1217" // TODO: need investigate -//} \ No newline at end of file +//} + +{ +"_xvk_smoothing_excluded" "145 174" // wall // TODO: bad autosmooth +} +{ +"_xvk_smoothing_group" "170 174 166" // TODO: these faces somehow didn't autosmooth +} + +{ +"_xvk_smoothing_excluded" "1200" // wall // TODO: bad autosmooth +} +{ +"_xvk_smoothing_excluded" "1324" // wall // TODO: bad autosmooth +} +{ +"_xvk_smoothing_group" "1323 1324 1320 1322" +} +{ +"_xvk_smoothing_excluded" "1202" // wall // TODO: bad autosmooth +} +{ +"_xvk_smoothing_group" "1197 1202 1201" +} \ No newline at end of file diff --git a/ref/vk/data/valve/luchiki/maps/c1a0b.patch b/ref/vk/data/valve/luchiki/maps/c1a0b.patch index f63047dc..bc77768d 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a0b.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a0b.patch @@ -63,18 +63,125 @@ { //"_xvk_smoothing_threshold" "0" } + +//{ // transit wall +//"_xvk_smoothing_excluded_pairs" "883 884 886 887 903 1156" // TODO: bad autosmooth +//} { -"_xvk_smoothing_group" "2044 2044 2041 753 2045 757 2053 763 765" //756 // TODO: fix bad geometry +"_xvk_smoothing_excluded" "886 883" // TODO: bad autosmooth +} + +{ +"_xvk_smoothing_group" "1492 1496 1491 1498 1499 1497 1494 1495" // pipe } { +"_xvk_smoothing_group" "1590 1587 1597 1599 1600 1598 1576 1584" // continue pipe +} +{ +"_xvk_smoothing_group" "1607 1608 1604 1609 1603 1576 1584" // continue pipe +} +{ +"_xvk_smoothing_group" "1592 1594 1595 1605 1610 1602 1586 1589" // continue pipe +} +{ +"_xvk_smoothing_group" "1503 1505 1506 1504 1502 1500 1501 1493" // pipe +} +{ +"_xvk_smoothing_group" "1583 1613 1555 1559 1557 1528 1579 1578 1612" // continue pipe +} +{ +"_xvk_smoothing_group" "1583 1613 1556 1560 1558 1529 1579 1578 1612" // continue pipe +} +{ +"_xvk_smoothing_excluded" "1581" // TODO: bad autosmooth +} +{ +"_xvk_smoothing_group" "1577 1581 1623 1571" // continue pipe +} +{ +"_xvk_smoothing_group" "1623 1633 1630 1625 1620 1563 1568 1571" // continue pipe +} + +{ +"_xvk_smoothing_group" "1577 1581 1623 1571" // continue pipe +} + +// +{ +"_xvk_smoothing_group" "3006 3007 3003 3005 3004 3002" +} +{ +"_xvk_smoothing_group" "2966 2967 2963 2965 2964 2962" +} +{ +"_xvk_smoothing_group" "3124 3125 3120 3123 3122 3121" +} + +{ +"_xvk_smoothing_excluded" "2407" // TODO: bad autosmooth +} +{ +//"_xvk_smoothing_excluded" "2413 2417" // TODO: bad autosmooth +} + +{ +"_xvk_smoothing_excluded" "2071 749" // TODO: bad autosmooth +} + +{ +"_xvk_smoothing_group" "716 749 2071 2068" +} + +{ +"_xvk_smoothing_excluded" "1687 1686 1479 1747 1463" // TODO: bad autosmooth +} +{ +"_xvk_smoothing_excluded" "1314 1291" // pipe // TODO: bad autosmooth +} +{ +"_xvk_smoothing_group" "1310 1314" // fix pipe +} +// TODO +{ +//"_xvk_smoothing_group" "1291 1314" // continue pipe +} +{ +//"_xvk_smoothing_group" "1287 1314" // continue pipe +} + +// wall corner near the sign C-33/a and off lamp + +//{ //"_xvk_smoothing_group" "754 758 764 766" +//} +//{ +//"_xvk_smoothing_group" "668 765 762" // 763 (bad) // TODO: fix bad geometry +//} +//{ +//"_xvk_smoothing_group" "2029 2028 2052 768 760 761 663" +//} +{ +"_xvk_smoothing_excluded" "764 758 754 766" // TODO: bad autosmooth } { -"_xvk_smoothing_group" "668 765 762" // 763 (bad) // TODO: fix bad geometry +"_xvk_smoothing_excluded" "2044 2041 763 765" // TODO: bad autosmooth } { -"_xvk_smoothing_group" "2029 2028 2052 768 760 761 663" +//"_xvk_smoothing_excluded" "2029 2028 2052 760 761" // TODO: bad autosmooth } { -"_xvk_smoothing_excluded_pairs" "883 884 886 887 903 1156" // FIXME: bad autosmooth +"_xvk_smoothing_excluded" "668 667" // TODO: bad autosmooth +} +{ +"_xvk_smoothing_group" "4 754" +} +{ +"_xvk_smoothing_group" "16 754 758 764 766 666" +} +{ +//"_xvk_smoothing_group" "2044 2044 2041 753 2045 757 2053 763 765" //756 // TODO: fix bad geometry +} + +{ +"_xvk_smoothing_excluded" "1877" // TODO: bad autosmooth } \ No newline at end of file diff --git a/ref/vk/data/valve/luchiki/maps/c1a0c.patch b/ref/vk/data/valve/luchiki/maps/c1a0c.patch index ffdc7203..a526f0fa 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a0c.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a0c.patch @@ -76,4 +76,79 @@ } { "_xvk_smoothing_excluded_pairs" "747 748" // FIXME: bad autosmooth +} + +//{ // FIXME: bad autosmooth +//"_xvk_smoothing_group" "50 132 135 130 134 128 125 131 43 47 39 49 41 37 45 50 43 48 40 49 42 38 45 51 44" +//} + +{ +"_xvk_smoothing_group" "3185 3188 3178 3174 3182 3194 3191" +} + +// +{ +"_xvk_smoothing_group" "3476 3477 3473 3475 3474 3472" +} +{ +"_xvk_smoothing_group" "3436 3437 3433 3435 3434 3432" +} +{ +"_xvk_smoothing_group" "3560 3561 3557 3559 3558 3556" +} + +{ +"_xvk_smoothing_group" "1669 1673 1675 1677 1676 1672 1671 1674" // pipe +} +{ +"_xvk_smoothing_group" "2041 2054 2056 2057 2055 2051 2052 2053" // continue pipe +} +{ +"_xvk_smoothing_group" "2071 2072 2070 2068 2066 2059 2062 2042 2069" // continue pipe +} +{ +"_xvk_smoothing_group" "2042 2078 2080 2092 2095 2089 2075 2079" // continue pipe +} +{ +"_xvk_smoothing_excluded" "2096 2094 2091" // TODO: bad autosmooth +} +{ +"_xvk_smoothing_group" "2073 2076 2082 2086 2091 2090 2060 2063 2087 2083" // continue pipe +} +{ +"_xvk_smoothing_group" "2082 2086 2093" // continue pipe +} +{ +"_xvk_smoothing_group" "2093 2094" // continue pipe +} +{ +"_xvk_smoothing_group" "2094 2096" // continue pipe +} +{ +"_xvk_smoothing_group" "2094 2091" // continue pipe +} +{ +"_xvk_smoothing_group" "2096 2091" // continue pipe +} + + +{ +"_xvk_smoothing_group" "1681 1683 1684 1682 1680 1678 1679 1670" // continue pipe +} +{ // TODO: too bad geometry +"_xvk_smoothing_group" "2112 2116 2018 2016 2012 1992 2109 2043" // continue pipe +} +{ +"_xvk_smoothing_group" "2113 2117 2019 2017 2013 1993 2110 2044" // continue pipe +} +{ +"_xvk_smoothing_group" "2022 2036 2101 2105 2108 2104 2030 2027" // continue pipe +} + +{ +"_xvk_smoothing_excluded" "1608 1525 1524 1527 1526" //wall // TODO: bad autosmooth +} + +{ +"_xvk_smoothing_excluded" "750 760" //wall // TODO: bad autosmooth } \ No newline at end of file diff --git a/ref/vk/data/valve/luchiki/maps/c1a0d.patch b/ref/vk/data/valve/luchiki/maps/c1a0d.patch index 06c46c86..5f24435c 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a0d.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a0d.patch @@ -82,4 +82,48 @@ } { "_xvk_smoothing_excluded_pairs" "2647 2648 2646" +} + +{ +"_xvk_smoothing_excluded" "2899" // wall // TODO: bad autosmooth +} +//{ +//"_xvk_smoothing_excluded" "2210 2214" // TODO: bad autosmooth (impossible to fix manually) +//} +{ +"_xvk_smoothing_excluded" "1988 1983 1985" // wall // TODO: bad autosmooth +} +// maybe incorrect +{ +//"_xvk_smoothing_group" "1988 1985" +} +{ +//"_xvk_smoothing_group" "2130 1988" +} +{ +//"_xvk_smoothing_group" "2131 1983" +} +{ +//"_xvk_smoothing_group" "1988 1983" +} +{ +//"_xvk_smoothing_group" "2130 2131" +} +// +{ +"_xvk_smoothing_excluded" "1446 1494 1971 1970 1965 1967 1968 1966 1906 1907 1908 1439 1877 1956 1955" // near the ceiling // TODO: bad autosmooth +} +{ +"_xvk_smoothing_group" "1952 1955" +} +// +{ // slightly incorrect +//"_xvk_smoothing_excluded" "2535 2536" // wall // TODO: bad autosmooth +} +{ +//"_xvk_smoothing_group" "2536 2813" +} + +{ +"_xvk_smoothing_excluded" "2895" // wall // TODO: bad autosmooth } \ No newline at end of file diff --git a/ref/vk/data/valve/luchiki/maps/c1a0e.patch b/ref/vk/data/valve/luchiki/maps/c1a0e.patch index a6ac36cf..02da5ff1 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a0e.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a0e.patch @@ -98,8 +98,16 @@ } - - - +// smoothing +{ +"_xvk_smoothing_excluded" "560 528" // wall // TODO: bad autosmooth +} + +{ +"_xvk_smoothing_excluded" "630 210 961 628 646" // wall // TODO: bad autosmooth +} +{ +//"_xvk_smoothing_group" "214 210 218 630" +} diff --git a/ref/vk/data/valve/luchiki/maps/c1a1.patch b/ref/vk/data/valve/luchiki/maps/c1a1.patch index bf2dbe73..a36cc88b 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a1.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a1.patch @@ -50,4 +50,96 @@ "_xvk_ent_id" "109" // remove hack lights entity } +// smoothing +{ +"_xvk_smoothing_excluded" "2162 2215" //wall // TODO: bad autosmooth +} +{ +"_xvk_smoothing_excluded" "2078 2077 2231 2233 2232" //wall // TODO: bad autosmooth +} + +// broken mini pipe +// 2794 2792 2790 2791 2799 2802 2755 2787 2788 2800 2801 +{ +"_xvk_smoothing_group" "2802 2803 2786 2768 2764 2796" +} +{ +"_xvk_smoothing_group" "2803 2801 2800" +} +{ +"_xvk_smoothing_group" "2786 2801" +} +{ +"_xvk_smoothing_group" "2786 2789 2787 2792" +} +{ +"_xvk_smoothing_group" "2768 2793 2792" +} +//{ +//"_xvk_smoothing_group" "2788 2800" +//} +//{ +//"_xvk_smoothing_group" "2787 2788" +//} +//{ +//"_xvk_smoothing_group" "2794 2792" +//} +//{ +//"_xvk_smoothing_group" "2794 2790" +//} +//{ +//"_xvk_smoothing_group" "2790 2791" +//} +//{ +//"_xvk_smoothing_group" "2791 2792" +//} +//{ +//"_xvk_smoothing_group" "2792 2796 2799" +//} +// mini pipe +{ +"_xvk_smoothing_group" "2824 2827 2828 2823 2826 2825" +} +// mini pipe +{ +"_xvk_smoothing_group" "2878 2884 2890 2888 2887 2882" +} +{ +"_xvk_smoothing_group" "2880 2881 2892 2891 2885 2883" +} + +// pipe +{ +"_xvk_smoothing_group" "2975 2974 2972 2970 2965 2967 2971 2973" +} + +// pipe +{ +"_xvk_smoothing_group" "3944 3946 3947 3945 3943 3941 3940 3942" +} + +// pipe +{ +"_xvk_smoothing_group" "2613 2609 2606 2586 2587 2581 2602 2601" +} +// continue pipe +{ +"_xvk_smoothing_group" "2619 2617 2593 2589 2591 2596 2604 2616 2618 2608" // 2600 2612 2611 2610 +} +// pipe +{ +"_xvk_smoothing_group" "2628 2632 2634 2636 2635 2599 2624" +} +{ +"_xvk_smoothing_group" "2636 2642 2643 2664 2640 2639" +} +// continue pipe +{ +"_xvk_smoothing_group" "2627 2631 2633 2641 2645 2638 2621 2623" +} + +//wall ceil +{ +"_xvk_smoothing_excluded" "2926" +} diff --git a/ref/vk/data/valve/luchiki/maps/c1a1a.patch b/ref/vk/data/valve/luchiki/maps/c1a1a.patch index abfe6e31..57c72fd3 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a1a.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a1a.patch @@ -15,3 +15,10 @@ "_xvk_surface_id" "1936 1934 1933" "_xvk_material" "mirror_broken" } + +//smooth + +//wall +{ +//"_xvk_smoothing_excluded" "2471" +} \ No newline at end of file diff --git a/ref/vk/data/valve/luchiki/maps/c1a1b.patch b/ref/vk/data/valve/luchiki/maps/c1a1b.patch index 3d2f4aad..e4b738d9 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a1b.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a1b.patch @@ -68,9 +68,11 @@ "_light" "70 200 110 4000" // color from hack light } + +// smooth { -_xvk_ent_id "329 321 322 323 324" -_xvk_smooth_entire_model "1" +"_xvk_ent_id" "329 321 322 323 324" +"_xvk_smooth_entire_model" "1" } //{ // FOR TESTING //"_xvk_smoothing_group" "5577 5575 5579 5581 5576 5586 5583 5585 5584 5582 5580 5578 " // 5569 5572 5571 5570 5573 + //5567 5565 5568 5566 @@ -91,5 +93,155 @@ _xvk_smooth_entire_model "1" } { -_xvk_smoothing_excluded "2120 2117 2118 1269 1267 2791 2792 2793" +"_xvk_smoothing_excluded" "2120 2117 2118 1269 1267 2791 2792 2793" } + +// wall +{ +"_xvk_smoothing_excluded" "2302 2480 2540" +} + +// pipes +{ // pipe1 +"_xvk_smoothing_group" "2262 2263 2261 2259 2186 2257 2258 2260" +} +{ +"_xvk_smoothing_group" "2278 2280 2279 2277 2275 2273 2274 2276" +} +{ +"_xvk_smoothing_group" "2272 2270 2268 2266 2187 2264 2269 2271" +} +{ // water pipe1 +"_xvk_smoothing_group" "3932 3930 3928 3934 3944 3940 3938 3939 3933" +} +{ +"_xvk_smoothing_group" "3929 3931 3927 3935 3936 3943 3941 3942 3937 3926" +} +{ // pipe2 +"_xvk_smoothing_group" "2212 2214 2216 2215 2213 2211 2208 2210" +} +{ +"_xvk_smoothing_group" "2228 2230 2229 2227 2225 2223 2224 2226" +} +{ +"_xvk_smoothing_group" "2242 2244 2248 2250 2249 2247 2238 2240" +} +{ +"_xvk_smoothing_group" "2717 2719 2721 2723 2724 2722 2715 2705" +} +{ // pipe3 +"_xvk_smoothing_group" "2220 2218 2207 2196 2194 2198 2219 2209" +} +{ +"_xvk_smoothing_group" "2221 2232 2191 2193 2192 2190 2200 2235 2234" +} +{ +"_xvk_smoothing_group" "2253 2252 2243 2241 2239 2237 2251 2245" +} +{ // pipe kusok +"_xvk_smoothing_group" "4405 4407 4409 4408 4406 4404 4402 4403" +} + +// mini pipes +{ +"_xvk_smoothing_group" "3854 3855 3848" +} +{ +"_xvk_smoothing_group" "3850 3872 3000 2988 2999 2987 2998 2986" +} +{ +"_xvk_smoothing_group" "2996 2979" +} + +// pipe +{ +"_xvk_smoothing_group" "2367 2369 2370 2368 2366 2364 2363 2365" +} +// pipe +{ +"_xvk_smoothing_group" "2448 2446 2447 2449 2391 2398 2399 2397" +} +{ +"_xvk_smoothing_group" "2402 2403 2446 2447 2450 2454 2391" +} +{ +"_xvk_smoothing_group" "2405 2401 2407 2452 2451 2387 2382 2383 2381" +} +{ +"_xvk_smoothing_group" "1010 1002 1009 1011 1013 1015 1014 1012" +} + +// pipe +{ +"_xvk_smoothing_group" "2430 2434 2420 2428 2415 2410 2412 2411" +} +{ +"_xvk_smoothing_group" "2432 2431 2433 2425 2424" +} +{ +"_xvk_smoothing_group" "2427 2425 2424 2426 2418 2406 2409 2400" +} +{ +"_xvk_smoothing_group" "1002 1007 999 998 1004 1006 1008 1003" +} + +// wall +{ +"_xvk_smoothing_excluded" "2633 3178 2634" +} +{ +"_xvk_smoothing_excluded" "2788 2786 2787" +} +{ +"_xvk_smoothing_excluded" "2898" +} +{ +"_xvk_smoothing_excluded" "2798 2800 2799" +} +{ +"_xvk_smoothing_excluded" "1605 1606" +} + +{ +"_xvk_smoothing_excluded" "1258 831 833" +} + + +{ +"_xvk_smoothing_excluded" "840 837" +} + +{ +"_xvk_smoothing_excluded" "1807 1805 1481 1479" +} + +// mine pipe +{ +"_xvk_smoothing_group" "2584 2597 2582 2581 2962 2965 2961 2958" +} + +//wall +{ +"_xvk_smoothing_excluded" "2930 2929" +} + +// wall +{ +"_xvk_smoothing_excluded" "1076" +} + + +// canalization +{ // bad geometry +//"_xvk_smoothing_excluded" "629 581 577 583" +} +{ +//"_xvk_smoothing_group" "629 581 577 583" +} + + + +// wall +{ +"_xvk_smoothing_excluded" "1781 1782 1783" +} \ No newline at end of file diff --git a/ref/vk/data/valve/luchiki/maps/c1a1f.patch b/ref/vk/data/valve/luchiki/maps/c1a1f.patch index d22ad2d6..7a555e1d 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a1f.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a1f.patch @@ -175,4 +175,13 @@ } { "_xvk_smoothing_excluded_pairs" "3061 3063 3065" // wall // TODO: bad autosmooth +} + +{ +"_xvk_smoothing_excluded" "2941 3107 2981 2980 2976 2944" // wall // TODO: bad autosmooth +} + + +{ +"_xvk_smoothing_excluded" "989 988" // wall // TODO: bad autosmooth } \ No newline at end of file From 42dfd56f87add3fb5dc7c07ebb03083482c928e2 Mon Sep 17 00:00:00 2001 From: NightFox <0x4E69676874466F78@users.noreply.github.com> Date: Sun, 5 Nov 2023 20:45:28 +0300 Subject: [PATCH 2/4] update c1a1c.patch --- ref/vk/data/valve/luchiki/maps/c1a1c.patch | 118 +++++++++++++++++++-- 1 file changed, 111 insertions(+), 7 deletions(-) diff --git a/ref/vk/data/valve/luchiki/maps/c1a1c.patch b/ref/vk/data/valve/luchiki/maps/c1a1c.patch index 251a183e..6565605f 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a1c.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a1c.patch @@ -11,14 +11,26 @@ { "_xvk_ent_id" "112 111 115 114 121 116 109 110 113 95" // remove hack lights entity } -{ +{ // light-wall fix "_xvk_ent_id" "36 38 41 37 39" "origin" "0 0 -7" } +{ // sign "caution" +"_xvk_ent_id" "40" +"origin" "0 -1 0" +} +// remove hack light 93 (for sign "caution") +{ +"_xvk_ent_id" "93" // remove hack lights entity +} +{ // sign "caution" +"_xvk_surface_id" "4169" +"_light" "255 255 255 100" +} // section 2 (elevator) { -"_xvk_ent_id" "93 102 92 101 99" // remove hack lights entity +"_xvk_ent_id" "102 92 101 99" // remove hack lights entity } // section 3 @@ -58,15 +70,107 @@ { // TODO: tune origin "_xvk_ent_id" "390 389 445 444" // remove hack lights entity } + // section 5 +// smooth pipes +// pipe 1 { -"_xvk_ent_id" "445 404 397 396" // remove hack lights entity +"_xvk_smoothing_group" "1523 1519 1506 1503 1512 1509 1516 1520" } +{ +//"_xvk_smoothing_group" "1558 1554 1506 999 997 1003 1001 1509 1553 1516 1520" +"_xvk_smoothing_group" "1001 1003 997 999" +} +{ +"_xvk_smoothing_group" "1557 1555 1556 1507 998 996 1000 1002 1510 1552 1513" +} +{ +"_xvk_smoothing_group" "1554 1558 1557" +} +{ +"_xvk_smoothing_group" "5768 5766 5764 5765 5767 5769 5771 5770" +} +// pipe 2 +{ +"_xvk_smoothing_group" "1514 1525 1535 1545 1550 1540 1528 1533" +} +{ +"_xvk_smoothing_group" "1546 1542 1548 1543 1547" // bad +} +{ +"_xvk_smoothing_group" "1543 1531 1530 1527 1524 1537 1539 1538 1536 1531" +} +{ +"_xvk_smoothing_group" "5780 5778 5776 5774 5775 5777 5779 5781" +} +// pipe 3 +{ +"_xvk_smoothing_group" "1499 1497 1377 1369 1379 1378 1376 1367 1498 1500" +} +{ +"_xvk_smoothing_group" "975 990 978 994 993 988 967 971" +} +// pipe 4 +{ +"_xvk_smoothing_group" "1375 1374 1372 1368 1366 1370 1371 1373" +} +{ +"_xvk_smoothing_group" "985 976 972 968 964 980 982 986" +} +// pipe 5 +{ +"_xvk_smoothing_group" "919 923 920 916" +} +{ +"_xvk_smoothing_group" "887 843 854 892" +} +{ +"_xvk_smoothing_group" "927 930 934 935 948" +} +{ +"_xvk_smoothing_group" "887 948 916" +} +{ +"_xvk_smoothing_group" "925 928 895 907 906 911 900 949 939 941 933 931 940 932 929 944" +} +{ +"_xvk_smoothing_group" "887 948 916" +} +{ +"_xvk_smoothing_group" "901 947" +} +// pipe 6 +{ +"_xvk_smoothing_group" "884 881 878 859 897 899 898 896" +} +{ +"_xvk_smoothing_group" "909 910 908 902 912 904 905 903" // bad +} +{ +"_xvk_smoothing_group" "946 938 943 926" +} +{ +"_xvk_smoothing_group" "943 937" +} +// pipe 7 +{ +"_xvk_smoothing_group" "846 963 960 956 875 952 954 959" +} +// pipe 8 +{ +"_xvk_smoothing_group" "864 868 872 873 869 865 852 848" +} + + // section 6 { +"_xvk_ent_id" "405 404 397 396" // remove hack lights entity +} +// section 7 +{ "_xvk_ent_id" "288 289" // remove hack lights entity } -// section 7 +// section 8 { "_xvk_ent_id" "172 169" // remove hack lights entity } @@ -97,12 +201,12 @@ "_xvk_ent_id" "293 292 297" // remove hack lights entity } -// section 8 +// section 9 { "_xvk_ent_id" "174" // remove hack lights entity } -// section 9 +// section 10 { "_xvk_ent_id" "451 450 457 456" // remove hack lights entity } @@ -123,7 +227,7 @@ "origin" "-1586 1558 -2595" } -// section 10 +// section 11 { "_xvk_ent_id" "330 331 328 329" // remove hack lights entity } From 6963c158a445a7e283a511bfb6a6473522ccd458 Mon Sep 17 00:00:00 2001 From: NightFox <0x4E69676874466F78@users.noreply.github.com> Date: Sun, 5 Nov 2023 23:43:12 +0300 Subject: [PATCH 3/4] update c1a0c.patch --- ref/vk/data/valve/luchiki/maps/c1a0c.patch | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ref/vk/data/valve/luchiki/maps/c1a0c.patch b/ref/vk/data/valve/luchiki/maps/c1a0c.patch index a526f0fa..98c3e59b 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a0c.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a0c.patch @@ -20,7 +20,6 @@ "_xvk_ent_id" "16 15 22 19" // remove hack lights entity } { -{ "_xvk_ent_id" "113" "_light" "100 120 160 100" "_xvk_radius" "10" @@ -32,14 +31,14 @@ // lift/elevator { -"_xvk_ent_id" "335 354" // remove hack lights entity +"_xvk_ent_id" "354 355" // remove hack lights entity // TODO: fix "buttons" } // section 3 { -"_xvk_ent_id" "167 163 164 165 166 186" // remove hack lights entity +"_xvk_ent_id" "167 166 165 164 163 186" // remove hack lights entity } { "_xvk_surface_id" "2390 2326 2327 2328 1704" // +0~GENERIC86B 60 220 170 10000 @@ -50,7 +49,7 @@ "_light" "200 190 130 21000" } -// section 4 +// section 4 (control panel) { "_xvk_ent_id" "162" // remove hack lights entity } @@ -58,22 +57,22 @@ // smoothing -{ +//{ //"_xvk_smoothing_threshold" "44" // FIXME, 44 workaround // bad autosmooth (for metallic room wall) -} -{ +//} +//{ //"_xvk_smoothing_excluded_pairs" "189 188 183 182 184" -} -{ +//} +//{ //"_xvk_smoothing_group" //"_xvk_smoothing_excluded_pairs" "182 183 184 97 74 187 188 2714 76 185" // FIXME -} +//} { "_xvk_smoothing_excluded_pairs" "1067 1042" // FIXME: bad autosmooth } -{ +//{ //"_xvk_smoothing_excluded_pairs" "747 748 750 751" // FIXME: bad autosmooth -} +//} { "_xvk_smoothing_excluded_pairs" "747 748" // FIXME: bad autosmooth } From fd356e61245b68081c74f871eaa1eefc5f9586ff Mon Sep 17 00:00:00 2001 From: NightFox <0x4E69676874466F78@users.noreply.github.com> Date: Mon, 6 Nov 2023 00:00:17 +0300 Subject: [PATCH 4/4] update c1a0c.patch --- ref/vk/data/valve/luchiki/maps/c1a0c.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ref/vk/data/valve/luchiki/maps/c1a0c.patch b/ref/vk/data/valve/luchiki/maps/c1a0c.patch index 98c3e59b..71d685c5 100644 --- a/ref/vk/data/valve/luchiki/maps/c1a0c.patch +++ b/ref/vk/data/valve/luchiki/maps/c1a0c.patch @@ -29,6 +29,20 @@ "_light" "215 180 95 6000" } +// "i tak soydet" pipe +{ +"_xvk_surface_id" "1851 1852" +"_xvk_material" "generic031b" +} +{ +"_xvk_smoothing_group" "1854 1852 1866 1853 1851 1865" +} +{ +"_xvk_surface_id" "1851 1852" +"_xvk_tex_offset" "0 200" +"_xvk_tex_scale" "1 0.05" // ugly "hack" // FIXME: 90 rotation +} + // lift/elevator { "_xvk_ent_id" "354 355" // remove hack lights entity // TODO: fix "buttons"