olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into pr/322

This commit is contained in:
Eric Wasylishen 2021-10-08 19:04:48 -06:00
parent 5cf82ee023 f0e3d32ffc
commit 100d364edf
6 changed files with 4121 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testmaps/automatated_tests.sh
View File

@ -16,6 +16,9 @@ set -x
UPDATE_HASHES=0
if [[ "$1" == "--update-hashes" ]]; then
UPDATE_HASHES=1
elif [[ "$1" != "" ]]; then
echo "usage: ./automated_tests.sh [--update-hashes]"
exit 1
fi
# checking for lack of crashes
@ -38,6 +41,7 @@ light invalid_texture_axes.map || exit 1
HASH_CHECK_BSPS="qbsp_func_detail.bsp \
qbsp_func_detail_illusionary_plus_water.bsp \
qbsp_origin.bsp \
qbsp_angled_brush.bsp \
e1m1-bsp29.bsp \
e1m1-bsp2.bsp \
e1m1-2psb.bsp \
@ -55,7 +59,8 @@ HASH_CHECK_PRTS=${HASH_CHECK_BSPS//.bsp/.prt}
# directly to the git repo, so we can print a diff
COMMIT_JSON_MAPS="qbsp_func_detail.bsp \
qbsp_func_detail_illusionary_plus_water.bsp \
qbsp_origin.bsp"
qbsp_origin.bsp \
qbsp_angled_brush.bsp"
# smaller test maps for specific features/combinations
# check .json diff of COMMIT_JSON_MAPS

1
testmaps/qbsp-vis.sha256sum
View File

@ -1,6 +1,7 @@
415d75b92b48e753b3ffc462b9e002a6c4e659481e8cc7609b268d03d0985029 *qbsp_func_detail.bsp
c9524f3858d9df55f612fb4b75670434712c2ed58a37e8534bf48f82eb6f81db *qbsp_func_detail_illusionary_plus_water.bsp
75e19d355b3c39acac2dcd2e17616fbbeb25d16cc0a240817f3abbb30f5e92bf *qbsp_origin.bsp
c2e343508067ae349e77381eb296dc52eb7e54d7022c865952595b33cd9fdac4 *qbsp_angled_brush.bsp
c3e0cfd0388a730835a73eb33155a454e459d2173e4b2e4df3825a45e1d9b34e *e1m1-bsp29.bsp
6c1280a4db77acd2076a47cf918f1ef7d60e6646bfb995373c122fe74522d495 *e1m1-bsp2.bsp
c73b5d7c4a769fc49ef84f7dd5e1c0e241526ba38ed3c65995f0addbf5052bb1 *e1m1-2psb.bsp

2
testmaps/qbsp.sha256sum
View File

@ -1,6 +1,7 @@
6b27857f7fca00c0412998db914f19f1e0c1408dbbd8800230589a39c67b94bb *qbsp_func_detail.bsp
9c316cfa2587aba74925a96883bc5553490daf14ad3ed31a2669cfd7a53036a2 *qbsp_func_detail_illusionary_plus_water.bsp
c8839aa94da63cfe5d0c796be747cc9a108a1ad10df42c86d849c545fe85f472 *qbsp_origin.bsp
0fd7181be8b3c6ad50369f74e191371227ed8e61a8ea1abc0096cb117c816501 *qbsp_angled_brush.bsp
9c8e99b94adab8a1c167585cea24b93f5de97eb27edfa1d1bdf62e65b8c41225 *e1m1-bsp29.bsp
663d18865131d41cd2e3114c1cbe19d81aadd12bd6c76b8500508b9216bbf167 *e1m1-bsp2.bsp
1a1b53f1bdebf966a0846b9466638c0b3b3678eee6488fb572dd9a9ccd7b3084 *e1m1-2psb.bsp
@ -14,6 +15,7 @@ af969da100d8dda94d355277c60382c925aabe18c6a4ce9b7500e4e43313f7f4 *e1m1-bspxbrush
abf3633d5a6d0e167ce9bacec476d3408c8240df5f3d72d14867cd201d4e3674 *qbsp_func_detail.prt
c0995c6b92256fa048c1a755ebe7e07f5fae33cb64e3c53adc234380fe44f267 *qbsp_func_detail_illusionary_plus_water.prt
b1ac538e53efc28ace2088324b1c0504d0f09b013d30b39ce231d76124bc6c22 *qbsp_origin.prt
00cc54b056ec14bb918fc3b30dab4b01b71f95bbca628206734b6d6f9aa19e10 *qbsp_angled_brush.prt
8d7c5ea9f0fafbc2aec52ceeb8b3dd464a0da2935abf878bfb27c3961e17e436 *e1m1-bsp29.prt
8d7c5ea9f0fafbc2aec52ceeb8b3dd464a0da2935abf878bfb27c3961e17e436 *e1m1-bsp2.prt
8d7c5ea9f0fafbc2aec52ceeb8b3dd464a0da2935abf878bfb27c3961e17e436 *e1m1-2psb.prt

84
testmaps/qbsp_angled_brush.map Normal file
View File

@ -0,0 +1,84 @@
// 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:Quoth2.fgd"
// brush 0
{
( -176 -256 64 ) ( -176 -255 64 ) ( -176 -256 65 ) tsl_wall1 [ 0 -1 0 0 ] [ 0 0 -1 -32 ] 0 1 1
( -176 -432 64 ) ( -176 -432 65 ) ( -175 -432 64 ) tsl_wall1 [ 1 0 0 16 ] [ 0 0 -1 -32 ] 0 1 1
( -176 -256 96 ) ( -175 -256 96 ) ( -176 -255 96 ) tsl_wall1 [ -1 0 0 -16 ] [ 0 -1 0 0 ] 0 1 1
( -160 192 352 ) ( -160 193 352 ) ( -159 192 352 ) tsl_wall1 [ 1 0 0 16 ] [ 0 -1 0 0 ] 0 1 1
( -160 176 80 ) ( -159 176 80 ) ( -160 176 81 ) tsl_wall1 [ -1 0 0 -16 ] [ 0 0 -1 -32 ] 0 1 1
( -160 192 80 ) ( -160 192 81 ) ( -160 193 80 ) tsl_wall1 [ 0 1 0 0 ] [ 0 0 -1 -32 ] 0 1 1
}
// brush 1
{
( -160 176 88 ) ( -160 177 88 ) ( -160 176 89 ) tsl_wall1 [ 0 1.0000000000000002 0 -32 ] [ 0 0 -1.0000000000000002 -32 ] 0 1 1
( -160 176 88 ) ( -160 176 89 ) ( -159 176 88 ) tsl_wall1 [ -1 0 0 -16 ] [ 0 0 -1 -32 ] 0 1 1
( -160 176 96 ) ( -159 176 96 ) ( -160 177 96 ) tsl_wall1 [ -1.0000000000000002 0 0 -16 ] [ 0 1.0000000000000002 0 -40 ] 0 1 1
( 288 192 352 ) ( 288 193 352 ) ( 289 192 352 ) tsl_wall1 [ -1.0000000000000002 0 0 -16 ] [ 0 -1.0000000000000002 0 48 ] 0 1 1
( 288 192 96 ) ( 289 192 96 ) ( 288 192 97 ) tsl_wall1 [ -1 0 0 -16 ] [ 0 0 -1 -32 ] 0 1 1
( 288 192 96 ) ( 288 192 97 ) ( 288 193 96 ) tsl_wall1 [ 0 -1.0000000000000002 0 0 ] [ 0 0 -1.0000000000000002 -32 ] 0 1 1
}
// brush 2
{
( -160 -112 96 ) ( -160 -111 96 ) ( -160 -112 97 ) orangestuff8 [ 0 1 0 -16 ] [ 0 0 -1 0 ] 0 1 1
( -80 -432 80 ) ( -81 -432 80 ) ( -80 -432 81 ) orangestuff8 [ -1 0 0 16 ] [ 0 0 -1 0 ] 180 1 1
( -80 -432 80 ) ( -80 -431 80 ) ( -81 -432 80 ) orangestuff8 [ 1 0 0 -16 ] [ 0 -1 0 16 ] 180 1 1
( -160 -112 96 ) ( -161 -112 96 ) ( -160 -111 96 ) orangestuff8 [ -1 0 0 16 ] [ 0 -1 0 16 ] 180 1 1
( -160 176 96 ) ( -160 176 97 ) ( -161 176 96 ) orangestuff8 [ 1 0 0 -16 ] [ 0 0 -1 0 ] 180 1 1
( 288 -432 80 ) ( 288 -432 81 ) ( 288 -431 80 ) orangestuff8 [ 0 -1 0 16 ] [ 0 0 -1 0 ] 0 1 1
}
// brush 3
{
( -160 -448 88 ) ( -160 -447 88 ) ( -160 -448 89 ) tsl_wall1 [ 0 1.0000000000000002 0 80 ] [ 0 0 -1.0000000000000002 -32 ] 0 1 1
( -160 -448 88 ) ( -160 -448 89 ) ( -159 -448 88 ) tsl_wall1 [ -1 0 0 -16 ] [ 0 0 -1 -32 ] 0 1 1
( -160 -448 96 ) ( -159 -448 96 ) ( -160 -447 96 ) tsl_wall1 [ -1.0000000000000002 0 0 -16 ] [ 0 1.0000000000000002 0 72 ] 0 1 1
( 288 -432 352 ) ( 288 -431 352 ) ( 289 -432 352 ) tsl_wall1 [ -1.0000000000000002 0 0 -16 ] [ 0 -1.0000000000000002 0 -64 ] 0 1 1
( 288 -432 96 ) ( 289 -432 96 ) ( 288 -432 97 ) tsl_wall1 [ -1 0 0 -16 ] [ 0 0 -1 -32 ] 0 1 1
( 288 -432 96 ) ( 288 -432 97 ) ( 288 -431 96 ) tsl_wall1 [ 0 -1.0000000000000002 0 -112 ] [ 0 0 -1.0000000000000002 -32 ] 0 1 1
}
// brush 4
{
( -160 -256 352 ) ( -160 -255 352 ) ( -160 -256 353 ) orangestuff8 [ 0 0 -1.0000000000000002 0 ] [ 0 -1.0000000000000002 0 0 ] 180 1 1
( 288 -432 360 ) ( 288 -432 361 ) ( 289 -432 360 ) orangestuff8 [ -1.0000000000000002 0 0 0 ] [ 0 0 1.0000000000000002 -16 ] 180 1 1
( -160 -256 352 ) ( -159 -256 352 ) ( -160 -255 352 ) orangestuff8 [ -1 0 0 0 ] [ 0 -1 0 0 ] 180 1 1
( 288 176 368 ) ( 288 177 368 ) ( 289 176 368 ) orangestuff8 [ -1 0 0 0 ] [ 0 -1 0 0 ] 180 1 1
( 288 176 360 ) ( 289 176 360 ) ( 288 176 361 ) orangestuff8 [ -1.0000000000000002 0 0 0 ] [ 0 0 1.0000000000000002 -16 ] 180 1 1
( 288 176 360 ) ( 288 176 361 ) ( 288 177 360 ) orangestuff8 [ 0 0 1.0000000000000002 0 ] [ 0 -1.0000000000000002 0 0 ] 180 1 1
}
// brush 5
{
( 288 192 80 ) ( 288 193 80 ) ( 288 192 81 ) tsl_wall1 [ 0 1 0 0 ] [ 0 0 -1 -32 ] 0 1 1
( 304 -432 64 ) ( 303 -432 64 ) ( 304 -432 65 ) tsl_wall1 [ -1 0 0 16 ] [ 0 0 -1 -32 ] 180 1 1
( 304 -256 96 ) ( 304 -255 96 ) ( 303 -256 96 ) tsl_wall1 [ 1 0 0 -16 ] [ 0 -1 0 0 ] 180 1 1
( 304 -256 352 ) ( 303 -256 352 ) ( 304 -255 352 ) tsl_wall1 [ 1 0 0 -16 ] [ 0 -1 0 0 ] 180 1 1
( 288 176 80 ) ( 288 176 81 ) ( 287 176 80 ) tsl_wall1 [ 1 0 0 -16 ] [ 0 0 -1 -32 ] 180 1 1
( 304 -256 64 ) ( 304 -256 65 ) ( 304 -255 64 ) tsl_wall1 [ 0 -1 0 0 ] [ 0 0 -1 -32 ] 0 1 1
}
// brush 6
{
( 110 -174 62.94617613083766 ) ( 109.49999999999996 -173.5000000000001 63.6532829120242 ) ( 110.49999999999994 -174.50000000000009 63.6532829120242 ) tsl_wall1 [ -0.4999999999999993 0.5000000000000003 -0.7071067811865477 106.509674 ] [ 0.4999999999999995 -0.5000000000000007 -0.7071067811865474 -97.49033 ] 315 1 1
( 135.94112549695427 -132.05887450304584 51.63246763185289 ) ( 136.64823227814082 -131.3517677218593 51.63246763185289 ) ( 135.44112549695427 -131.55887450304584 52.339574413039436 ) tsl_wall1 [ 0.7071067811865483 0.7071067811865468 0 -66.74516 ] [ 0.4999999999999996 -0.5000000000000007 -0.7071067811865475 -97.49033 ] 327.3501 1 1
( 168.50966799187813 -51.49033200812204 198.71067811865476 ) ( 169.21677477306469 -50.783225226935485 198.71067811865476 ) ( 169.00966799187816 -51.99033200812204 199.4177848998413 ) tsl_wall1 [ -0.4999999999999994 0.5000000000000004 -0.7071067811865478 106.509674 ] [ -0.7071067811865483 -0.7071067811865468 0 98.74516 ] 32.6499 1 1
( 89.94112549695433 -86.05887450304577 139.31370849898477 ) ( 90.44112549695433 -86.55887450304577 140.0208152801713 ) ( 90.64823227814087 -85.35176772185923 139.31370849898477 ) tsl_wall1 [ -0.4999999999999994 0.5000000000000004 -0.7071067811865478 106.509674 ] [ 0.7071067811865483 0.7071067811865468 0 -114.74516 ] 327.3501 1 1
( 248.50966799187808 -131.49033200812215 153.45584412271575 ) ( 248.00966799187808 -130.99033200812215 154.1629509039023 ) ( 249.21677477306463 -130.7832252269356 153.45584412271575 ) tsl_wall1 [ -0.7071067811865483 -0.7071067811865468 0 98.74516 ] [ 0.4999999999999996 -0.5000000000000007 -0.7071067811865475 -97.49033 ] 32.6499 1 1
( 235.8233764908629 -96.17662350913739 119.51471862576146 ) ( 236.3233764908629 -96.67662350913739 120.22182540694801 ) ( 235.3233764908629 -95.67662350913739 120.22182540694801 ) tsl_wall1 [ -0.4999999999999993 0.5000000000000003 -0.7071067811865477 106.509674 ] [ 0.4999999999999995 -0.5000000000000007 -0.7071067811865474 -97.49033 ] 45 1 1
}
}
// entity 1
{
"classname" "light"
"origin" "56 -40 200"
"light" "3000"
}
// entity 2
{
"classname" "info_player_start"
"origin" "-88 -64 120"
}

3940
testmaps/reference_bsp_json/qbsp_angled_brush.bsp.json Normal file
View File

File diff suppressed because it is too large Load Diff

88
testmaps/reference_bsp_json/qbsp_angled_brush.bsp.qbsplog Normal file
View File

@ -0,0 +1,88 @@
---- qbsp / ericw-tools v0.18.1-373-gca7002c ----
Input file: qbsp_angled_brush.map
Output file: qbsp_angled_brush.bsp
SetQdirFromPath: no "maps" in 'C:\Users\Eric\Documents\ericwtools-vcpkgtest\testmaps\/qbsp_angled_brush.map'
---- LoadMapFile ----
*** WARNING 06: No info_player_deathmatch entities in level
42 faces
7 brushes
3 entities
2 unique texnames
31 texinfo
Opened WAD: deprecated/free_wad.wad
Opened WAD: deprecated/fence.wad
Opened WAD: deprecated/origin.wad
Opened WAD: deprecated/hintskip.wad
Processing hull 0...
---- Brush_LoadEntity ----
7 brushes
18 planes
---- CSGFaces ----
42 brushfaces
42 csgfaces
42 mergedfaces
---- SolidBSP ----
30 split nodes
7 solid leafs
24 empty leafs
0 water leafs
0 detail leafs
0 detail illusionary leafs
0 detail fence leafs
0 illusionary visblocker leafs
156 leaffaces
126 nodefaces
---- Portalize ----
24 vis leafs
24 vis clusters
52 vis portals
---- FillOutside ----
18 outleafs
---- MergeAll ----
12 mergefaces
---- SolidBSP ----
12 split nodes
7 solid leafs
6 empty leafs
0 water leafs
0 detail leafs
0 detail illusionary leafs
0 detail fence leafs
0 illusionary visblocker leafs
68 leaffaces
38 nodefaces
---- Portalize ----
6 vis leafs
6 vis clusters
12 vis portals
---- Tjunc ----
40 world edges
124 edge points
16 edges added by tjunctions
0 faces added by tjunctions
---- MakeFaceEdges ----
---- GrowRegions ----
Processing hull 1...
Processing hull 2...
---- WriteBSPFile ----
Writing qbsp_angled_brush.bsp as BSP version Quake BSP
Wrote qbsp_angled_brush.bsp
1 models
58 planes 1160
50 vertexes 600
12 nodes 288
9 texinfos 360
38 faces 760
70 clipnodes 560
7 leafs 196
68 marksurfaces 136
85 edges 340
168 surfedges 672
2 textures 27292
lightdata 0
visdata 0
entdata 319
0.055 seconds elapsed