From e4f6201bbed0f5b5dd1ac376e9edd2000298e710 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 22 May 2022 13:17:06 -0600 Subject: [PATCH] testbqsp: add simple_sealed_rotated --- qbsp/test_qbsp.cc | 5 +- testmaps/qbsp_simple_sealed_rotated.map | 70 +++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 testmaps/qbsp_simple_sealed_rotated.map diff --git a/qbsp/test_qbsp.cc b/qbsp/test_qbsp.cc index 2acc2553..53500bf6 100644 --- a/qbsp/test_qbsp.cc +++ b/qbsp/test_qbsp.cc @@ -389,10 +389,11 @@ TEST_CASE("chop_no_change", "[testmaps_q1]") // TODO: ideally we should check we get back the same brush pointers from ChopBrushes } - TEST_CASE("simple_sealed", "[testmaps_q1]") { - mbsp_t result = LoadTestmap("qbsp_simple_sealed.map"); + auto mapname = GENERATE("qbsp_simple_sealed.map", "qbsp_simple_sealed_rotated.map"); + + mbsp_t result = LoadTestmap(mapname); REQUIRE(map.brushes.size() == 6); diff --git a/testmaps/qbsp_simple_sealed_rotated.map b/testmaps/qbsp_simple_sealed_rotated.map new file mode 100644 index 00000000..e53fd237 --- /dev/null +++ b/testmaps/qbsp_simple_sealed_rotated.map @@ -0,0 +1,70 @@ +// Game: Quake +// Format: Valve +// entity 0 +{ +"mapversion" "220" +"classname" "worldspawn" +"wad" "deprecated/free_wad.wad;deprecated/fence.wad;deprecated/origin.wad;deprecated/hintskip.wad" +"_wateralpha" "0.5" +"_tb_def" "builtin:Quake.fgd" +// brush 0 +{ +( 121.17142559585812 -0.8040405071069046 208 ) ( 63.195959492893095 -217.17142559585812 208 ) ( 121.17142559585812 -0.8040405071069046 48 ) orangestuff8 [ 0 -1 0 -16 ] [ 0 0 -1 -16 ] 0 2 2 +( 82.79187743515854 -205.8577170968734 48 ) ( 67.33706421453346 -201.71661237523304 48 ) ( 82.79187743515854 -205.8577170968734 208 ) orangestuff8 [ -1 0 0 -16 ] [ 0 0 -1 -16 ] 180 2 2 +( 136.6262388164832 -4.945145228747261 48 ) ( 121.17142559585812 -0.8040405071069046 48 ) ( 78.65077271351818 -221.31253031749847 48 ) orangestuff8 [ 1 0 0 16 ] [ 0 -1 0 -16 ] 180 2 2 +( 78.65077271351818 -221.31253031749847 208 ) ( 63.195959492893095 -217.17142559585812 208 ) ( 136.6262388164832 -4.945145228747261 208 ) orangestuff8 [ -1 0 0 -16 ] [ 0 -1 0 -16 ] 180 2 2 +( 132.48513409484283 -20.39995844937235 208 ) ( 117.03032087421775 -16.25885372773199 208 ) ( 132.48513409484283 -20.39995844937235 48 ) orangestuff8 [ 1 0 0 16 ] [ 0 0 -1 -16 ] 180 2 2 +( 78.65077271351818 -221.31253031749847 208 ) ( 136.6262388164832 -4.945145228747261 208 ) ( 78.65077271351818 -221.31253031749847 48 ) orangestuff8 [ 0 -1 0 -16 ] [ 0 0 -1 -16 ] 0 2 2 +} +// brush 1 +{ +( -168.6262388164832 -155.05485477125274 48 ) ( -110.6507727135182 61.31253031749847 48 ) ( -168.6262388164832 -155.05485477125274 208 ) orangestuff8 [ 0 1 0 16 ] [ 0 0 -1 -16 ] 0 2 2 +( -164.48513409484286 -139.60004155062765 208 ) ( -149.03032087421775 -143.741146272268 208 ) ( -164.48513409484286 -139.60004155062765 48 ) orangestuff8 [ -1 0 0 -16 ] [ 0 0 -1 -16 ] 180 2 2 +( -168.6262388164832 -155.05485477125274 48 ) ( -153.17142559585812 -159.1959594928931 48 ) ( -110.6507727135182 61.31253031749847 48 ) orangestuff8 [ 1 0 0 16 ] [ 0 -1 0 -16 ] 180 2 2 +( -110.6507727135182 61.31253031749847 208 ) ( -95.19595949289308 57.17142559585811 208 ) ( -168.6262388164832 -155.05485477125274 208 ) orangestuff8 [ -1 0 0 -16 ] [ 0 -1 0 -16 ] 180 2 2 +( -114.79187743515857 45.85771709687339 48 ) ( -99.33706421453346 41.71661237523303 48 ) ( -114.79187743515857 45.85771709687339 208 ) orangestuff8 [ 1 0 0 16 ] [ 0 0 -1 -16 ] 180 2 2 +( -153.17142559585812 -159.1959594928931 48 ) ( -153.17142559585812 -159.1959594928931 208 ) ( -95.19595949289308 57.17142559585811 48 ) orangestuff8 [ 0 1 0 16 ] [ 0 0 -1 -16 ] 0 2 2 +} +// brush 2 +{ +( -95.19595949289308 57.17142559585811 208 ) ( -99.33706421453346 41.71661237523303 208 ) ( -95.19595949289308 57.17142559585811 48 ) orangestuff8 [ 0 1 0 16 ] [ 0 0 -1 -16 ] 0 2 2 +( 117.03032087421775 -16.25885372773199 208 ) ( 117.03032087421775 -16.25885372773199 48 ) ( -99.33706421453346 41.71661237523303 208 ) orangestuff8 [ 1 0 0 16 ] [ 0 0 -1 -16 ] 180 2 2 +( -95.19595949289308 57.17142559585811 48 ) ( -99.33706421453346 41.71661237523303 48 ) ( 121.17142559585812 -0.8040405071069046 48 ) orangestuff8 [ 1 0 0 16 ] [ 0 -1 0 -16 ] 180 2 2 +( 121.17142559585812 -0.8040405071069046 208 ) ( 117.03032087421775 -16.25885372773199 208 ) ( -95.19595949289308 57.17142559585811 208 ) orangestuff8 [ -1 0 0 -16 ] [ 0 -1 0 -16 ] 180 2 2 +( 121.17142559585812 -0.8040405071069046 208 ) ( -95.19595949289308 57.17142559585811 208 ) ( 121.17142559585812 -0.8040405071069046 48 ) orangestuff8 [ 1 0 0 16 ] [ 0 0 -1 -16 ] 180 2 2 +( 121.17142559585812 -0.8040405071069046 48 ) ( 117.03032087421775 -16.25885372773199 48 ) ( 121.17142559585812 -0.8040405071069046 208 ) orangestuff8 [ 0 -1 0 -16 ] [ 0 0 -1 -16 ] 0 2 2 +} +// brush 3 +{ +( -153.17142559585812 -159.1959594928931 48 ) ( -149.03032087421775 -143.741146272268 48 ) ( -153.17142559585812 -159.1959594928931 208 ) orangestuff8 [ 0 1 0 16 ] [ 0 0 -1 -16 ] 0 2 2 +( 63.195959492893095 -217.17142559585812 48 ) ( -153.17142559585812 -159.1959594928931 48 ) ( 63.195959492893095 -217.17142559585812 208 ) orangestuff8 [ -1 0 0 -16 ] [ 0 0 -1 -16 ] 180 2 2 +( 63.195959492893095 -217.17142559585812 48 ) ( 67.33706421453346 -201.71661237523304 48 ) ( -153.17142559585812 -159.1959594928931 48 ) orangestuff8 [ 1 0 0 16 ] [ 0 -1 0 -16 ] 180 2 2 +( -153.17142559585812 -159.1959594928931 208 ) ( -149.03032087421775 -143.741146272268 208 ) ( 63.195959492893095 -217.17142559585812 208 ) orangestuff8 [ -1 0 0 -16 ] [ 0 -1 0 -16 ] 180 2 2 +( -149.03032087421775 -143.741146272268 48 ) ( 67.33706421453346 -201.71661237523304 48 ) ( -149.03032087421775 -143.741146272268 208 ) orangestuff8 [ -1 0 0 -16 ] [ 0 0 -1 -16 ] 180 2 2 +( 63.195959492893095 -217.17142559585812 208 ) ( 67.33706421453346 -201.71661237523304 208 ) ( 63.195959492893095 -217.17142559585812 48 ) orangestuff8 [ 0 -1 0 -16 ] [ 0 0 -1 -16 ] 0 2 2 +} +// brush 4 +{ +( -149.03032087421775 -143.741146272268 224 ) ( -149.03032087421775 -143.741146272268 208 ) ( -99.33706421453346 41.71661237523303 224 ) orangestuff8 [ 0 1 0 16 ] [ 0 0 -1 0 ] 0 2 2 +( 67.33706421453346 -201.71661237523304 224 ) ( 67.33706421453346 -201.71661237523304 208 ) ( -149.03032087421775 -143.741146272268 224 ) orangestuff8 [ -1 0 0 -16 ] [ 0 0 -1 0 ] 180 2 2 +( 117.03032087421775 -16.25885372773199 208 ) ( -99.33706421453346 41.71661237523303 208 ) ( 67.33706421453346 -201.71661237523304 208 ) orangestuff8 [ -1 0 0 -16 ] [ 0 -1 0 -16 ] 180 2 2 +( 117.03032087421775 -16.25885372773199 224 ) ( 67.33706421453346 -201.71661237523304 224 ) ( -99.33706421453346 41.71661237523303 224 ) orangestuff8 [ -1 0 0 -16 ] [ 0 -1 0 -16 ] 180 2 2 +( -99.33706421453346 41.71661237523303 224 ) ( -99.33706421453346 41.71661237523303 208 ) ( 117.03032087421775 -16.25885372773199 224 ) orangestuff8 [ 1 0 0 16 ] [ 0 0 -1 0 ] 180 2 2 +( 117.03032087421775 -16.25885372773199 224 ) ( 117.03032087421775 -16.25885372773199 208 ) ( 67.33706421453346 -201.71661237523304 224 ) orangestuff8 [ 0 -1 0 -16 ] [ 0 0 -1 0 ] 0 2 2 +} +// brush 5 +{ +( -99.33706421453346 41.71661237523303 32 ) ( -99.33706421453346 41.71661237523303 48 ) ( -149.03032087421775 -143.741146272268 32 ) bolt16 [ 0 1 0 16 ] [ 0 0 -1 32 ] 0 2 2 +( -149.03032087421775 -143.741146272268 32 ) ( -149.03032087421775 -143.741146272268 48 ) ( 67.33706421453346 -201.71661237523304 32 ) bolt16 [ -1 0 0 -16 ] [ 0 0 -1 32 ] 180 2 2 +( -99.33706421453346 41.71661237523303 32 ) ( -149.03032087421775 -143.741146272268 32 ) ( 117.03032087421775 -16.25885372773199 32 ) bolt16 [ 1 0 0 16 ] [ 0 -1 0 -16 ] 180 2 2 +( -149.03032087421775 -143.741146272268 48 ) ( -99.33706421453346 41.71661237523303 48 ) ( 67.33706421453346 -201.71661237523304 48 ) bolt16 [ 1 0 0 16 ] [ 0 -1 0 -16 ] 180 2 2 +( 117.03032087421775 -16.25885372773199 32 ) ( 117.03032087421775 -16.25885372773199 48 ) ( -99.33706421453346 41.71661237523303 32 ) bolt16 [ 1 0 0 16 ] [ 0 0 -1 32 ] 180 2 2 +( 67.33706421453346 -201.71661237523304 32 ) ( 67.33706421453346 -201.71661237523304 48 ) ( 117.03032087421775 -16.25885372773199 32 ) bolt16 [ 0 -1 0 -16 ] [ 0 0 -1 32 ] 0 2 2 +} +} +// entity 1 +{ +"classname" "info_player_start" +"origin" "-58.7781 -85.1021 120" +"angle" "345" +}