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
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
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
db5ccb6a93
warnerr fix
2021-09-14 09:25:18 -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
05e20a3360
astyle project; not using yet
2021-09-13 14:14:33 -04:00
facf3490c7
typedef changes
2021-09-13 13:04:18 -04:00
d2ea0cee41
Merge remote-tracking branch 'origin/master' into qbsp-use-common
2021-09-12 23:04:42 -06: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
8cdb9ff6c4
Initial attempt at leafbrushes
2021-09-09 05:11:47 -04:00
9800f4f738
Mostly all native!!
2021-09-09 00:26:17 -04:00
69cb6b981f
bsputil: write ents in binary mode and print its crc in 4-digit hex ( #317 )
2021-09-08 17:50:32 -06: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
acc65953ce
Use tie for mtexinfo too
2021-09-06 22:15:59 -04:00
398b865c96
throw array in there too
2021-09-06 22:13:45 -04:00
9602772450
Use tie for operator</> of surfflags_t
2021-09-06 22:12:57 -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
648ef89845
qbsp: naming fix
2021-09-06 13:44:36 -06:00
8fd1d89b8d
Fix double-delete
...
Fix typo
2021-09-05 17:39:17 -04: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
f978d2a8d5
common: start adding overflow checks to ConvertBSPFormat
2021-09-05 00:44:25 -06: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
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
2e09ad509b
Merge remote-tracking branch 'origin/master' into qbsp-use-common
2021-08-31 22:40:51 -06:00
90973e1198
Q2bsp VIS support ( #315 )
...
* Add QBSP - the BSP2-esque variant to Q2BSP - to bspinfo, and all of its accompanying structures.
* pass around ident, since Q2 needs it - admittedly it's a bit ugly, but it works for now.
conversion for QBSP
* Fix light
* _qbsp_ -> _qbism_
* Introduced bspversion_t, a struct that holds pertinent information about different BSP versions and also acts as a tagged pointer type for direct comparisons. This makes a lot of code paths simpler. I'm not entirely set on the wordings or usages yet, and maybe we can stuff boolean flags inside of them for different behaviors (for instance Q2, QBism and HL would have the "colored lightmap" boolean set to true, which replaces the check-for-all-three in the lightmapper)
Swapped arguments to ConvertBSPFormat to have the conversion target last instead of first
Finished rename of qbsp -> qbism
Tested:
- bspinfo on various BSPs I had laying around (Q1, Q2, Qbism)
- bsputil converting between Q2 and Qbism, and that they loaded in engine/roundtripped properly
Not tested:
- vis/rad on anything major (I still can't run rad due to embree being weird)
- bsputil conversion of Q1-esque maps
* Q2 VIS
Almost working, just in-game is not 100% functional
* PHS! Q2 VIS!
* Fix missing loadversion assignment
Fix missing \n
* Implement q2bsp -> mbsp visdata copy
fix sky lighting to use arghrad compat
2021-08-31 22:38:12 -06:00
a75ad998e7
common: clean up Hexen II handling
2021-08-30 01:05:18 -06:00
5429655ce8
qbsp: move internal content types to bspfile.hh
2021-08-26 22:30:56 -06:00
bafea15753
Merge branch 'master' into qbsp-use-common
2021-08-26 21:14:49 -06:00
8beda9a039
common, qbsp: make Error() noreturn
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
899b2b8384
qbsp: drop MemSize stuff
2021-08-24 22:51:44 -06:00
208a9610ad
qbsp: delete bspfile.cc/hh
2021-08-24 22:23:24 -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
890db18171
qbsp: use common's bspfile.hh
2021-08-24 00:31:16 -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
09d7b6e73f
common: transfer comments from qbsp's bspfile.hh
2021-08-24 00:17:47 -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
490e71bb1a
qbsp: remove cTotal
2021-08-23 22:50:03 -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
561ffffb9b
qbsp: refactor model writing
2021-08-23 21:01:49 -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
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
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
eaa86c71c6
Q2BSP + QBSP ( #313 )
...
* Add QBSP - the BSP2-esque variant to Q2BSP - to bspinfo, and all of its accompanying structures.
* pass around ident, since Q2 needs it - admittedly it's a bit ugly, but it works for now.
conversion for QBSP
* Fix light
* _qbsp_ -> _qbism_
* Introduced bspversion_t, a struct that holds pertinent information about different BSP versions and also acts as a tagged pointer type for direct comparisons. This makes a lot of code paths simpler. I'm not entirely set on the wordings or usages yet, and maybe we can stuff boolean flags inside of them for different behaviors (for instance Q2, QBism and HL would have the "colored lightmap" boolean set to true, which replaces the check-for-all-three in the lightmapper)
Swapped arguments to ConvertBSPFormat to have the conversion target last instead of first
Finished rename of qbsp -> qbism
Tested:
- bspinfo on various BSPs I had laying around (Q1, Q2, Qbism)
- bsputil converting between Q2 and Qbism, and that they loaded in engine/roundtripped properly
Not tested:
- vis/rad on anything major (I still can't run rad due to embree being weird)
- bsputil conversion of Q1-esque maps
2021-08-23 09:56:33 -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
a618e5f5b5
common: assert(0) on Q_assert failure for better debugger experience
2021-08-22 23:27:05 -06:00
f7256907d5
common: fix build of bsputils.cc with double == vec_t
2021-08-22 15:12:19 -06:00
d6c888bee9
vis add -nostate debug option, skips loading from state file
2021-08-15 13:22:57 -06:00
72885addf1
common: fix build failure
2021-03-23 21:17:09 -06:00
fea7849315
common: preserve order of key/value pairs
2021-02-10 00:05:53 -07:00
b5fcdec19e
cleanup: remove "byte" typedef
2021-02-07 14:02:35 -07:00
cc116a4729
decompile: restore coplanar faces
2021-02-06 16:19:15 -07:00
86a644680a
qvec: add constructor to extend a vector
2021-02-06 14:11:01 -07:00
f0e2f4ba96
common: small tweaks: CopyWinding accepts null, document face side
2021-02-05 22:26:13 -07:00
708d3eccd3
qvec: add unary minus
2021-02-04 22:00:55 -07:00
0cdd2f97ab
common: revert Face_Miptex change, it was breaking reading of
...
Q1 texture names. TODO: fix this properly?
2021-01-31 01:27:01 -07:00
9124653156
common: move EntData_ function to common
2021-01-30 21:11:25 -07:00
d4aa42f0ab
bsputil: decompiler wip
2021-01-30 14:49:18 -07:00
94c30afac4
light: refactoring necessary to support embree3
2021-01-01 23:48:22 -07:00
00e41688c3
light: quake2: arghrad-compatible phong support
...
(set face "value" to the same non-zero number, have light flag unset)
2020-12-31 12:39:17 -07:00
2d15d20410
light: q2: avoid black seams on geometry near sky
2020-12-29 15:58:40 -07:00
eb842ba165
light: arghrad compat: preliminary sky_surface implementation
2020-12-29 13:43:06 -07:00
bb4d6fdea9
light: add arghrad compatible sunlight keys sun_light, sun_color, sun_angle
2020-12-29 12:59:44 -07:00
1b714108cd
Add ability to set phong in worldspawn #267 ( #305 )
2020-11-30 00:42:42 -07:00
19f8ac8110
Add -visdist param from bjptools ( #300 )
...
* Add support for -visdist param from bjp tools
* add mention to man
Co-authored-by: Shpuld Shpuldson <shp@cock.li>
2020-09-18 19:11:38 -06:00
b35cb8eb7e
light: fixes for bjptools skip faces (which have no associated model)
2020-08-20 12:08:46 -06:00
a0e7f1eccb
light: refactor last commit's std::pair to a custom struct
2020-08-04 18:05:54 -06:00
1b53d458f4
light: support bounce and switchable shadows
...
fixes #251
2020-08-03 23:53:07 -06:00
03ed0697a4
light: add -litonly option for re-lighting a bsp without modifying it
2020-08-03 00:40:13 -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
e2a5f62f32
vis: temporary hack of raising MAX_PORTALS_ON_LEAF to 512
2020-01-21 00:24:03 -07:00
d6136c154d
light: add _light_alpha func_group key for making faces translucent for
...
light
2019-12-28 21:48:33 -07:00
2d3aa22242
light: add _nostaticlight key
2019-12-26 17:13:21 -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
b132152891
light: allow starting assigning switchable styles before default of 32
2019-10-31 00:40:23 -06:00
4456020b30
light: remove 65536 ray limit, fixes #276
2019-10-28 01:12:23 -06: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
d4cc19afc5
light: rename _dome to _sunlight2/_sunlight3
2019-10-09 20:24:18 -06:00
fa62b20603
light: add a limited version of Lunaran's "_dome" light feature
...
that only supports domes oriented up/down like sunlight2/3
2019-10-09 02:12:04 -06:00
a36a128b30
light: missing file from last commit
2019-10-09 01:03:37 -06:00
70336339ca
light: fix "_suntexture" interaction with -bounce
2019-10-09 00:59:49 -06:00
f220b2f531
light: support "_suntexture" key on "_sun" "1" entities to limit them
...
to being cast from a specific sky texture.
Fixes #110
2019-10-09 00:47:39 -06:00
d2ecc73db3
light: support "style" / "targetname" on "_sun" "1" entities.
...
Fixes #253
2019-10-08 23:43:22 -06:00
89365949bc
Squashed commit of the following:
...
commit 8ca122916d8f06fc9c8d038a553fb002e94ec507669a5a79116653760982347a455ac3553c347a4551027fb22c73672da504fb626366199bdb
2019-07-04 21:08:17 -06:00
b04c06a616
light: fix _shadow -1 being interpreted as _shadow 1 for bmodels
2019-06-27 23:45:54 -06:00
ba7bdf86a1
light: increase max sky distance to 1M
2019-04-20 12:27:27 -06:00
b343b9504a
qbsp, light: support _minlight_exclude on func_group, detail, etc.
2019-04-05 21:14:39 -06:00
fd8b205dd2
light: fix fix_coord bug (for sampling fence textures) and
...
rename clamp_texcoord. Thanks to mxd for spotting the bug.
Fixes #260
2019-03-24 23:43:47 -06:00
ad65449cef
qbsp: add "-midsplitsurffraction n" option as an alt. to -maxnodesize
...
switch to midsplit if the node contains more than this fraction of the
model's total surfaces. Try 0.15 to 0.5. Works better than
maxNodeSize for maps with a 3D skybox (e.g. +-128K unit maps)
2019-02-11 00:52:38 -07:00
16ad2b077a
qbsp: -objexport debugging: Add another point where an .obj is dumped
2019-01-26 22:22:07 -07:00
2df839cfc2
light: Add "_bounce" "-1" to disable bouncing for a func_detail/etc.
2019-01-22 00:02:46 -07:00
0ac4909396
qbsp: change outside.cc to not fill leafs that have faces that are
...
straddling in and out of the void.
Previously, we were just deleting these faces, leaving HOMs.
Keeping them but filling the leaf in as solid doesn't work either, because
if they are the only faces left in the leaf it messes up the content type
determination later.
Fixes test_tjunc01.map test case from Qmaster.
2019-01-19 21:56:05 -07:00
8a47233bbf
bsputil: start a --compare feature for helping with qbsp testing
2019-01-10 02:58:37 -07:00
4a360989f3
qbsp: add -worldextent option for compiling large maps, default 65536
2018-12-24 01:53:08 -07:00
fa06716545
common: make VecStrf/VecStr threadsafe
2018-07-24 00:18:43 -06:00
e6411b2cee
light: alternate fix for lockable_vec_t::stringValue()
2018-07-24 00:12:31 -06:00
07447a633e
Rewritten parts of surface light logic. Should resemble qrad3 looks a bit more now...
...
Added "surflightscale", "surflightbouncescale" and "surflightsubdivision" cmdline/worldspawn settings.
Fixed: a face should not be skipped when it has both sky and nodraw texinfo flags.
Fixed some non-windows compilation errors.
2018-05-25 14:59:22 +03:00
0661098bc5
Quake 2 support: area lights, palette/texture loading, transparent/sky/fence face flags.
2018-05-08 15:50:01 +03:00
30c19ab9da
qbsp: support reading Q2/Q3 detail flag
2018-03-18 19:50:35 -06:00
f92b48a8cb
qbsp: experimental _noclipfaces key
2018-03-13 12:23:41 -06:00
94dbd0a705
qbsp: _phong_angle_concave support
2018-01-30 01:20:38 -07:00
23b25a0a0e
qbsp: add failing tests for healing invalid texture projections
2018-01-28 01:54:58 -07:00
82e3aef283
light: add FacePairConcavity
2018-01-11 21:57:48 -07:00
ebb508c7db
light: remove transparent lightmaps spam
2017-12-28 12:50:32 -07:00
d31d3621bc
light: add MakePlane function
2017-12-10 21:28:35 -07:00
33bc1ee05e
light: wip work on CalcPointNormal
2017-12-06 23:38:59 -07:00
71d9f8ce8a
light: move NeighbouringFaces_new to phong.cc
2017-12-06 00:23:21 -07:00
69879b4104
light: add -highlightseams flag
2017-12-05 15:09:34 -07:00
d9f112a97f
light: add -phongdebug_obj flag
2017-11-25 23:12:23 -07:00
d4d2d537eb
light: split GLM_PolyRandomPoint into precomputed portion
...
take uniform random params explicitly
2017-11-24 18:01:18 -07:00
92bacbe7e1
light: FacesOverlappingEdge: return the edge that overlaps
2017-11-24 14:22:54 -07:00
8ce7a682b1
light: add -debugneighbours
2017-11-23 23:45:15 -07:00
7170aac1c3
light: FacesOverlappingEdge
2017-11-23 23:45:05 -07:00
f356ea40d1
bsputils: add more bounds-checked accessors
2017-11-23 23:45:05 -07:00
88ee157b97
mathlib: add LinesOverlap function
2017-11-23 23:45:00 -07:00
501fb9ee40
light: add FacesUsingVert
2017-11-19 23:47:29 -07:00
2ea0076160
qbsp: experimental func_illusionary_visblocker
2017-10-24 22:17:10 -07:00
abf2a3665b
vis: fix to use mbsp_t
2017-10-24 20:01:04 -07:00
cbba35a346
common: logprint: print to visual studio console
2017-10-24 19:51:29 -07:00
4471a80aa9
common: add q2 content types (from: https://github.com/id-software/quake-2-tools )
2017-10-03 18:17:10 -06:00
873e0b8a35
common: Face_IsLightmapped: q2 support
2017-10-03 14:42:19 -06:00
2dc22b7088
common: add loadversion to mbsp_t
2017-10-03 14:17:42 -06:00
dff71edfe9
light: very early q2 support. half of the faces seem to be saved without lightmaps for some reason
2017-10-03 00:33:14 -06:00
df06ead299
common: q2 <-> generic conversion
2017-10-02 16:02:01 -06:00
8813d272cb
common, light, vis: change from bsp2_t to mbsp_t
2017-10-01 22:32:20 -06:00
Jonathan
Eric Wasylishen
Ozkan Sezer
Julian Priestley
tk
Shpoike
MaxED