0d06489016
qbsp: change HashVec to inline (fixing macOS build)
2021-10-06 16:38:24 -06:00
16d3bcc7c7
Revert "clang /macOS: un-constexpr things that were erroring"
...
This reverts commit 33745c3cb8
2021-10-06 03:42:46 -04:00
a84de6a2d6
csg4.cc: don't use alloca inside loop
...
it's crashing in release builds on macOS..
not sure exactly why, but it's also leaking stack
since none of them are freed until the function exits
2021-10-06 01:02:03 -06:00
22145327e6
qbsp: fix use-reference-after-vector-resize
2021-10-06 00:19:47 -06:00
097f033eb8
testqbsp: fix build
2021-10-05 23:41:43 -06:00
fd28067b5c
fix gcc errors about reference to temporary
2021-10-05 23:28:33 -06:00
33745c3cb8
clang /macOS: un-constexpr things that were erroring
...
neither clang nor gcc like the qvec(Args..) constructor
being constexpr.
GCC's error says:
error: member ‘qvec<3, double>::v’ must be initialized by mem-initializer in ‘constexpr’ constructor
2021-10-05 23:18:52 -06:00
c54fea1e87
qbsp: face_t: use a std::vector for edges
...
shared_ptr of C arrays is not working on macOS,
but std::vector is also more correct semantically
2021-10-05 23:15:43 -06:00
52839d4e7f
Run clang-format pass
2021-10-05 15:54:06 -04:00
4ad798e29c
Fix origin brushes
...
Fix merge stuff from qbsp-contentflags
2021-10-05 15:50:18 -04:00
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
a91bc56aaa
qbsp: outside.cc: match original behaviour
2021-10-05 01:07:26 -04:00
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
5b62f61b29
qbsp: revert contents handling to be closer to master
2021-10-04 20:39:47 -06:00
ee8ee57cc1
qbsp: delete brushbsp.cc
2021-10-03 20:13:21 -06:00
1ed4dc71ad
Merge remote-tracking branch 'origin/master' into qbsp-contentflags
2021-10-03 20:04:19 -06:00
640befb4dc
qbsp: write portals as binary to avoid line ending differences
2021-10-03 19:47:00 -06:00
2560603f9b
qbsp: csg4.cc: bring closer to original behaviour
2021-10-03 12:32:50 -06:00
f0d12fc8f3
qbsp: Brush_LoadEntity: bring closer to the original code
2021-10-03 12:02:52 -06:00
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
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
b78553d81b
qbsp: outside.cc: match original behaviour
2021-10-03 00:22:51 -06:00
9e9e21eaae
qbsp: move BSPX BRUSHLIST struct types out to bspfile.hh
2021-10-02 17:57:31 -06:00
792951792c
some more cleanup
2021-10-02 05:56:45 -04:00
59e71d7600
Merge branch 'master' into qbsp-contentflags
2021-10-01 23:39:12 -06:00
ddf2a36d39
qbsp: make func_detail_wall an alias for func_detail_fence
2021-10-01 23:18:27 -06:00
690ac8d24e
qbsp: Brush_GetContents_Q1: fix _mirrorinside
2021-10-01 21:19:18 -06:00
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
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
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
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
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
87d31e6d4f
A lot of type-y stuff here:
...
- bsp store vectors now
- vis stored in a way that is compatible with both Q2 and Q1
- binary reading of stuff, so swapping is done at load time now
- vis cleanup, although there's still a lot of raw long modification that should get simplified later
2021-09-25 23:58:02 -04:00
b36c428bef
brush.cc: attempt to fix test failures
2021-09-25 21:13:42 -06:00
5a1cb66308
brush.cc: fix sorting of clip brushes
2021-09-25 19:04:47 -06:00
54d7f50b38
brush.cc: clear CFLAGS_CLIP on bmodels to match old behaviour
2021-09-25 18:04:57 -06:00
f1744118e2
qbsp: move BSPX BRUSHLIST struct types out to bspfile.hh
2021-09-25 15:42:42 -06:00
f7c0c80a26
qbsp, light: allow _minlight to go up to 510 instead of 255 on func_detail/etc.
2021-09-25 13:11:15 -06:00
41b9a79e83
Merge branch 'qbsp-contentflags' into type-cleanup
...
# Conflicts:
# bsputil/bsputil.cc
# common/bspfile.cc
# common/cmdlib.cc
# include/common/bspfile.hh
# include/common/cmdlib.hh
# qbsp/brush.cc
# qbsp/portals.cc
# qbsp/writebsp.cc
# vis/vis.cc
2021-09-23 18:42:25 -04:00
71189def47
qbsp: write correct .prt file for Q2 (PRT1 with clusters)
...
# Conflicts:
# qbsp/portals.cc
2021-09-23 14:43:48 -04:00
ed37289290
Store extended limits format in bspversion
2021-09-23 14:42:56 -04:00
b3258611c9
brush.cc: AdjustContentsFromName: fix all liquids getting set to water
2021-09-23 00:04:45 -06:00
70aa7ebcdb
writebsp.cc: remove unneeded memset
...
map.exported_texinfos.push_back({}); will push a zeroed gtexinfo_t.
2021-09-22 22:34:36 -06:00
6ff2d67d12
major C++-esque change to BSP conversion:
...
- main mbsp types are declared first in the files, and types that were single-member are now not structs
- conversion is handled by the sub-types themselves. Currently no diagnostic for *what* members overflow, but, overflow is handled via thrown exceptions on all overflowable members
- aabb type is used where appropriate now, simplifying a few areas
2021-09-22 17:30:46 -04:00
80a4aa1b97
Merge branch 'master' into qbsp-contentflags
2021-09-22 00:12:27 -06:00
2ebfdb096f
Remove COM_Parse, use parser_t
...
Game controls hull sizes now
2021-09-20 19:45:09 -04:00
9f1f575761
Parser simplification and classification
...
Hulls stored in game definitions
2021-09-20 16:24:38 -04:00
403bae7a7b
Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup
...
# Conflicts:
# vis/vis.cc
2021-09-19 22:23:54 -04:00
49fd62b9f3
Lotta more file stuff. Have to think about fscanf though.
2021-09-19 22:20:39 -04:00
326626f127
Remove some old stuff
...
Cleanup/rework of logging system. I'm not too happy about it still, but, it's at least a bit easier to follow now.
Started cleanup of file-related stuff.
2021-09-19 18:17:28 -04:00
ca0fbba4bf
qbsp: write correct .prt file for Q2 (PRT1 with clusters)
2021-09-18 00:02:32 -06:00
17606fde4b
Use variant instead of having all BSP types allocated at once (even though they are smol)
...
Move ownership of pointers to the bsp structures themselves for now.
2021-09-16 11:52:37 -04:00
e8bd554cc0
winding_t is now a C++ type - a hybrid stack/heap array.
...
In preparation for converting all of the vec_t[3] to qvec's, the Vector routines are now templated and work with any type that provides indexing operators.
Polylib.cc is gone, since this all needs to be in header now
qvec can now implicitly convert from T[N]
constexpr where appropriate
static inline -> inline
side_t is now an enum, moved into mathlib
2021-09-16 03:10:51 -04:00
1dd4df1b20
calloc/malloc/free -> new/new/delete (except for specific scenarios)
2021-09-14 11:39:12 -04:00
eb6bb81d61
use the C++ includes
...
stdbool not required
_vsnprintf and _snprintf are standard in MSVC since 2015, so I just use them directly now. They'll be replaced by std::fmt later anyways.
use <thread> for threading, instead of pthreads/windows.h thread directly
2021-09-14 08:46:03 -04:00
7f8d2cfb49
Fix single line functions
2021-09-14 02:56:44 -04:00
4e7542b111
Clang format pass
...
typedef -> using
include guards -> pragma once
typedef struct x { } y; -> struct y { }
some fixes to extremely old code that shouldn't be required any more
2021-09-14 02:32:26 -04:00
f89d5534b6
yay I can test tests now
2021-09-13 11:24:40 -04:00
4944ea36c7
set game on tests
2021-09-13 11:15:08 -04:00
75c303b503
last fix :(
2021-09-13 11:03:10 -04:00
e3378432ff
Fix test_qbsp (needs proper fixes, this is just a temp one)
2021-09-13 10:24:14 -04:00
d2ea0cee41
Merge remote-tracking branch 'origin/master' into qbsp-use-common
2021-09-12 23:04:42 -06:00
ae02ff5393
Implement leafbrushes cache
...
Fix bmodel leafbrushes (tank Spoike)
2021-09-12 13:27:39 -04:00
42cc946db1
Fix texinfo
2021-09-12 11:14:52 -04:00
91f0c47128
remove test code
...
fix two errors
2021-09-12 08:38:21 -04:00
c95a1e2ccb
q2 and bug fixes
...
# Conflicts:
# include/qbsp/qbsp.hh
# include/qbsp/winding.hh
# qbsp/brush.cc
# qbsp/csg4.cc
# qbsp/merge.cc
2021-09-12 08:34:01 -04:00
b2911290a7
fix hexen2 hull sizes ( #318 )
2021-09-11 11:46:03 -06:00
8cdb9ff6c4
Initial attempt at leafbrushes
2021-09-09 05:11:47 -04:00
35040d1bd3
Q2 working sorta
2021-09-09 02:13:28 -04:00
9800f4f738
Mostly all native!!
2021-09-09 00:26:17 -04:00
004fcb57c1
Content flags type, splitting up native and compiler flags.
...
Extreme WIP and likely not working properly. Need to rid all direct .native usages and direct them through target_version->game
2021-09-07 06:13:17 -04:00
c16bbf403d
Change miptex thingies to handle const as the comment wishes they would
...
Use optional to properly indicate the intended purpose of optional/"unset" values rather than a magic number (also because for some reason outputnum was stuck at 0 even though it defaults to -1 and I didn't want to debug why)
beginning of Q2 contents
2021-09-07 03:24:16 -04:00
00efa6e67d
Fix operator<
...
Introduce gamedef, to reduce rewriting of data in bspversions
fix name of needs_subdivision
include value in texinfo, in prep for Q2
2021-09-07 01:41:32 -04:00
437459a4dd
Finish using game everywhere
2021-09-06 18:09:13 -04:00
01d1400971
Merge branch 'qbsp-use-common' of https://github.com/ericwa/ericw-tools into qbsp-use-common
...
# Conflicts:
# common/bspfile.cc
# qbsp/writebsp.cc
2021-09-06 17:27:42 -04:00
3bc9b1b0f8
Instead of directly comparing BSP version pointers just for game type, I compacted quake2/hexen2 into a single enum.
...
Feature check in bspver for colored lightmaps, which replaces the many "version == q2 || version == qbism || version == hl".
2021-09-06 17:13:37 -04:00
5fef157f53
qbsp: take floor/ceil of node/leaf bounds even for bsp2
...
for consistency with refactor branch
2021-09-06 14:53:05 -06:00
71bb22dc28
qbsp: auto switch to extended limits formats
2021-09-06 14:20:51 -06:00
b1892d6aa3
qbsp: merge from master
2021-09-06 13:52:28 -06:00
648ef89845
qbsp: naming fix
2021-09-06 13:44:36 -06:00
d85ca375e5
qbsp: fix node/leaf mins/maxs calculations
...
they should use floor/ceil.
Otherwise a node with max X=10.5 will be written
to bsp29 as having a max of 10
2021-09-06 12:03:59 -06:00
dad0e61f63
Fix for texinfo/miptex searching routines
...
surf flags now use the "native + extended" format that will eventually be used for brush contents. Q1 output seems identical, haven't tested Q2 yet.
2021-09-05 16:56:29 -04:00
04ad8e2962
OOP wad file stuff
2021-09-04 23:23:03 -04:00
3b656e6ef1
Cleanup & preserve texture name for q2bsp
2021-09-04 22:15:04 -04:00
b01fddf7f1
More Q2 support
2021-09-04 18:49:01 -04:00
54799a11fc
qbsp: restore bspx brushes writing
2021-09-04 11:47:33 -06:00
1e6e938ead
qbsp: restore writing LMSHIFT bspx lump
2021-09-04 10:47:43 -06:00
047bc1299a
qbsp: fix tests
2021-09-01 01:19:24 -06:00
54d9e08033
qbsp: handle target bsp version
2021-09-01 00:42:30 -06:00
3cbf54749e
qbsp: fix -onlyents
2021-08-31 23:53:40 -06:00
bc44af4d1d
qbsp: fix unused variable warnings
2021-08-31 22:42:49 -06:00
8ed7dc9c05
qbsp: build fix
2021-08-30 01:18:47 -06:00
e571d1a4b2
qbsp: remove bsp29 limit check, as it will be done in common
2021-08-26 21:44:02 -06:00
86407d7ef3
qbsp: writebsp: rename some functions
2021-08-26 21:17:51 -06:00
f0d1c8488b
qbsp: pad lumps with \0 rather than ' ', for consistency with common/bspfile
2021-08-26 20:22:45 -06:00
8a1bc3ef20
qbsp: refactor clipnode writing (changes .bsp output)
...
- drop reshuffling feature from ExportClipNodes
As far as I can tell, the only purpose of this was to keep clipnodes
for a given model contiguous within the lump (i.e. keep the different
hulls contiguous).
Vanilla qbsp didn't appear to have done this, and the code was
unmaintainable/complex, so I'm dropping the feature.
2021-08-26 20:22:39 -06:00
6a50313ded
qbsp: add AddLumpFromBuffer function
2021-08-26 20:22:34 -06:00
899b2b8384
qbsp: drop MemSize stuff
2021-08-24 22:51:44 -06:00
1123205d47
qbsp: replace FreeMem uses
2021-08-24 22:49:06 -06:00
1f7ac25f0c
qbsp: removing fancy AllocMem uses
2021-08-24 22:40:35 -06:00
208a9610ad
qbsp: delete bspfile.cc/hh
2021-08-24 22:23:24 -06:00
ad2ac31e71
qbsp: use common's PrintBSPFileSizes
2021-08-24 01:36:22 -06:00
50a16fa2bf
qbsp: use common to write bsp
...
NOTE: produces almost binary-identical e1m1.bsp as last commit, the only
difference is due to the old QBSP using ascii space as a padding byte,
and common using \0
2021-08-24 01:29:21 -06:00
00cdc2924a
qbsp: fix name conflict with miptex_t (qbsp used it as a std::string alias)
2021-08-24 00:25:10 -06:00
6b1aaac9e9
qbsp: remove some bspx bits
2021-08-24 00:11:18 -06:00
e0710859fb
qbsp: remove mapentity_t::lumps
2021-08-23 23:25:31 -06:00
c55112b47f
qbsp: refactor lmshifts lump export
2021-08-23 23:18:43 -06:00
31d5e67603
qbsp: delete qbsp's copy of bspx code
2021-08-23 23:03:25 -06:00
490e71bb1a
qbsp: remove cTotal
2021-08-23 22:50:03 -06:00
df3ae568e5
qbsp: remove dead code
2021-08-23 22:45:27 -06:00
a7fd04af12
qbsp: refactor texdata writing
2021-08-23 22:44:22 -06:00
6a7e59026c
qbsp: refactor entities lump writing
2021-08-23 22:20:08 -06:00
bfef548ba5
qbsp: remove uses of AddLump for lighting/visdata
2021-08-23 21:13:42 -06:00
561ffffb9b
qbsp: refactor model writing
2021-08-23 21:01:49 -06:00
c3d338616b
qbsp: remove dead code
2021-08-23 20:18:15 -06:00
f59bc08db8
qbsp: refactor face writing
2021-08-23 20:16:40 -06:00
a0bdbf89d1
qbsp: refactor surfedges writing
2021-08-23 19:52:46 -06:00
d7c7fb6b2d
qbsp: remove dead code
2021-08-23 19:46:39 -06:00
8147b97dc6
qbsp: refactor vertexes writing
2021-08-23 19:45:31 -06:00
f4700f978d
qbsp: refactor edges writing
2021-08-23 19:36:41 -06:00
671bacf30c
qbsp: refactor clipnode writing (changes .bsp output)
...
- drop reshuffling feature from ExportClipNodes
As far as I can tell, the only purpose of this was to keep clipnodes
for a given model contiguous within the lump (i.e. keep the different
hulls contiguous).
Vanilla qbsp didn't appear to have done this, and the code was
unmaintainable/complex, so I'm dropping the feature.
2021-08-23 18:05:37 -06:00
bc5e743817
qbsp: writebsp: delete dead code
2021-08-23 18:02:05 -06:00
382a725f2b
qbsp: refactor writing of leafs, nodes, marksurfaces lump
...
- only support bsp29 for now
2021-08-23 18:02:05 -06:00
24fc2ffc6a
qbsp: refactor plane lump writing
2021-08-23 18:02:05 -06:00
460428d099
qbsp: refactor texinfo lump writing
2021-08-23 18:02:05 -06:00
ff7f8a1542
qbsp: add -nothreads debug option
2021-08-23 00:12:38 -06:00
29652b4a7a
qbsp: fix some threading issues with solidbsp.cc stats
2021-08-23 00:00:01 -06:00
a53cf8dbbe
qbsp: fix some thread safety bugs (mostly affecting stats output)
2021-08-22 23:45:42 -06:00
7a78e0a5b5
build: remove unused includes, fixes compat with tbb 2021.3.0
2021-07-13 21:47:52 -06:00
c9570260fa
gcc 11: pass constant to offsetof
2021-05-30 23:12:17 -06:00
386faa9315
qbsp: raise MAX_SUPERFACE_POINTS from 512 to 8192
2021-03-23 21:05:52 -06:00
fcf0ebbbfe
build: upgrade googletest
2021-02-07 14:42:12 -07:00
b5fcdec19e
cleanup: remove "byte" typedef
2021-02-07 14:02:35 -07:00
1dee7269d6
qbsp: dont't clip self-intersecting func_detail_fence and func_detail_illusionary
...
Makes foliage easier with _mirrorinside 1
2020-07-21 20:46:18 -06:00
c30a0a46a9
qbsp: fix origin brushes in hexen 2. Drop _no_bbox_rotation_expansion
...
document origin brushes. Never expand the bbox when origin brushes are in
use.
2020-02-24 01:26:53 -07:00
a91ee8cc7e
qbsp: fix heap corruption errors on VS2019. Winding bookkeeping is wrong
...
now
2020-01-29 22:46:39 -07:00
0873b0af2c
qsbp: code cleanup
2020-01-29 22:45:55 -07:00
d083f0f87f
qbsp: parallelize PartitionSurfaces
2020-01-29 21:14:55 -07:00
1a161b3ad5
qbsp: code cleanup
2020-01-29 20:56:29 -07:00
f74d85c022
Revert "qbsp: parallelize solidbsp"
...
This reverts commit 2ebfa8d780
2020-01-29 01:51:31 -07:00
2ebfa8d780
qbsp: parallelize solidbsp
2020-01-29 01:22:29 -07:00
1f565d7e7a
qbsp: parallelize CSGFaces
2020-01-28 21:18:08 -07:00
d6136c154d
light: add _light_alpha func_group key for making faces translucent for
...
light
2019-12-28 21:48:33 -07:00
a4c1ce6ff6
qbsp, light: support _lightignore on func_detail/group
2019-12-09 00:09:20 -07:00
5e74b4d0bb
qbsp: fix external maps with no worldspawn brushes
...
Thanks to ZungryWare for the report
2019-11-29 21:03:54 -07:00
cefd20c8da
qbsp: fixes for -wrbrushes + rotation
2019-11-24 17:23:41 -07:00
d7d797b898
qbsp: restore bounds expansion for rotators.
...
Add "_no_bbox_rotation_expansion" key for opting-out of the bounds expansion
Fixes #271
2019-10-27 23:02:05 -06:00
79d3aa99de
qbsp: fix relative paths for .wad files
...
Fixes #279
2019-10-27 19:03:45 -06:00
4ec22ee3f9
qbsp: more logging of face line numbers for errors/warnings
2019-10-13 23:10:42 -06:00
1577981960
qbsp: fix clip brushes export with -wrbrushes, and various other
...
fixes for -wrbrushes
2019-10-03 19:59:56 -06:00
Eric Wasylishen
Jonathan
Ozkan Sezer