qbsp: handle func_detail_fence + func_illusionary_visblocker in q1

Author: ericwa

common/bspfile.cc

@@ -320,14 +320,19 @@ struct gamedef_q1_like_t : public gamedef_t
          *
          * Normally solid leafs are not written and just referenced as leaf 0.
          */
-        if (contents.is_detail_fence() || contents.is_detail_wall()) {
-            return contentflags_t::make(EWT_VISCONTENTS_SOLID);
+        if (contents.flags & EWT_VISCONTENTS_WINDOW) {
+            // clear WINDOW and add SOLID
+            contents = contentflags_t::make((contents.flags & ~EWT_VISCONTENTS_WINDOW) | EWT_VISCONTENTS_SOLID);
+        }
+        if (contents.flags & EWT_VISCONTENTS_DETAIL_WALL) {
+            // clear DETAIL_WALL and add SOLID
+            contents = contentflags_t::make((contents.flags & ~EWT_VISCONTENTS_DETAIL_WALL) | EWT_VISCONTENTS_SOLID);
         }
 
-        if (contents.flags & EWT_VISCONTENTS_MIST) {
-            // clear mist. detail_illusionary on its own becomes CONTENTS_EMPTY,
+        if (contents.flags & (EWT_VISCONTENTS_MIST | EWT_VISCONTENTS_AUX)) {
+            // clear mist and aux. detail_illusionary on its own becomes CONTENTS_EMPTY,
             // detail_illusionary in water becomes CONTENTS_WATER, etc.
-            contents = contentflags_t::make(contents.flags & ~EWT_VISCONTENTS_MIST);
+            contents = contentflags_t::make(contents.flags & ~(EWT_VISCONTENTS_MIST | EWT_VISCONTENTS_AUX));
         }
         if (contents.flags & EWT_VISCONTENTS_ILLUSIONARY_VISBLOCKER) {
             // this exports as empty

common/bspfile_common.cc

@@ -330,6 +330,12 @@ std::ostream &operator<<(std::ostream &os, contents_t flags)
     return os;
 }
 
+std::ostream &operator<<(std::ostream &os, contentflags_t flags)
+{
+    os << get_contents_display(flags.flags);
+    return os;
+}
+
 // surfflags_t
 
 bool surfflags_t::is_nodraw() const

include/common/bspfile_common.hh

@@ -288,6 +288,7 @@ struct contentflags_t
 
 // gtest support
 std::ostream &operator<<(std::ostream &os, contents_t flags);
+std::ostream &operator<<(std::ostream &os, contentflags_t flags);
 
 enum q1_surf_flags_t : int32_t;
 enum q2_surf_flags_t : int32_t;

testmaps/q1_func_illusionary_visblocker_interactions.map

@@ -231,3 +231,48 @@
 "classname" "info_null"
 "origin" "48 248 56"
 }
+// entity 17
+{
+"classname" "func_illusionary_visblocker"
+"_mirrorinside" "0"
+// brush 0
+{
+( 384 80 -32 ) ( 384 81 -32 ) ( 384 80 -31 ) *zwater1 0 -48 0 1 1
+( 320 -48 -32 ) ( 320 -48 -31 ) ( 321 -48 -32 ) *zwater1 0 -48 0 1 1
+( 320 80 16 ) ( 321 80 16 ) ( 320 81 16 ) *zwater1 0 0 0 1 1
+( 560 128 128 ) ( 560 129 128 ) ( 561 128 128 ) *zwater1 0 0 0 1 1
+( 560 16 -16 ) ( 561 16 -16 ) ( 560 16 -15 ) *zwater1 0 -48 0 1 1
+( 464 128 -16 ) ( 464 128 -15 ) ( 464 129 -16 ) *zwater1 0 -48 0 1 1
+}
+}
+// entity 18
+{
+"classname" "func_illusionary_visblocker"
+// brush 0
+{
+( 512 80 -32 ) ( 512 81 -32 ) ( 512 80 -31 ) *zwater1 0 -48 0 1 1
+( 448 -48 -32 ) ( 448 -48 -31 ) ( 449 -48 -32 ) *zwater1 0 -48 0 1 1
+( 448 80 16 ) ( 449 80 16 ) ( 448 81 16 ) *zwater1 0 0 0 1 1
+( 688 128 128 ) ( 688 129 128 ) ( 689 128 128 ) *zwater1 0 0 0 1 1
+( 688 16 -16 ) ( 689 16 -16 ) ( 688 16 -15 ) *zwater1 0 -48 0 1 1
+( 592 128 -16 ) ( 592 128 -15 ) ( 592 129 -16 ) *zwater1 0 -48 0 1 1
+}
+}
+// entity 19
+{
+"classname" "func_detail_fence"
+// brush 0
+{
+( 528 -24 16 ) ( 528 -23 16 ) ( 528 -24 17 ) {trigger 0 0 0 1 1
+( 528 -24 16 ) ( 528 -24 17 ) ( 529 -24 16 ) {trigger 0 0 0 1 1
+( 528 -24 16 ) ( 529 -24 16 ) ( 528 -23 16 ) {trigger 0 0 0 1 1
+( 576 8 40 ) ( 576 9 40 ) ( 577 8 40 ) {trigger 0 0 0 1 1
+( 576 8 24 ) ( 577 8 24 ) ( 576 8 25 ) {trigger 0 0 0 1 1
+( 576 8 24 ) ( 576 8 25 ) ( 576 9 24 ) {trigger 0 0 0 1 1
+}
+}
+// entity 20
+{
+"classname" "ambient_comp_hum"
+"origin" "552 -8 24"
+}

tests/test_common.cc

@@ -356,6 +356,22 @@ TEST(common, q2Contents)
     }
 }
 
+TEST(common, q1ContentsRemap)
+{
+    auto *game_q1 = bspver_q1.game;
+    {
+        SCOPED_TRACE("all content types combined (should make a combination of all q1 types)");
+        auto all = contentflags_t::make(EWT_VISCONTENTS_SOLID | EWT_VISCONTENTS_SKY | EWT_VISCONTENTS_DETAIL_WALL |
+                                        EWT_VISCONTENTS_WINDOW | EWT_VISCONTENTS_ILLUSIONARY_VISBLOCKER |
+                                        EWT_VISCONTENTS_AUX | EWT_VISCONTENTS_LAVA | EWT_VISCONTENTS_SLIME |
+                                        EWT_VISCONTENTS_WATER | EWT_VISCONTENTS_MIST);
+
+        EXPECT_EQ(contentflags_t::make(EWT_VISCONTENTS_SOLID | EWT_VISCONTENTS_SKY | EWT_VISCONTENTS_LAVA |
+                                       EWT_VISCONTENTS_SLIME | EWT_VISCONTENTS_WATER),
+            game_q1->contents_remap_for_export(all, gamedef_t::remap_type_t::leaf));
+    }
+}
+
 TEST(common, q1ContentsRoundtrip)
 {
     auto *game_q1 = bspver_q1.game;

tests/test_qbsp.cc

@@ -698,6 +698,15 @@ TEST(testmapsQ1, q1FuncIllusionaryVisblockerInteractions)
         EXPECT_THAT(BSP_FindFacesAtPoint(&bsp, &bsp.dmodels[0], {424, 16, 104}).size(),
             testing::AllOf(testing::Ge(1), testing::Le(2)));
     }
+
+    {
+        SCOPED_TRACE("func_illusionary_visblocker with a func_detail_fence block inside");
+        SCOPED_TRACE("the fence should compile out as CONTENTS_SOLID");
+
+        auto *fence_leaf = BSP_FindLeafAtPoint(&bsp, &bsp.dmodels[0], {552, -8, 24});
+
+        EXPECT_EQ(fence_leaf->contents, CONTENTS_SOLID);
+    }
 }
 
 TEST(testmapsQ1, simpleWorldspawnWorldspawn)