33f1681261
bspfile.hh: updates to content type constants docs
2022-06-08 01:03:39 -06:00
6c3b8a9413
Merge branch 'type-cleanup' into brushbsp
2022-06-07 20:05:02 -06:00
4941a86cbe
qbsp: rest of fix for qbsp_q2_bmodel_collision, only needed on type-cleanup branch
2022-06-07 19:49:39 -06:00
d348a4cb6b
fix nodes getting negative planes from certain splits
...
# Conflicts:
# include/qbsp/brush.hh
# qbsp/solidbsp.cc
2022-06-07 20:31:28 -04:00
3d539b9660
fix nodes getting negative planes from certain splits
2022-06-07 20:30:10 -04:00
c5e864fca1
re-enable stuff
...
undo the shared lock stuff
2022-06-06 03:26:19 -04:00
8f50108b5e
slight optimization for winding_t: use memcpy directly. the copy constructor can't automatically optimize it into a memcpy because of the iterator wrapper.
...
use side_t where appropriate
add a shared lock to map.planes, and hide the original vector to prevent non-locked read/writes
move MakeSkipTexinfo to the beginning of the operation - make a global skip texinfo as the first texinfo. it will get culled out later if need be.
re-enable ChooseMidPlaneFromList; seems to work, but maybe there's a test that is failing that is the reason it was if'd out?
enable parallelization of PartitionBrushes since map.planes is lockable now
2022-06-05 22:52:02 -04:00
e3ee12e985
Merge branch 'type-cleanup' into brushbsp
2022-06-03 23:44:03 -06:00
b6c421d30e
bspfile.hh: #define -> constexpr for content flags
2022-06-03 20:12:04 -06:00
11f937f0ad
add mottling that was used for _minlight on objects in Q2 maps
...
fix _minlight for Q2
set up a few better defaults for Q2
temp-ish fix for areaportals
2022-06-02 01:05:41 -04:00
65852ef042
adjust settings_set to only accept one token per entry
...
radlights is now a set (only loads one though)
2022-06-01 20:42:06 -04:00
8b4bd6deeb
non-recursive method for animated textures; makes it easier to follow and makes sure the chain ends in -1
2022-06-01 17:42:37 -04:00
0f2ea5333d
move CompressRow/DecompressRow from vis to common
2022-05-24 21:01:41 -06:00
016e9a89f2
qbsp: fix base1.map leak with epsilon hacks
2022-05-22 00:38:08 -06:00
7481f25176
Merge remote-tracking branch 'github-desktop-paril/type-cleanup' into brushbsp
2022-05-21 16:40:33 -06:00
25b390aafe
qbsp: merge original brush lists when merging leafs in PruneNodes
2022-05-21 16:05:22 -06:00
3b83508f37
Revert "qbsp: remove unused face csg code"
...
This reverts commit 2ad9e27d3b
2022-05-21 01:44:59 -06:00
f6ba5d77f9
allow recompilation of PHS from PVS data via -phsonly
2022-05-21 02:45:30 -04:00
f8c227acbf
Merge branch 'type-cleanup' into brushbsp
2022-05-18 23:17:40 -06:00
b63eb11275
wadpath/xwadpath always take 1 argument
2022-05-18 17:50:05 -04:00
b21b7466ce
Merge branch 'type-cleanup' into brushbsp
2022-05-16 21:33:57 -06:00
e5685b0909
fix "soft"'s special weirdness
2022-05-15 21:27:34 -04:00
8012d46e46
fix this so soft works at the end of the list
2022-05-15 21:24:01 -04:00
ad85489580
fix windings > N being initialized wrongly
2022-05-15 21:07:35 -04:00
8fe5d9d694
common: adjust formatting of usage line
...
-remove version hash as it's printed above
-rename `usage` variable to `programDescription`
2022-05-15 17:44:17 -06:00
49c78292dd
testvis: stub setup
2022-05-15 15:52:54 -06:00
6f1ca3c79d
Merge branch 'type-cleanup' into brushbsp
2022-05-15 14:02:42 -06:00
d9c6e52bd3
Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup
2022-05-15 10:09:41 -04:00
e2512372c3
fix -convert not working properly for Q2 maps
...
begin code for alias files
2022-05-15 10:09:38 -04:00
c82741ff8a
Merge branch 'type-cleanup' into brushbsp
2022-05-15 00:46:49 -06:00
e834b848b9
qbsp: fix areanodes test
2022-05-15 00:15:17 -06:00
9c806d2d15
settings: don't call exit(0) in printHelp() as it's problematic for tests
2022-05-14 18:11:14 -06:00
c537ad39c1
qbsp: move wadlist to map struct
2022-05-14 15:55:18 -06:00
bc90198006
qbsp: move wal_cache to map struct
2022-05-14 15:29:58 -06:00
fa18a6755a
qbsp: fix q2 brush export breaking when multiple tests run
2022-05-14 15:13:47 -06:00
ba37ae3a54
move serialize_bsp() to common/bspinfo.cc
2022-05-14 14:54:21 -06:00
4957622c50
Merge branch 'type-cleanup' into brushbsp
2022-05-13 01:24:14 -06:00
0c27c92e41
vis: fix 32-bit shift warning
...
"result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)"
2022-05-12 00:37:22 -06:00
59db5bfdc5
Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup
...
# Conflicts:
# include/qbsp/qbsp.hh
# qbsp/map.cc
# qbsp/qbsp.cc
2022-05-11 09:50:46 -04:00
cbdb5c0c73
slight bit of cleaning
2022-05-11 09:46:39 -04:00
a1b8a38283
merge non-brush bsp specific changes from brushbsp branch
2022-05-11 01:58:53 -06:00
4a711908c8
Merge branch 'pr/322' into brushbsp
2022-05-11 00:29:58 -06:00
6e3bb91d98
build: fix build on macOS/clang
2022-05-11 00:21:14 -06:00
e9abb212bb
settings: allow setting_enum to parse numeric representation of enums
...
use it for light forumla. disallow enums in setting_numeric.
2022-05-10 22:55:41 -06:00
d390ac2030
build: restore !enum check on setting_numeric constructor and boolValue()
...
with non-MSVC workaround
2022-05-10 22:08:41 -06:00
abc799554d
build: fix all clang-cl warnings
2022-05-10 21:57:17 -06:00
d763b2e336
build: support clang-cl
2022-05-10 21:39:58 -06:00
66ba184083
Merge branch 'type-cleanup' into brushbsp
2022-05-10 00:47:41 -06:00
0c4833226a
settings: implement reset(). Fix setting_mangle::copyFrom()
...
We can't use the string serialization/deserialization trick because setting_mangle transforms
the value upon parsing
2022-05-10 00:43:22 -06:00
4042f1c7b9
light: fix compile after previous change
2022-05-09 23:27:33 -06:00
081d63a64c
settings: add setting_container::copyFrom, setting_base::copyFrom
...
disable copy constructors on setting_container/setting_base, which were previously available but broken
2022-05-09 22:32:09 -06:00
4021d71700
polylib: make operator[] un-bounds-checked
2022-05-08 15:20:21 -06:00
b06736dea4
qbsp: fix leak in base1leak test
2022-05-05 01:01:33 -06:00
5cae1919ce
qbsp: fix areaportals
2022-05-04 21:04:36 -06:00
1df848cfc1
testqbsp: areaportal test
2022-05-04 17:47:14 -06:00
e0d0d5246f
aabb: add disjoint_or_touching
2022-05-03 19:22:14 -06:00
893b0b080e
qbsp: move to unique_ptr<brush_t> vectors
2022-05-03 02:35:43 -06:00
ec20072440
testqbsp: expand q2 detail test
2022-05-02 20:24:18 -06:00
bec0357352
qbsp: proper marksurfaces population
2022-05-02 02:35:13 -06:00
fa97116d12
testqbsp: wip markfaces test
2022-05-02 02:13:54 -06:00
e1eb0e8cbd
qbsp: fix noclipfaces issues
2022-05-02 00:05:50 -06:00
3a30891476
testqbsp: add more detail_illusionary tests
2022-05-01 21:44:58 -06:00
59684a1c5d
Merge remote-tracking branch 'Paril/type-cleanup' into brushbsp
2022-05-01 01:21:01 -06:00
2ad9e27d3b
qbsp: remove unused face csg code
2022-05-01 01:13:03 -06:00
13612f18d0
qbsp: factor out 'chops' condition in BrushGE
2022-05-01 00:48:58 -06:00
81e0da4d62
qbsp: mark invisible sides on brush entities
...
fixes brush_clipping_order test failure
2022-05-01 00:01:11 -06:00
cc0e1a5561
move Face_IsLightmapped to light
...
Fix q2rtx, needs to include lightstyle for nodraw for emissive invisibles with lightstyles
fix wal (for the 900th time)
auto-set -nolighting for -q2rtx
2022-04-30 23:27:21 -04:00
1b852e3a20
fix WINDOW issue
...
surflight_subdivide minimum 1.0, to allow for people breaking their computers
2022-04-30 22:26:08 -04:00
5b4a9956c6
qbsp: add -debugchop
2022-04-30 15:10:19 -06:00
cb2268efdf
qbsp: initial ChopBrushes implementation
2022-04-30 14:33:26 -06:00
029e95dc3b
qbsp: add PruneNodes
2022-04-28 00:49:26 -06:00
fb59c2e950
bspfile.hh: q1 contents from #defines to constexpr
...
now prints properly in GTest assertions
2022-04-28 00:47:34 -06:00
8efb6f689b
qbsp: add -outsidedebug flag
2022-04-27 19:18:27 -06:00
10fbfff20d
qbsp: liquids are higher priority than detail_illsuionary
2022-04-27 01:26:56 -06:00
90e064e9e1
testqbsp: attempt to add a q2 test case (not working yet)
2022-04-26 23:45:44 -06:00
d5320d5aaa
qbsp: subdivide faces after merging
2022-04-26 21:41:03 -06:00
df9d530c21
qbsp: fix weird calling convention of SubdivideFace
2022-04-26 21:32:24 -06:00
d2c7412a44
testqbsp: proper test for detail_doesnt_remove_world_nodes
2022-04-26 19:08:44 -06:00
8731dcb469
bspfile.hh: remove covered_native
2022-04-26 01:23:36 -06:00
f9aa40a50f
qbsp: fix outside filling in maps with detail
2022-04-26 00:25:52 -06:00
1a0b4c0733
qbsp: more covered_native stuff to remove
2022-04-25 22:01:10 -06:00
9977c14a2f
bspfile: add gamedef_t::contents_seals_map()
2022-04-25 18:40:55 -06:00
064147b908
qbsp: move PortalizeWorld() to portals.hh
2022-04-24 01:07:20 -06:00
133ee77fc5
testqbsp: fix textures not loading in tests
2022-04-20 01:31:26 -06:00
aa3174d732
testqbsp: initialize filesystem the same as a regular qbsp run
2022-04-20 01:25:29 -06:00
78210947ff
qbsp: add -keepprt option
2022-04-19 01:03:18 -06:00
28c9cda561
Merge remote-tracking branch 'Paril/type-cleanup' into brushbsp
2022-04-17 13:46:50 -06:00
20a1b7b94b
qbsp: szBSPName -> bsp_path, szMapName -> map_path
2022-04-17 13:41:23 -06:00
91310ef6b8
Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup
2022-04-16 22:20:35 -04:00
0b41f0a03b
notriggermodels support
2022-04-16 22:20:29 -04:00
6080e7fc5d
a bit of q2rtx stuff
2022-04-16 10:28:46 -04:00
f467257f72
qbsp: start test case for qbsp_simple_sealed2.map
2022-04-15 21:05:14 -06:00
8a71b372bd
qbsp: remove unnecessary num*() helpers from mapdata_t
2022-04-15 00:27:50 -06:00
5df0dde756
map.cc: move rgfStartSpots to map struct
2022-04-11 17:49:49 -06:00
9d2f00a1b2
qbsp: tidying: move pWorldEnt() to mapdata_t
2022-04-11 00:13:42 -06:00
b7fbb48763
qbsp: enable new outside filling
2022-04-10 00:00:28 -06:00
a3d54cf48d
qbsp: remove unused face_t::original
2022-04-09 23:40:35 -06:00
407b39cad1
qbsp.hh: remove writebsp.hh and outside.hh includes
2022-04-09 23:30:42 -06:00
b736704e5e
qbsp.hh: remove portals.hh include
2022-04-09 23:28:12 -06:00
95824d26e4
qbsp.hh: remove surfaces.hh include
2022-04-09 23:25:54 -06:00
ca589906d8
qbsp.hh: remove merge.hh include
2022-04-09 23:25:01 -06:00
2e14909e84
qbsp.hh: remove map.hh include
2022-04-09 23:23:26 -06:00
f71ae3658e
qbsp.hh: remove solidbsp.hh include
2022-04-09 23:19:34 -06:00
147a76c11b
qbsp.hh: remove csg4.hh include
2022-04-09 23:17:43 -06:00
9295181f84
qbsp.hh: remove brush.hh include
2022-04-09 23:15:21 -06:00
39d1930446
outside.cc: prototype marking visible brush sides
2022-04-09 21:46:01 -06:00
edad06cc5a
qbsp: planning outside filling approach, wip
2022-04-05 19:46:59 -06:00
449b76db70
qbsp: remove unused region.hh header
2022-04-05 19:46:59 -06:00
24ca07188c
log: use ANSI colors for strings containing "warning" or "error"
2022-04-03 14:16:22 -06:00
a0fbfdbad5
log: use ANSI colors for strings containing "warning" or "error"
2022-04-03 12:56:11 -06:00
a019088c2f
Merge branch 'type-cleanup' into brushbsp
2022-04-02 21:05:46 -06:00
f5cda68416
clean up percent stuff
...
comment out "didn't split" message
fix winding resize
merge phong loops together
2022-03-07 14:49:50 -05:00
c81e9ace28
remove old threading code entirely
...
add new parallel logging stuff in common/parallel which wraps parallel_for(_each) and provides automatic percentage indicator
fix issue with light not pulling in settings
move logging stuff into its own namespace and simplify
2022-03-01 10:28:59 -05:00
a479a5ddfb
use case-insensitive natsort for discoverArchives
...
add two other logging control bools, which -quiet now redirect to
add -lowpriority for CPU priority (on Windows)
2022-02-28 09:20:35 -05:00
6baea3bc03
Fix three bugs that slipped by for cmdargs
...
Remove old threading code, use tbb internally
2022-02-27 04:09:28 -05:00
df92d9ce12
Command line args systems ( #2 )
...
* cmd
* cmake change for tbb DLLs
add in test for double-hyphens
* cmd
* game version
* settings!
* bsp texture usage
decompile fix for q1bsp
* finish up the options for qbsp
* light finished?
* finish up the few missing bits
* move scalar/int32 up
* Run clang-format pass
* natvis for our mathlib
use slightly faster storage for winding
fix light tests
* allow dictionary to be a base type
* re-run style
* Remove cfg_static
Fix options summary
* natvis for lockable_value<T>
* last-ish pass?
* format
* forgot last few lockables
2022-02-27 00:01:57 -05:00
658d807052
qbsp: finish re-adding CSG code
2022-02-21 12:35:27 -07:00
b04a6e9a30
qbsp: csg: re-add checking of map file order
2022-02-21 12:00:26 -07:00
3b348af301
qbsp: wip mirroring faces
2022-02-21 00:47:57 -07:00
91f7d9adaa
qbsp: remove surface_t
2022-02-21 00:05:48 -07:00
70ea752587
qbsp: restore MergeAll
2022-02-20 23:57:42 -07:00
cb464031da
qbsp: track original brushes, populate q2 leafbrushes accurately
2022-02-20 16:10:44 -07:00
8c84871129
qbsp: wip: add CSG-ing back in
2022-02-20 01:19:55 -07:00
5780ce4bd6
Include some headers for brushbsp branch files ( #325 )
...
* include <vector> for std::vector definition
* include <algorithm> for std::clamp definition
2022-02-19 11:17:20 -07:00
2a257693c6
Merge branch 'type-cleanup' into brushbsp
2022-02-17 00:43:08 -07:00
b0ece93f83
Fix/implement animated textures for Q2
2022-02-16 19:23:19 -05:00
055f865ef0
qbsp: add very rough pass of building visible faces
...
- faces are subdivided where neeed
- markfaces not calculated accurately
- overlaps/clipping not handled
2022-02-13 19:51:59 -07:00
1fbfd199c5
qbsp: wip port of BrushBSP from Q2 tools
...
currently can compile qbsp_simple.map (2 brushes)
no faces, but generates leafs/nodes which seem OK
2022-02-13 12:03:27 -07:00
dc10d90c36
add missing <list> include
2022-02-07 00:35:27 -07:00
6b5b426636
qbsp: remove internal list in face_t
2022-02-07 00:02:51 -07:00
ed325eedea
surface faces now use list/vector
2022-02-06 11:39:22 -07:00
8531286777
qbsp: replace `-nothreads` with `-threads 1` for consistency with light/vis
2022-01-30 17:50:21 -07:00
15484b55f8
Use better tjunction vertex addition
...
Parallel MergeAll
Allow modifyable iterators from polylib; resizing may invalidate them however
2022-01-28 09:45:29 -05:00
d076920665
Revert "Instead of calculating brush extents globally, do it per brush creation"
...
This reverts commit 069720078f
2022-01-27 01:52:08 -05:00
069720078f
Instead of calculating brush extents globally, do it per brush creation
...
Use portal node bounds for extents
2022-01-27 01:03:38 -05:00
3f37de95a5
Fix tests
2022-01-26 18:15:53 -05:00
93505a88b2
Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup
2022-01-26 18:03:36 -05:00
571e7337fc
Fix the temporary hintskip detection and finally move it to gamedef
...
Dynamic extent calculation - turned on by default - will automatically determine the extents used for winding_from_plane beforehand. On a 50kb .map file it only takes about 10ms, so for the majority of maps it should be instantaneous.
2022-01-26 18:03:31 -05:00
19dbc1c1c8
polylib: fix compile error with clang
2022-01-25 19:55:07 -07:00
0414c77c19
Use copies rather than moving for conversion, so that graceful upgrades are graceful again
2022-01-25 04:49:20 -05:00
ff2ff5c87f
fix emplace UB
2022-01-25 04:21:07 -05:00
f9f76b6dbb
skip the flips - saves us a bit of time!
2022-01-25 04:18:52 -05:00
674be0c812
Fix a few messages (missing newlines, period in wrong place)
...
Use fragments to store TJunction bits instead of having them in separate-but-chained faces
2022-01-25 03:23:39 -05:00
dfd31d7441
make markfaces a vector to simplify usage
2022-01-25 00:13:12 -05:00
1764afb475
Revert "Revert "make brush::faces a vector""
...
This reverts commit 11d2d51165
2022-01-24 14:55:21 -05:00
11d2d51165
Revert "make brush::faces a vector"
...
This reverts commit 30c7ef94ac
2022-01-24 14:26:28 -05:00
be865bc5b8
Fix `face_get_contents` not handling hintskip properly
...
Simplify `Brush_GetContents` and use the first non-skip face as the base contents
Move period out of `LoadExternalMap` error message so it doesn't confuse the reader
Fix `WriteEntitiesToString` crashing on entities without any brushes (note: need a column/line on mapentity in future)
2022-01-23 23:18:59 -05:00
e92b9f1ff9
Fix miscalculation for has_struct
...
Remove unused variable
2022-01-23 21:48:24 -05:00
5d6d7a71a2
Fix missing includes for list
2022-01-23 19:28:50 -05:00
75339df231
Simplify surface_t by using lists
2022-01-23 19:00:01 -05:00
Eric Wasylishen
Jonathan
xDShot