Eric Wasylishen
f7ebe386f1
CI: require macOS 10.15 for std::filesystem
2021-10-05 18:24:11 -06:00
Eric Wasylishen
899f127806
CI: use Ubuntu 20.04 (for std::filesystem)
2021-10-05 18:21:44 -06:00
Eric Wasylishen
dc66c4d239
Revert change to JSON submodule commit
2021-10-05 18:07:53 -06:00
Eric Wasylishen
cbcf6c6be8
Trigger GitHub Actions
2021-10-05 18:04:39 -06:00
Jonathan
52839d4e7f
Run clang-format pass
2021-10-05 15:54:06 -04:00
Jonathan
4ad798e29c
Fix origin brushes
...
Fix merge stuff from qbsp-contentflags
2021-10-05 15:50:18 -04:00
Jonathan
7590230111
Merge remote-tracking branch 'remotes/origin/qbsp-contentflags' into type-cleanup
...
# Conflicts:
# bspinfo/bspinfo.cc
# common/bspfile.cc
# include/common/bspfile.hh
# qbsp/brush.cc
# qbsp/csg4.cc
# qbsp/portals.cc
# qbsp/qbsp.cc
# qbsp/solidbsp.cc
# qbsp/surfaces.cc
# qbsp/writebsp.cc
# vis/vis.cc
2021-10-05 01:21:16 -04:00
Eric Wasylishen
a91bc56aaa
qbsp: outside.cc: match original behaviour
2021-10-05 01:07:26 -04:00
Jonathan
0833d84a7a
Calculate tangents and bitangents (need to clean this up)
...
Implement formatters for qvec
Add -nolighting, which skips all non-lightstyled lights
2021-10-05 01:07:13 -04:00
Eric Wasylishen
997a039b65
vis: fix test failure with Q1
2021-10-04 21:21:53 -06:00
Eric Wasylishen
5b62f61b29
qbsp: revert contents handling to be closer to master
2021-10-04 20:39:47 -06:00
Eric Wasylishen
d56418ae95
Merge remote-tracking branch 'origin/master' into qbsp-contentflags
2021-10-04 20:38:49 -06:00
Eric Wasylishen
a79772d988
testmaps: fix stale hash for qbsp_func_detail_illusionary_plus_water.map
2021-10-04 20:25:26 -06:00
Eric Wasylishen
60d9d4daf4
bspinfo: also output face vertices
2021-10-04 19:53:03 -06:00
Eric Wasylishen
a7c3e70766
testmaps: add qbsp_func_detail_illusionary_plus_water.map
2021-10-04 19:27:24 -06:00
Eric Wasylishen
590dd47890
bspinfo: export more lumps to JSON (faces, edges, leaffaces, surfedges)
2021-10-04 18:17:52 -06:00
Jonathan
3b1347a812
Add NO_ITERATOR_DEBUG for debug mode
2021-10-04 05:56:46 -04:00
Eric Wasylishen
ee8ee57cc1
qbsp: delete brushbsp.cc
2021-10-03 20:13:21 -06:00
Eric Wasylishen
1ed4dc71ad
Merge remote-tracking branch 'origin/master' into qbsp-contentflags
2021-10-03 20:04:19 -06:00
Eric Wasylishen
640befb4dc
qbsp: write portals as binary to avoid line ending differences
2021-10-03 19:47:00 -06:00
Eric Wasylishen
d132a44dbc
qbsp3: remove unused code
2021-10-03 19:41:56 -06:00
Eric Wasylishen
baf1bdf732
testmaps: also check hashes of .prt files. run vis processes in parallel.
2021-10-03 19:26:40 -06:00
Eric Wasylishen
b01e9ef7b1
testmaps: add a new simple func_detail testmap
2021-10-03 19:19:11 -06:00
Eric Wasylishen
2560603f9b
qbsp: csg4.cc: bring closer to original behaviour
2021-10-03 12:32:50 -06:00
Eric Wasylishen
f0d12fc8f3
qbsp: Brush_LoadEntity: bring closer to the original code
2021-10-03 12:02:52 -06:00
Jonathan
037c587352
Merge remote-tracking branch 'remotes/origin/qbsp-contentflags' into type-cleanup
...
# Conflicts:
# bspinfo/bspinfo.cc
# include/common/bspfile.hh
# include/light/light.hh
# include/light/trace.hh
# light/light.cc
# light/ltface.cc
# light/trace.cc
# qbsp/brush.cc
# qbsp/csg4.cc
# qbsp/outside.cc
# qbsp/qbsp.cc
2021-10-03 13:08:50 -04:00
Jonathan
ae4512da2c
BSPX structurization and cleanup
...
Some more vec3_t removals
A bunch of float -> vec_t in light
Simplified construction of lockables
mapdata_t writes directly to an mbsp instead of vector copies
2021-10-03 12:16:13 -04:00
Eric Wasylishen
b78553d81b
qbsp: outside.cc: match original behaviour
2021-10-03 00:22:51 -06:00
Eric Wasylishen
2fc1e9099a
light: remove dead / non-working code for non-embree light tracing
2021-10-02 21:12:12 -06:00
Eric Wasylishen
8a7164791e
light: fix "don't do this on Q2" logic for 0 light faces
2021-10-02 21:00:45 -06:00
Eric Wasylishen
8c1c9965b4
Merge branch 'master' into qbsp-contentflags
2021-10-02 20:27:59 -06:00
Eric Wasylishen
3bd65d5aa5
testmaps: add lava, water, sky, origin to qbspfeatures.map
2021-10-02 20:15:43 -06:00
Eric Wasylishen
8fd3f14bf9
bspinfo: json export
...
Co-authored-by: Jonathan <jonno.5000@gmail.com>
2021-10-02 17:57:31 -06:00
Eric Wasylishen
a871b55419
bspxentry_t: make lumpdata a uint8_t*
2021-10-02 17:57:31 -06:00
Eric Wasylishen
9e9e21eaae
qbsp: move BSPX BRUSHLIST struct types out to bspfile.hh
2021-10-02 17:57:31 -06:00
Eric Wasylishen
5135ba05b6
build: delete unused files
...
Co-authored-by: Jonathan <jonno.5000@gmail.com>
2021-10-02 17:57:31 -06:00
Eric Wasylishen
542c530e56
3rdparty: replace json submodule with a minified fork
...
The main git repo is several hundred MB.
https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent
This is mentioned in https://github.com/nlohmann/json/blob/develop/README.md
2021-10-02 12:31:22 -06:00
Jonathan
792951792c
some more cleanup
2021-10-02 05:56:45 -04:00
Eric Wasylishen
59e71d7600
Merge branch 'master' into qbsp-contentflags
2021-10-01 23:39:12 -06:00
Eric Wasylishen
d4464a6503
testmaps: update hash
2021-10-01 23:25:39 -06:00
Eric Wasylishen
ddf2a36d39
qbsp: make func_detail_wall an alias for func_detail_fence
2021-10-01 23:18:27 -06:00
Eric Wasylishen
3e56b635c0
testmaps: update hashes
2021-10-01 23:17:48 -06:00
Eric Wasylishen
5dc3982a54
testmaps: update qbspfeatures.map
2021-10-01 22:58:45 -06:00
Eric Wasylishen
690ac8d24e
qbsp: Brush_GetContents_Q1: fix _mirrorinside
2021-10-01 21:19:18 -06:00
Jonathan
9d828d2085
Structured texture data!
...
Move vis decompress/compress back to vis since phs is handled there now too
Fix missing textures in Q1BSP
Comment areaportaling for now
2021-09-30 11:33:04 -04:00
Jonathan
74bbce9eab
First attempt at areaportals - sadly it seems like this method might not work with this compiler.
2021-09-28 13:17:27 -04:00
Jonathan
1a5dc9934f
Remove span offset code - the compression ratio was not worth it
...
Allow Q2-esque maps to compile under Q1 modes
Use Q2tools-adapted version of AddBrushBevels for compiling brush sides
Extended limits overflow code displays member that overflowed now, for debugging
2021-09-28 02:10:01 -04:00
Jonathan
cc932a96ee
Fix BSP being invalid in Q2 if vis is not run
...
Fixes for skylight in Q2
Don't throw on invalid area
2021-09-27 22:40:43 -04:00
Jonathan
b205127e81
Fix exactEmpty
...
Simplify output_dir
2021-09-27 21:03:24 -04:00
Jonathan
a6f6cc2d15
qvec now has an empty default initializer, for speed purposes; fixed up places that relied on this behavior
...
simplified constructor for qvec(T...) that uses fold expressions
simplified rgba_miptex_t
fixed a lot of broken winding_base_t behavior
merged all winding types into winding_base_t
removed now-empty files
2021-09-27 20:44:15 -04:00