Merge pull request #637 from 0x4E69676874466F78/vulkan

Update patches
w23 · Nov 6, 2023 · d5ee8ba · d5ee8ba
2 parents 365fffa + fd356e6
commit d5ee8ba
Show file tree

Hide file tree

Showing 11 changed files with 675 additions and 28 deletions.
diff --git 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
+}
diff --git 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
-//}
+//}
+
+{
+"_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"
+}
diff --git 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_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" "2044 2044 2041 753 2045 757 2053 763 765" //756 // TODO: fix bad geometry
+"_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_excluded" "2044 2041 763 765" // TODO: bad autosmooth 
+}
+{
+//"_xvk_smoothing_excluded" "2029 2028 2052 760 761" // TODO: bad autosmooth 
+}
+{
+"_xvk_smoothing_excluded" "668 667" // TODO: bad autosmooth 
+}
+{
+"_xvk_smoothing_group" "4 754" 
 }
 {
-"_xvk_smoothing_group" "668 765 762" // 763 (bad) // TODO: fix bad geometry
+"_xvk_smoothing_group" "16 754 758 764 766 666" 
 }
 {
-"_xvk_smoothing_group" "2029 2028 2052 768 760 761 663"
+//"_xvk_smoothing_group" "2044 2044 2041 753 2045 757 2053 763 765" //756 // TODO: fix bad geometry
 }
+
 {
-"_xvk_smoothing_excluded_pairs" "883 884 886 887 903 1156" // FIXME: bad autosmooth 
+"_xvk_smoothing_excluded" "1877" // TODO: bad autosmooth 
 }
diff --git 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"
@@ -30,16 +29,30 @@
 "_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" "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,30 +63,105 @@
 "_light" "200 190 130 21000"
 }
 
-// section 4
+// section 4 (control panel)
 {
 "_xvk_ent_id" "162" // remove hack lights entity
 }
 
 
 
 // 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" "189 188 183 182 184"
+"_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" 
-//"_xvk_smoothing_excluded_pairs" "182 183 184 97 74 187 188 2714 76 185" // FIXME
+"_xvk_smoothing_group" "3185 3188 3178 3174 3182 3194 3191" 
 }
+
+//
 {
-"_xvk_smoothing_excluded_pairs" "1067 1042" // FIXME: bad autosmooth
+"_xvk_smoothing_group" "3476 3477 3473 3475 3474 3472" 
 }
 {
-//"_xvk_smoothing_excluded_pairs" "747 748 750 751" // FIXME: bad autosmooth
+"_xvk_smoothing_group" "3436 3437 3433 3435 3434 3432" 
 }
 {
-"_xvk_smoothing_excluded_pairs" "747 748" // FIXME: bad autosmooth
+"_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
 }
diff --git 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
 }