Merge branch 'master' into flashlight-emission-profile

.github/workflows/build.yml

@@ -45,6 +45,7 @@ jobs:
           q2rtxded.exe
           q2rtxded-x86.exe
           baseq2/
+          rogue/
           license.txt
           notice.txt
 
@@ -79,5 +80,6 @@ jobs:
           q2rtx
           q2rtxded
           baseq2/
+          rogue/
           license.txt
           notice.txt

.gitignore

@@ -44,4 +44,5 @@ save
 */docs
 baseq2/**/*.txt
 !baseq2/*.txt
+!baseq2/maps/sky/*.txt
 !baseq2/pics/flashlight_profile.png

baseq2/maps/sky/base1.txt

@@ -0,0 +1,17 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+613 616 618 619 632 642 643 645 # entrance opening
+1357 1377 1395 1420 1421 # cave next to the entrance
+537 654 655 651 1326 1330 1337 # more cave
+535 536 520 524 # extra cave sky that affects the "crouch here" space near the level entrance
+179 # fan shaft in crawl space
+799 807 818 821 855 857 864 867 870 871 872 970 971 972 # some windows in the final hall
+992 994 991 989
+3 11 670
+794
+166 181
+673

baseq2/maps/sky/base2.txt

@@ -0,0 +1,9 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+443 # fan shaft
+784 # windows in the bridge area
+238 239 240 279

baseq2/maps/sky/base3.txt

@@ -0,0 +1,10 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+1480 1582 1206 1207 1387 # skylight in a hallway
+1785 1793 1762 1668 # windows next to the key room
+# 1578 1579 1581 1577 1479 1580 # key room skylight
+519 590

baseq2/maps/sky/biggun.txt

@@ -0,0 +1,9 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+362 367 283 284 286 287 288 289 285 280 261
+# 263 275
+544 328

baseq2/maps/sky/boss1.txt

@@ -0,0 +1,9 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+# 0 110
+180 203 25 39
+32 229

baseq2/maps/sky/boss2.txt

@@ -0,0 +1,7 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+# space - environment is dim

baseq2/maps/sky/bunk1.txt

@@ -0,0 +1,10 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+890 891
+752
+346 347 334 335 338 339
+1204 1208 1210 1222 915 954

baseq2/maps/sky/city1.txt

@@ -0,0 +1,12 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+764 756 1240
+942 908 921 956
+302 327 350 355 # some part of the sky in the first area to keep caves illuminated at low/med GI
+1412 1476 1555
+1411 1475 1554 1556
+!all_lava

baseq2/maps/sky/city2.txt

@@ -0,0 +1,7 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+285 568 684

baseq2/maps/sky/city3.txt

@@ -0,0 +1,7 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+697 699

baseq2/maps/sky/command.txt

@@ -0,0 +1,7 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+1791 1792

baseq2/maps/sky/cool1.txt

@@ -0,0 +1,10 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+1268 1277
+0 16 17 18 101 133 134 135
+984 462
+653 682 685 671 672 637

baseq2/maps/sky/fact1.txt

@@ -0,0 +1,15 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+854 855
+834
+693 627 629
+725
+# 514 613 615 501 607 609 499 599 132 123 9 15 498 597 134
+60 61 62 68 69 70
+120 139 140 141 142
+1016 1018 # lava
+901

baseq2/maps/sky/fact2.txt

@@ -0,0 +1,6 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+

baseq2/maps/sky/fact3.txt

@@ -0,0 +1,7 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+97 238 189 11 191 9 10 190

baseq2/maps/sky/hangar1.txt

@@ -0,0 +1,10 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+6 316 333 560 561 569 570 1036 1037 1050
+1559 1568
+510 521 384
+1317 1496 1518 1526

baseq2/maps/sky/hangar2.txt

@@ -0,0 +1,13 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+0
+832 833 834 835 837 838 839 840 958 959 960 961 965
+493 494 495 496
+758 760 633 618 759 634 630 602 612 624 628 632 603 609 621 631 593 598 600 614 599 601 605
+761 1247
+186 184 352 491
+140 145 343 394

baseq2/maps/sky/jail1.txt

@@ -0,0 +1,12 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+1134 1135
+852 855 1630
+183 258 391 395 398
+1053
+736
+519 495 497

baseq2/maps/sky/jail2.txt

@@ -0,0 +1,11 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+46 50 54 58 60
+334 975 1064
+1399
+458 450 461 183 173 176
+502 503 509 185

baseq2/maps/sky/jail3.txt

@@ -0,0 +1,13 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+856 1332
+343 353 365
+1930 1932 1933 2036
+226 292
+1274 1730
+782
+2107 2119 2125 2126

baseq2/maps/sky/jail4.txt

@@ -0,0 +1,12 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+330 421
+1690 1695 1698 1697 # lava by the entrance
+363 489 490 388 389 827
+1552 1560
+1342 1361 1363
+305 453 447

baseq2/maps/sky/jail5.txt

@@ -0,0 +1,12 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+642 1010 646 1021
+575 581 619 604 605 753
+770 772 773 774 776 777 786 787
+142 144 136 165 166 28 29 30 31 # sky in the area around the mini-boss that affects the cave next to it
+1155 736
+15

baseq2/maps/sky/lab.txt

@@ -0,0 +1,7 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+# nothing here - underground

baseq2/maps/sky/mine1.txt

@@ -0,0 +1,13 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+1346 1396
+390 601 537 168 # subset of the skybox visible from a shaft below
+734 736 732 727 729 719 722 724 814 816 817 819 821 824 827 829 831 721 803 805 807 809 811 748 746 744 742 740
+268
+322 334
+25 34 38 40 42 44 125 127 131 136 144 460 118 446 465 470 472
+1387 1473

baseq2/maps/sky/mine2.txt

@@ -0,0 +1,9 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+783
+1591 1586 1606 1608 1611 1613 1615 1616 # lava
+781 782 784 786 788 # fan shaft

baseq2/maps/sky/mine3.txt

@@ -0,0 +1,7 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+# nothing here - underground

baseq2/maps/sky/mine4.txt

@@ -0,0 +1,11 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+425 432 434 380 383 409 412 385 347 343 378 339 335 361 331 333 307 309 372 359 356 374 341 354 345 420 440 407 414 388 436 311 416
+182 212 196 216 144 145 146 159 191 82 68 79 83 80 47 27 26 82 35 119 143 210 157 70 78 46 49 107 115 36 38 105 218 183 126 110
+1018 1016 1020 1065 1038 1044
+1034 1041 1068 1027 1069
+1559 1565 1568 1499 1563 1560 1503 1506 1385 1386 1404 1499 1371 1379 1386 1391 1509 1510 1501 1376 1399

baseq2/maps/sky/mintro.txt

@@ -0,0 +1,12 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+# some lava outdoors, skyboxes
+349 301 307
+428 471 909
+560 564 641
+752 754 761
+1457 1547 1551

baseq2/maps/sky/power1.txt

@@ -0,0 +1,9 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+1003 1006 1246 964 969 971 1242 1241 1243
+872 866 873 868
+0 19 528

baseq2/maps/sky/power2.txt

@@ -0,0 +1,13 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+55 79
+507 141
+1360 1361 1362 1363 1510
+1564 1568 1566 1572 1774 1775
+877 1228 1229
+692
+1628

baseq2/maps/sky/q2dm1.txt

@@ -0,0 +1,10 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+104 361 362
+96 98
+415 430
+528

baseq2/maps/sky/q2dm2.txt

@@ -0,0 +1,11 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+129 299 354 265
+126 301
+78 128
+127 264
+51 46 28 24

baseq2/maps/sky/q2dm3.txt

@@ -0,0 +1,7 @@
+# This file is part of the Q2RTX lighting system.
+# For this map, it lists BSP clusters with skybox and lava polygons
+# that have to be converted to analytic area lights.
+# For more information, see comments in the `path_tracer.h` file
+# in Q2RTX source code.
+
+698 699