From 31ab43a181f5b8f399761819baecce8194bb4e11 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 28 May 2023 11:37:35 -0600 Subject: [PATCH] tests: add q1_liquid_software.map (renders badly in tyrquake) --- testmaps/deprecated/hintskip.wad | Bin 16548 -> 22060 bytes testmaps/q1_liquid_software.map | 77 +++++++++++++++++++++++++++++++ tests/test_qbsp.cc | 8 +++- 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 testmaps/q1_liquid_software.map diff --git a/testmaps/deprecated/hintskip.wad b/testmaps/deprecated/hintskip.wad index ae1224cc367f1a7955866e651d6dee5a6c250cef..d76e418a7df5edb01206e491c706037f4712514c 100644 GIT binary patch delta 981 zcmb7DF>4f25T5sT_U-JxJ6<$Kb4{=iq6r>EQpM&LuC=fb8xevCIRX+?uoSIqmsh7t zdChU??=Zdo0!fj7;5TnQ?v%a4VRv@ld^6w7H+y&S$xNrFdR~toF%eCl&8nkOfA7Qb z``2&ZoleeZ@@h8tY_>uG3e#tR!yQ6AGy6CHLP+6wWrkhhhjtiW-s$zU9*K!1z8K!u zU?1m25De$T-MF*uHnmF%FJ1iEV(74nDPQ~nvi~ll`N810Xue*o5&5QD9DUAj&zXfl8z-oUN+TS951(&6bk4KZc;}OxxR(p>@v+{RUR{9MF Cj9FCx delta 25 gcmZ3phH*(FBUiYiixD#e1A~jhMlLId$!kIr0ACIVNB{r; diff --git a/testmaps/q1_liquid_software.map b/testmaps/q1_liquid_software.map new file mode 100644 index 00000000..81f55436 --- /dev/null +++ b/testmaps/q1_liquid_software.map @@ -0,0 +1,77 @@ +// Game: Quake +// Format: Valve +// entity 0 +{ +"mapversion" "220" +"classname" "worldspawn" +"wad" "deprecated/free_wad.wad;deprecated/hintskip.wad" +// brush 0 +{ +( 184 112 152 ) ( 184 -432 152 ) ( 184 112 -80 ) skip [ 0 1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 192 -432 -80 ) ( 184 -432 -80 ) ( 192 -432 152 ) skip [ 1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 192 112 -80 ) ( 184 112 -80 ) ( 192 -432 -80 ) skip [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 192 -432 152 ) ( 184 -432 152 ) ( 192 112 152 ) skip [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 192 112 152 ) ( 184 112 152 ) ( 192 112 -80 ) skip [ -1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 192 -432 152 ) ( 192 112 152 ) ( 192 -432 -80 ) skip [ 0 1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +} +// brush 1 +{ +( -176 -432 -80 ) ( -176 112 -80 ) ( -176 -432 152 ) skip [ 0 -1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( -176 -432 152 ) ( -168 -432 152 ) ( -176 -432 -80 ) skip [ 1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( -176 -432 -80 ) ( -168 -432 -80 ) ( -176 112 -80 ) skip [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -176 112 152 ) ( -168 112 152 ) ( -176 -432 152 ) skip [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -176 112 -80 ) ( -168 112 -80 ) ( -176 112 152 ) skip [ -1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( -168 -432 -80 ) ( -168 -432 152 ) ( -168 112 -80 ) skip [ 0 -1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +} +// brush 2 +{ +( -168 112 152 ) ( -168 104 152 ) ( -168 112 -80 ) skip [ 0 -1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 184 104 152 ) ( 184 104 -80 ) ( -168 104 152 ) skip [ -1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( -168 112 -80 ) ( -168 104 -80 ) ( 184 112 -80 ) skip [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 184 112 152 ) ( 184 104 152 ) ( -168 112 152 ) skip [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 184 112 152 ) ( -168 112 152 ) ( 184 112 -80 ) skip [ -1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 184 112 -80 ) ( 184 104 -80 ) ( 184 112 152 ) skip [ 0 1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +} +// brush 3 +{ +( -168 -432 -80 ) ( -168 -424 -80 ) ( -168 -432 152 ) skip [ 0 -1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 184 -432 -80 ) ( -168 -432 -80 ) ( 184 -432 152 ) skip [ 1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 184 -432 -80 ) ( 184 -424 -80 ) ( -168 -432 -80 ) skip [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -168 -432 152 ) ( -168 -424 152 ) ( 184 -432 152 ) skip [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -168 -424 -80 ) ( 184 -424 -80 ) ( -168 -424 152 ) skip [ 1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 184 -432 152 ) ( 184 -424 152 ) ( 184 -432 -80 ) skip [ 0 1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +} +// brush 4 +{ +( -168 -424 152 ) ( -168 -424 144 ) ( -168 104 152 ) skip [ 0 -1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 184 -424 152 ) ( 184 -424 144 ) ( -168 -424 152 ) skip [ 1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 184 104 144 ) ( -168 104 144 ) ( 184 -424 144 ) skip [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 184 104 152 ) ( 184 -424 152 ) ( -168 104 152 ) skip [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -168 104 152 ) ( -168 104 144 ) ( 184 104 152 ) skip [ -1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 184 104 152 ) ( 184 104 144 ) ( 184 -424 152 ) skip [ 0 1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +} +// brush 5 +{ +( -168 104 -80 ) ( -168 104 -72 ) ( -168 -424 -80 ) skip [ 0 -1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( -168 -424 -80 ) ( -168 -424 -72 ) ( 184 -424 -80 ) skip [ 1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( -168 104 -80 ) ( -168 -424 -80 ) ( 184 104 -80 ) skip [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -168 -424 -72 ) ( -168 104 -72 ) ( 184 -424 -72 ) skip [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 184 104 -80 ) ( 184 104 -72 ) ( -168 104 -80 ) skip [ -1 0 0 0 ] [ 0 0 -1 32 ] 0 1 1 +( 184 -424 -80 ) ( 184 -424 -72 ) ( 184 104 -80 ) skip [ 0 1 0 0 ] [ 0 0 -1 32 ] 0 1 1 +} +// brush 6 +{ +( -72 -48 48 ) ( -72 -48 -48 ) ( -72 -40 48 ) *waterskip [ 0 0 -1.0000000000000002 0 ] [ 0 -1.0000000000000002 0 0 ] 0 1 1 +( -24 -72 48 ) ( -24 -72 -48 ) ( -72 -72 48 ) *swater5 [ -1.0000000000000002 0 0 0 ] [ 0 0 -1.0000000000000002 16 ] 0 1 1 +( -24 -40 -48 ) ( -72 -40 -48 ) ( -24 -48 -48 ) *waterskip [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -24 -48 8 ) ( -72 -48 8 ) ( -24 -40 8 ) *swater5 [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -72 -40 48 ) ( -72 -40 -48 ) ( -24 -40 48 ) *waterskip [ -1.0000000000000002 0 0 0 ] [ 0 0 1.0000000000000002 48 ] 0 1 1 +( -24 -40 48 ) ( -24 -40 -48 ) ( -24 -48 48 ) *waterskip [ 0 0 1.0000000000000002 32 ] [ 0 -1.0000000000000002 0 0 ] 0 1 1 +} +} +// entity 1 +{ +"classname" "info_player_start" +"origin" "-96 -304 -40" +"angle" "90" +} diff --git a/tests/test_qbsp.cc b/tests/test_qbsp.cc index 3d9d58dd..be19a838 100644 --- a/tests/test_qbsp.cc +++ b/tests/test_qbsp.cc @@ -1815,4 +1815,10 @@ TEST_CASE("q1_sky_window") CHECK(BSP_FindFaceAtPoint(&bsp, &bsp.dmodels[0], qvec3d(-184, -288, 60))); // left CHECK(BSP_FindFaceAtPoint(&bsp, &bsp.dmodels[0], qvec3d(-184, -224, 60))); // right } -} \ No newline at end of file +} + +TEST_CASE("q1_liquid_software") +{ + INFO("map with just 1 liquid brush + a 'skip' platform, has render corruption on tyrquake"); + const auto [bsp, bspx, prt] = LoadTestmap("q1_liquid_software.map"); +}