95c728a5b6
fix legacy bevel bug
...
pushing up changes for Q1 hulls just in case we ever want these back
2022-08-16 13:52:30 -04:00
0c90a33f28
enable Q1-style hull expansion; these expanded brushes seem to look better. hopefully we can figure out a way to backport & optimize this code for mapbrush_t, but for now it's only used in Q1 hull expansions
2022-08-16 05:33:38 -04:00
f62136e04d
qbsp: wip fixing -expand feature
2022-08-16 01:36:09 -06:00
83cf63e77f
revert using detail on hull1/2 for now as it's breaking tests
2022-08-15 21:17:17 -06:00
92fdff1222
FreeTreePortals call missing
...
allow decompiling hulls (not hooked up to console yet)
2022-08-15 12:23:09 -04:00
027c45d608
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-08-15 06:13:38 -04:00
f7b8f85ece
use an optional<uint8_t> to store hull number, which gets rid of special -1 collision hull number.
...
fixed no-hull always chopping even with chop off
2022-08-15 06:13:30 -04:00
20f5d73a3c
always use inside filling for auto
...
allow details in hulls
use std::optional for an optional-esque value
2022-08-15 04:53:36 -04:00
97665d15a9
fix slight mistype in Brush_LoadEntity
...
make ~settings_container virtual so light_t can be freed properly
reset visible to false on all brush sides
2022-08-15 03:37:38 -04:00
c2be045f65
qbsp: add WriteDebugTreePortalFile
2022-08-15 00:34:18 -06:00
854e1f48f5
qbsp: rewrite/fix hull and bmodel logging with new -loghulls and -logbmodels flags
2022-08-14 12:40:42 -06:00
2fe8ef2182
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-08-14 07:33:49 -04:00
781a772d8a
move immediately instead of splicing after construction (probably compiles to the same code but whatever)
...
don't add all of the `result_portals_onnode` one at a time; just directly copy-elision the result.
2022-08-14 07:33:41 -04:00
e7adc1108a
qbsp: reset more settings between test cases
2022-08-13 20:38:57 -06:00
40b04b9518
use alloca instead of thread-local static
2022-08-13 20:30:51 -04:00
da5b40ce73
since buildportal_t is small and being stored in an std::list (which already stores them in nodes that require allocation & non-moving locations) we don't need to wrap them in unique_ptr; this saves a malloc/free per buildportal_t
2022-08-13 08:24:13 -04:00
2059835a47
use a more optimized version of SplitBrush for CheckPlaneAgainstVolume that doesn't require allocating/freeing a lot of memory
2022-08-13 06:39:30 -04:00
6d66e6d5cf
group together # of clipped faces, to reduce console spam of Q1 maps
...
always allow midplane split for hulls
2022-08-12 21:38:41 -04:00
06a116670b
winding_t: make non-copyable
2022-08-12 02:06:23 -06:00
ea38e5eeb7
fix missing move
...
fix clip_back causing extra copies
2022-08-12 02:03:00 -04:00
bf162c7a86
allow explicit calling of percent_clock so it can be simplified a bit
...
add more timers in a few spots
by default, display percent timers but don't display elapsed for non-verbose stuff (bmodels); this is so it still shows that it's "working" instead of just showing blank for large maps, give user an idea on progress for certain stuff
merge all "side not found"s into a single line
time `FillOutside`
time `ProcessMapBrushes`
time `Brush_LoadEntity`
2022-08-12 01:30:04 -04:00
4bf2ab338c
allowing logging::percent to handle indeterminate values
...
fix logging::percent getting stomped in multi-threaded operations
add new stats facility to make creating lists of single-use stats easier to manage
fix SplitBrush storing a bunch of extra stats for ChopBrushes
2022-08-11 20:33:12 -04:00
f851fac655
speed up compilation - we don't need to make a copy of node->volume going into SplitBrush now
2022-08-11 02:58:49 -04:00
f17ce185f6
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-08-11 00:27:36 -04:00
0db1e0fc01
add chop control to settings
...
only chop if desired or if hull is -1 or > 0 since those can be chopped without affecting visuals
farewell, shared_lock
fix brush contents issue
2022-08-11 00:27:28 -04:00
1f3bf6edbc
qbsp: log BrushBSP function name
2022-08-10 21:45:08 -06:00
129dedb268
reset onnode between BrushBSP passes
2022-08-10 23:28:16 -04:00
4b4a1738fd
more partial revert
2022-08-10 23:06:37 -04:00
02e80645e6
partial revert of 097b564cc6
2022-08-10 22:43:42 -04:00
eb7c65362c
fix typo
...
assume non-sourced sides are non-visible
2022-08-10 22:27:40 -04:00
6ab037b03a
implement ChopBrushes
2022-08-10 22:12:23 -04:00
097b564cc6
remove bspbrush_t::original; it is no longer required since mapbrush_t is what the output is being written to
...
use some explicit types (bspbrush_t::ptr for pointer, bspbrush_t::container for container of pointers, and bspbrush_t::make_ptr to create one) so that we can swap it out with different pointers easier later
swap out bspbrush_t::ptr from unique_ptr to shared_ptr; it's not important yet, but it does not increase compilation time and will allow us to pass things to functions like SplitBrush without destroying the original as long as we still have a reference to it somewhere (important for ChopBrushes)
add get_positive_plane to mapface_t
instead of creating a whole copy of the bspbrush_t list, BrushBSP now just creates copies of the shared_ptrs which are then filtered down the tree; the originals are never modified by SplitBrushList and friends, only split into new brushes, so this is safe from what I can tell
portals now directly reference the mapface_ts
original_brushes now directly reference the mapbrush_ts
early exit in `BrushBSP` if brush list is empty (moved to top)
2022-08-10 16:02:16 -04:00
faf9173f10
remove file_order; we can infer this from the pointers now
...
remove unnecessary early microbrush check, use microbrush option value on later one
2022-08-10 02:22:32 -04:00
bca6bda7c3
move `visible` to mapface_t since we only need to store one boolean for it
2022-08-10 01:29:34 -04:00
f8f0e903a2
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-08-10 01:14:59 -04:00
c9a1d9f096
qbsp: don't store leafnode->volume once the leaf is created
2022-08-09 23:14:20 -06:00
74dcb1454e
remove mapface_t::visible, it's unused
2022-08-10 00:55:10 -04:00
834838ed72
move lmshift to mapface_t
...
store original mapface_t that a face_t was generated from
2022-08-10 00:53:58 -04:00
70f015a36c
move func_areaportal and lmshift from bspbrush_t to mapbrush_t
2022-08-10 00:48:55 -04:00
c0cec4e1ba
Rewrite of 697e3325f8
2022-08-10 00:11:17 -04:00
44eff2d7b1
throw in percent logging for MakeTreePortals
...
when node_t converts to leaf, destroy anything on it by re-initializing it
2022-08-09 20:33:49 -04:00
d6411cef01
remove AssertNoPortals - it's impossible for it to ever hit, and it's kind of expensive (~150ms for 60k portals)
2022-08-09 19:22:42 -04:00
ffeecd550f
clear tree when it's no longer required
2022-08-09 17:02:59 -04:00
697e3325f8
go back to vector for brush lists
2022-08-09 16:00:51 -04:00
b37917c9ca
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-08-09 14:57:46 -04:00
5e6dc9d274
parallelize free
2022-08-09 14:57:42 -04:00
67a376ad18
qbsp: BuildTree_r: avoid copying node->volume
2022-08-09 00:51:18 -06:00
f3b9de57c6
build: add tbbmalloc
2022-08-09 00:19:39 -06:00
30b529b70f
qbsp: keep a pool of node_t's in tree_t in a tbb::concurrent_vector
...
rather than using std::unique_ptr recursively in nodes
2022-08-08 23:43:36 -06:00
189f70ca30
add in-place versions of union and expand to help with inlining
2022-08-08 22:43:10 -04:00
426668701e
clip_back/clip_front to match ChopWindingInPlace
...
simplify constructors for winding heap
use std::vector again for mapentity_t since it's being copied because of the std::list
2022-08-08 21:08:27 -04:00
5b56ecfb28
remove extraneous warnings when they don't matter
2022-08-08 16:01:16 -04:00
b3fbf8841d
allow update_bounds to tell the caller that a brush may have been destroyed
2022-08-08 15:50:23 -04:00
a9b1fa2461
speed up SplitBrush a tiny bit by reserving side count
2022-08-08 01:29:56 -04:00
2abdeb2616
remove Face_Plane since we can directly access the real plane now
...
speed up CreateBrushWindings slightly since we know where the inverted plane is stored
2022-08-08 01:06:50 -04:00
d2cfc0d025
use planenum in SplitBrush and friends
2022-08-08 01:01:49 -04:00
f490878e97
remove old plane lock stuff
...
use spatial hash for planes
2022-08-08 00:58:56 -04:00
f5ef0f90f4
spatial hash using pareto for vertex positions
2022-08-08 00:39:53 -04:00
d9a3abfba7
remove blocksize now that midplane is working
...
don't re-fetch plane being exported since we know its id already
2022-08-07 21:48:22 -04:00
f64dc82ce2
Merge branch 'brushbsp-plane3-bevel' of https://github.com/ericwa/ericw-tools into brushbsp-plane3-bevel
2022-08-07 19:39:35 -04:00
7593834e06
fix map.planes being stomped on export
2022-08-07 19:39:29 -04:00
eb355c1d21
adjust errors
...
remove unnecessary line in debug code
2022-08-07 19:12:37 -04:00
0357db911c
qbsp: remove unnecessary copy in SplitBrushList
2022-08-07 15:42:43 -06:00
cf653b5b56
qbsp: MakeNodePortal: don't crash if w is empty
...
for consistency with qbsp3
2022-08-07 01:42:09 -06:00
4ec30e02a2
remove "brushes" from mapentity_t - it is now local to the ProcessEntity process
...
"node_t::original_brushes" is now only used during construction and cleared on Prune; original_mapbrushes is used to track the map brushes on nodes post-construction
calculate and cache contents on mapbrush_t
2022-08-06 19:28:17 -04:00
4c15e6f717
don't bother displaying "processing hull" for q2
2022-08-06 17:42:38 -04:00
335db1c0e4
move map_source_location to parser as parser_source_location since the locations actually come from there rather than from the map; now the parser keeps track of the location, so it's a bit easier to follow
2022-08-05 23:17:15 -04:00
c6fabb290d
clean up stat printing a bit
2022-08-05 09:08:33 -04:00
c1e52b0d62
qbsp: fix FindPortalSide generating unwanted mirrored inside faces
...
due to the `// see how close the match is` block being uncommented
2022-08-05 01:45:42 -06:00
2a90995c6f
remove const on external_worldspawn so it can be moved
2022-08-04 15:39:57 -04:00
627428756c
track a shared pointer for `map_source_location` instead of memory pointer, so that we can allocate it as we go
...
use it for brushes and faces
2022-08-04 15:37:37 -04:00
9af74ce083
store linenum on mapbrush_t; add new location type, but not using it yet, for later so we can track more complex locations (external/-add maps, etc)
...
add extra sanity checking to polylib
adjust some warnings to be clearer and not indicate that the world will break
add sanity check to update_bounds, and don't add empty windings to the bounds
2022-08-04 12:05:04 -04:00
8d5f837197
fix new degenerate edge warnings
2022-08-03 20:29:33 -04:00
61f5088347
use closer to original code check (doesn't really matter since plane sidedness just inverts the distance, and it's being fabs'd anyways)
2022-08-03 20:20:46 -04:00
c9eab719bc
remove old code
...
add visible on mapface_t although it's unused
2022-08-03 13:26:04 -04:00
ec62a0e8d0
move in the rest of the missing code back into LoadBrush
...
fix bug with c_brushesremoved brushes
move & CreateBrushWindings use where required
store the source face we made a bspbrush_t side from
fix test issue
2022-08-03 12:35:47 -04:00
5da88122a5
fix size_t misuse
2022-08-03 05:14:21 -04:00
98610982c9
export the final dbrush_t right in ExportBrushList_r instead of doing it ahead of time
2022-08-03 05:09:39 -04:00
58d1e5230e
remove hullbrush_t; just directly work via the bspbrush_t since we have the bevels pre-calculated in mapbrush_t
...
track the mapbrush we were created from in bspbrush_t; we use this later for outputting the collision brush for q2bsp. bevels are busted though..
2022-08-03 04:47:50 -04:00
24168c8e40
clang pass
2022-08-02 21:57:33 -04:00
5f35575c02
remove map.faces and map.brushes; now, brushes are stored inline in mapentity_t, and faces are stored inline in mapbrush_t
...
calculate brush bounds (and winding) and add bevels after all of the rest of the map has loaded, so that it has proper world extents
calculate world extents right after the map is loaded
2022-08-02 20:59:08 -04:00
9ca28dff61
bevel
2022-08-02 19:48:17 -04:00
a75f4239e3
node_t planenum
2022-08-02 16:04:48 -04:00
46a643c3f0
face_t using planenum
2022-08-02 15:45:06 -04:00
e57aa36e2e
use stats rather than logging every time these specific instances occur
...
restore the "how close the match is" block
2022-08-02 15:18:53 -04:00
1d729ba573
side_t using planenums
2022-08-02 14:55:38 -04:00
1ad0eb530d
going back to using planenums, but going for the qbsp3-esque system
2022-08-02 14:17:59 -04:00
93655913c0
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
...
# Conflicts:
# include/qbsp/qbsp.hh
2022-08-02 06:24:46 -04:00
8476e2861c
this all matches release now
2022-08-02 04:29:36 -04:00
e05a2bdf75
qbsp: "-add additional.map" feature
2022-08-01 19:13:10 -06:00
cc9dd986c6
adopt parent node bounds if a leaf is unbounded now too
...
move midsplitbrushes into same group as blocksize
always return a split rather than erroring
list out which method is used of the three
2022-08-01 15:51:57 -04:00
52dff47a86
fix linux build
2022-08-01 12:47:20 -06:00
1751733ddc
qbsp: add experimental MidSplit re-implementation, enabled by default
2022-08-01 12:30:04 -06:00
da4c45d62f
qbsp: fix crash on DM6
2022-08-01 12:13:21 -06:00
755a9e65ca
use std::set instead of vector for original_brushes since we need them implicitly sorted and no dupes
...
parallelize PruneNodes_R and CalcTreeBounds_r
2022-08-01 13:19:50 -04:00
26a18d5cc3
add logging::header/funcheader to easily and consistently print function or "active routine" headers
...
add OOP percent_clock wrapper to make printing percents easier, not used yet
2022-08-01 09:35:21 -04:00
aac9513417
qbsp: parallelize MakeTreePortals
2022-07-31 21:39:47 -06:00
6a3e971a11
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-07-30 06:39:20 -04:00
e60babdb9c
add q3map2-style -blocksize option, using the same algorithm from it. it's optional and disabled by default.
...
pass through the "use mid split" boolean again
remove node_t::side; appeared to be unused in our current code, and needs to be removed anyways to support the other plane splitters
re-introduce ChooseMidPlaneFromList, but comment it out as it currently fails on a lot of BSPs.
2022-07-30 06:39:14 -04:00
e1b6aba014
portals.cc: log number of tree portals
2022-07-30 00:29:54 -06:00
521daad432
always use world entity for looking for _wad key
2022-07-29 21:20:10 -04:00
77e5990016
set default subdivision to Q2 non-software maximum when Q2 is used (twice as large as Q1)
2022-07-29 13:42:26 -04:00
3ee28fc416
fix crash in light from bounce lighting storage
...
move bounce lights to a forwardly linked list
fix minlight affecting style 0 for switchables
2022-07-29 00:41:24 -04:00
7810875860
strip trailing spaces from keys
2022-07-28 20:41:43 -04:00
dd39bf9940
better print for areaportal warnings
2022-07-28 20:41:33 -04:00
6399c743a7
fix bogus brush splits from old Q2 world extents
2022-07-28 20:00:43 -04:00
faa4c38985
fix logging being disabled wrongly at the last steps
...
remove vertex snapping done as a post-processing step; it causes hall of mirrors and doesn't work the same way as qbsp3. need to find a better option.
2022-07-28 09:21:42 -04:00
1d8a0c1df3
clang-format pass
2022-07-28 06:14:54 -04:00
e03d99d807
fix spacing
2022-07-28 05:59:06 -04:00
d9a9046e46
fix some foot-guns with qbsp_plane_t - type is auto-set now
2022-07-28 05:51:55 -04:00
64cd39c229
add optional vertex snapping to match qbsp3
2022-07-28 03:56:12 -04:00
3fc6225fee
although it's rare, if there's a case where a zero-angle triangle is *required* to close up a face (MWT determines it's part of the optimal case), we'll just let it through
2022-07-28 01:35:12 -04:00
c9935aaa38
hook up merge and subdivide stats
2022-07-27 23:02:09 -04:00
146f20f677
qbsp_plane_t is now used by other structures, and contains a faster epsilonEqual; since the majority of planes (especially nodes) are going to be axial, there's no need to use the slower full comparison when we can check if the axial component is ready.
2022-07-27 22:44:09 -04:00
c5d0c4dc67
use a dummy plane for nodes with only empty leaves
2022-07-27 20:29:53 -04:00
9c73416594
Squashed commit of the following:
...
change temp-named planeside_ to plane_flipped
commit 8b3938f5069837e76504a16ffd019a8682fd4325
Author: Jonathan <jonno.5000@gmail.com>
Date: Wed Jul 27 05:35:05 2022 -0400
fix compile errors/warnings
commit 0c19a922490a332a084ceb65bbb88368fecb40a1
Merge: 31edc84e a2451a41
2022-07-27 05:38:50 -04:00
a2451a41fb
qbsp: rewrite of q1 contents representation in bspfile.cc
...
use q2-like bitflags so we can represent mixes like (water | mist), which we need within the compiler
2022-07-27 02:31:49 -06:00
4e3739c751
use a reader/writer-esque lock (shared_mutex) instead of exclusive-only recursive lock to speed up plane stuff
2022-07-24 19:05:28 -04:00
f089d0db20
default -nosoftware for qbism
2022-07-22 20:01:36 -04:00
f6d6972b17
fix percents being output when not requested for submodels
...
tjunc using MWT algorithm
2022-07-22 12:25:06 -04:00
09a03d1668
remove delabella
2022-07-21 20:06:33 -04:00
46591c05f9
storing delaunay version
2022-07-21 20:05:55 -04:00
f1f11e6f3b
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-07-19 08:42:13 -04:00
989788cf71
add a switch to optimize compiles for no software mode (mainly for Q2)
...
fix tjunc 3 vert faces being destroyed
2022-07-19 08:41:59 -04:00
6025585f01
switch from std::any to class hierarchy for content_stats_t
...
Fixes bogus (huge integers) content stats reporting on macOS (also fix tjunc stats reporting)
having the non-copyable std::atomic<size_t> inside a std::any which must
be copyable was problematic
IMO this is slightly better because it lets us use non-copyable types
2022-07-18 20:13:33 -06:00
b6153e3084
use make_unique where appropriate
...
use unordered_map/set where ordering isn't important (faster for searching and smaller footprint)
2022-07-18 20:16:50 -04:00
6f4f3a56ad
make a few errors warnings
2022-07-18 11:27:48 -04:00
7e5c4fe311
fix animation loops
2022-07-18 11:24:22 -04:00
5e90c5c7a1
spacing
2022-07-18 08:57:50 -04:00
577592ce45
adjust tjunc output to match the step orders (input/deformations -> delaunay -> retopo -> rotation -> splitting)
2022-07-16 10:50:13 -04:00
acac6cb720
add in a "validator" setting which is just a thin wrapper to another setting type allowing for an additional validation step
...
simplify the face structure; now, "fragments" just mean the output windings (if you opt out of tjunction fixing, then there will only be 1 fragment with the same values as original_vertices)
move MakeTangentAndBitangentUnnormalized to qvec.hh since we will use it later
-tjunc allows for more fine-grained control now (-notjunc still exists)
-maxedges now throws if you specify a bad value (1 and 2)
remove the checks to OmitFaces - we can tell if a face was omitted because it will have an empty winding
remove static variables from tjunc
2022-07-16 10:45:24 -04:00
da9546e260
change settings semantics to be simpler and more clear:
...
- no more "isLocked" - use getSource directly (locked is a confusing name)
- no more split parse/setValue functions. there's only one entry point each now, and all they do is pass along the source passed to it from its parser.
- no separate setters, use setValue(value, source)
- add a "game target" source, which is low priority and indicates to the user that the value would have been default but was changed to a better value for the game target
2022-07-14 09:03:59 -04:00
feb6055b07
remove errors pertaining to MAXEDGES (except on output) since we dynamically expand now
...
allow command line to specify maxedges
default maxedges to 0 (no limit) for Quake II
2022-07-14 04:57:52 -04:00
4cf81197a3
fix SplitFaceIntoFragments
2022-07-14 02:18:41 -04:00
ae4c5cd365
change face output to be slightly more robust
...
fix tjunc multithreading; added `original_vertices` which is a copy of the `output_vertices` that is safe for tjunc to read from since tjunc writes to the former
2022-07-14 01:56:18 -04:00
a435f67f13
fix outputting noisy stuff
2022-07-13 22:26:08 -04:00
8240d753ee
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-07-13 04:35:46 -04:00
d9dc54d267
remove vertex rounding
...
fix vertex hash not including negative axis points
use angle instead of zero-area triangle
2022-07-13 04:35:42 -04:00
d30d4000bc
qbsp: fix log spam from BrushBSP
2022-07-13 00:30:53 -06:00
0fb1b429a8
finish tjunc algorithm - can now retopologize by splitting fans up
...
lower zero-area triangle epsilon
2022-07-12 17:43:25 -04:00
632facc6a7
implement a non-brute force method to reduce vertices to test
2022-07-11 08:29:53 -04:00
c1168bc8ae
fix tjunc output not actually outputting proper new vertices
...
allow for basic rotation of face to find a good orientation
2022-07-11 05:12:48 -04:00
1e84284977
fix tjunc using w instead of output_vertices
2022-07-11 02:43:37 -04:00
1aa2a9b250
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
...
# Conflicts:
# qbsp/qbsp.cc
2022-07-11 01:41:10 -04:00
f98dd05f56
new, simpler qbsp3-esque TJunc code;
...
- currently uses naive brute force approach to finding vertices on faces
- simplify 'face fragments', which now only need to contain vertex indices since they are already emitted
2022-07-11 01:40:10 -04:00
f86a5343fb
qbsp: rename options -> qbsp_options
2022-07-10 17:30:00 -06:00
050886f32c
tests: unify tests under one target
...
to ease sharing code. vis/light tests are going to need the testqbsp infrastructure.
2022-07-10 16:36:15 -06:00
a9b9892761
qbsp: disable tjunc for now
2022-07-10 14:49:04 -06:00
4feb2bd2c7
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-07-10 14:11:31 -04:00
b30d200543
remove `entity` from functions that no longer need it
...
EmitVertices as its own phase
2022-07-10 12:50:16 -04:00
54a6762a05
qbsp: add edge sharing test
2022-07-10 01:25:28 -06:00
17112d3683
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-07-10 03:21:44 -04:00
f213f4aa45
fix edge sharing
...
remove the "don't share edges if they have different contents" thing
2022-07-10 03:21:36 -04:00
5da679d699
qbsp: trim some legacy comments/code
2022-07-10 00:15:25 -06:00
d590e3d940
qbsp: move MakeBspBrushList to csg.cc for qbsp3 parity
2022-07-09 23:44:22 -06:00
5f37159224
allow disabling auto-upgrade, in the case where you don't want it to keep trying to output a BSP2/QBSP when it won't work in your target engine(s)
...
# Conflicts:
# include/qbsp/qbsp.hh
2022-07-08 02:06:12 -04:00
43c5e942b2
move faceextents_t & friends to common
...
use stb_image_write for PNGs for better compression on bsp.json
add in code for spitting out a lightmap from a face. doesn't support other styles and such yet.
2022-07-08 02:06:06 -04:00
705ab73169
rename light option `lmscale` to `lightmap_scale` to reflect its qbsp usage (a forced replacement of the "default" lightmap scale)
...
allow qbsp to be passed an `-lmscale` to facilitate a global lmscale change for BSPX
fix code paths for writing both lightmap sizes out
# Conflicts:
# include/qbsp/qbsp.hh
2022-07-08 02:06:06 -04:00
8a4caa40a2
testqbsp: remove !mayfail from dm1 test
2022-07-07 10:12:52 -06:00
c2a2890240
testqbsp: add texture metadata for some of the base1.map special textures
...
so we can compile a working version of the map
2022-07-07 01:21:50 -06:00
5cd178e105
qbsp: revert change to SphereOnPlaneSide for now as it's breaking tests
2022-07-06 23:36:59 -06:00
4ab5a05d4c
qbsp: swap BoxOnPlaneSide for SphereOnPlaneSide
2022-07-05 00:40:53 -06:00
20ca6d2ef9
qbsp: add sphere bounds for bspbrush_t
2022-07-05 00:20:57 -06:00
bc6090d576
qbsp: move SubdivideFace to match qbsp3
2022-07-04 01:20:12 -06:00
92aa55db8f
qbsp: clean up some dead code
2022-07-04 01:15:17 -06:00
554e29e861
tree.cc: sync PruneNodes_R condition with qbsp3
2022-07-04 00:37:02 -06:00
ac80d11e69
qbsp: move FreeTreePortals to tree.cc
2022-07-04 00:26:28 -06:00
fce258a7b7
qbsp: csg4.cc -> csg.cc
2022-07-04 00:17:18 -06:00
296426f526
qbsp: use unique_ptr for tree_t
2022-07-03 23:48:00 -06:00
97d360120b
qbsp: use unique_ptr for node_t::facelist
2022-07-03 23:41:48 -06:00
4ab4cb7dc8
qbsp: use unique_ptr for portal_t
2022-07-03 22:45:25 -06:00
de68bee886
qbsp: move tree_t to tree.hh
2022-07-03 21:36:17 -06:00
a0d81372d1
improved path detection (and overriding) routines
...
(cherry picked from commit 32f33fb4b3
2022-07-03 18:23:40 -04:00
40bba01b21
qbsp: brushbsp.cc import from qbsp3
2022-07-03 01:22:09 -06:00
cb4a1ad8a3
re-add nodraw/sky warning
2022-06-30 15:12:42 -04:00
f7016d1af0
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-30 05:24:53 -04:00
9f734ff976
Merge branch 'type-cleanup' into brushbsp
...
# Conflicts:
# common/bspfile.cc
# include/common/bspfile.hh
# light/trace.cc
2022-06-30 05:23:05 -04:00
862d9bd5f2
testqbsp: add q1_clip_func_wall
...
Ensure submodels that are all "clip" get bounds set correctly
2022-06-30 00:53:02 -06:00
2127209955
qbsp: add CreateBrushWindings from qbsp3
2022-06-30 00:31:42 -06:00
03ee5c52e8
add an entry point for specifically loading meta-only file formats, like .wal; used for discerning replacements from their source material (since replacements are often larger than the default, we need the scale info)
...
add a new meta format, which is just a JSON representation of the metadata contained in a .wal
simplify texture loading in `light`
fix `light` not handling replacement textures very well
string_iequals take string_view like the others
move averageColor to be alongside pixel data, where it belongs
2022-06-29 12:59:33 -04:00
292d5afb5e
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-28 06:08:04 -04:00
c1dc3cb7d8
Merge branch 'type-cleanup' into brushbsp
...
# Conflicts:
# include/common/bspfile.hh
2022-06-28 04:13:26 -04:00
1693bb3877
qbsp: side_t doesn't need sphere culling
2022-06-28 02:01:41 -06:00
b21e245d99
qbsp: surface.cc -> faces.cc
2022-06-28 00:23:47 -06:00
c64b869248
testqbsp: make winding test [.releaseonly] as it crashes on msvc debug builds
2022-06-28 00:21:59 -06:00
eb1f7acc02
qbsp: move PruneNodes to tree.cc for qbsp3 alignment
2022-06-28 00:06:18 -06:00
44c50717c3
move generic image loading routine to `img`
...
move light-specific "load textures from BSP" routine to light
fix a couple bugs with external wad textures (there should always be at least a 40-byte miptex in there)
light can now load external textures
move -paths to common settings
fix bug with missing texture not filling miptex name
2022-06-28 01:37:12 -04:00
29a622d106
testqbsp: use -noverbose by default
2022-06-27 22:44:08 -06:00
7439fc30db
testqbsp: fix absolute path in q1_wad_external
2022-06-27 22:40:38 -06:00
c23b7d2ec9
allow Quake-likes to load textures similarly to Q2 (finding best place to load them from)
...
allow Quake and Q2 to handle other texture formats (mainly just TGA for now)
2022-06-27 11:30:28 -04:00
bf1cb56e5a
fix build
...
add setting to control file priority
2022-06-27 10:41:24 -04:00
59bff81e9d
tests for new WAD stuff
2022-06-27 08:14:30 -04:00
26608c1b37
Merge branch 'type-cleanup' into brushbsp
...
# Conflicts:
# common/bspfile.cc
# common/bspinfo.cc
2022-06-27 08:14:03 -04:00
732621c59a
fix bugs in miptex writing
...
clear FS when loading filesystem again (for tests mainly)
move img::load_palette to where it is in brushbsp
2022-06-27 08:13:04 -04:00
a7662a9c9b
fix noclipfaces being inverted from type-cleanup
2022-06-27 06:56:20 -04:00
cf04f644e0
Merge branch 'type-cleanup' into brushbsp
...
# Conflicts:
# common/bspinfo.cc
# include/common/bspfile.hh
# include/qbsp/map.hh
# include/qbsp/wad.hh
# qbsp/wad.cc
2022-06-27 06:44:45 -04:00
ba7c18fd35
Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup
2022-06-27 03:58:41 -04:00
510023e089
step 1 of finishing the rewrite I started of the image subsystems.
...
- for Quake-likes, WADs will be added as file system archives directly when the first brush is encountered since the wad key is ready to go by that point.
- after loading the .map and before constructing the BSP, what I call secondary textures (animation frames for Quake-likes) are added to the list, and the BSP's miptex data is filled.
- BSP miptex data is now opaque to the BSP process; the BSP simply copies the raw miptex information from the input. This simplifies the BSP structures and reading/writing routines.
- the img subsystem supports reading from raw miptexes now, although in practice this only happens for Quake-likes atm
- instead of a "wal cache", maps now have a "meta cache" which stores the metadata information for all games instead of just Quake II
- texture meta can now be ref'd out rather than needing to be copied every time (mainly only a gain for the std::string)
- wad.cc/wad.hh is gone; wads are now pushed into the filesystem archive
- fixed broken wad_archive
- fs subsystem iterated on a little bit; supports marking archives as external (only used for wads currently; see `LoadTextureData`)
- load_tga has better error handling
- add in foot-gun protection to the BSP readers; now they assert on failure to read instead of silently propagating that error throughout the rest of the process
- bsputil uses img stuff now, so it should handle palettes better
2022-06-27 03:58:23 -04:00
c7111cc99e
qbsp: move FloodAreas to portals.cc for parity with qbsp3
2022-06-27 01:32:34 -06:00
e660182c37
testqbsp: readd "-nopercent" as test output is too verbose without
2022-06-27 01:20:16 -06:00
5624f7012a
qbsp: moving PortalThru->Portal_VisFlood, Portal_EntityFlood to portals.cc for qbsp3 parity
...
also fixes to both to match qbsp3
2022-06-27 01:13:21 -06:00
4c2111bfd3
testqbsp: re-enable base1.map test as well as dm1.map (disabled by default as it's too slow on debug builds)
2022-06-27 00:33:04 -06:00
22f0def4b1
update Catch2 to v3.0.1
2022-06-26 13:21:29 -06:00
aabd1c27dc
qbsp: face_t: make contents, lmshifts single sided
...
side_t: same, also remove contents (unused)
2022-06-24 01:14:11 -06:00
afec0a947e
qbsp: change bspbrush_t.sides from face_t to side_t
2022-06-24 00:43:40 -06:00
fac5ea384d
qbsp: rename bspbrush_t.faces to .sides
2022-06-24 00:21:55 -06:00
b37d29ee33
common: rename side_t -> planeside_t (side_t is used by qbsp3)
2022-06-24 00:16:46 -06:00
4a1c5842a3
qbsp: rename solidbsp.cc -> brushbsp.cc for consistency with qbsp3
2022-06-24 00:08:12 -06:00
038651fca6
qbsp: rename brush_t -> bspbrush_t for consistency with qbsp3
2022-06-24 00:01:02 -06:00
ee596f3ff1
use vector for vis state
...
set autoclean default to true, make it invertable
2022-06-23 16:18:52 -04:00
92af2ed3f7
qbsp: restore weird 1 unit bounds shrinkage Q1 needs
2022-06-22 22:37:09 -06:00
af802d5447
qbsp: fix model bounds
2022-06-22 22:23:14 -06:00
84263ef1a1
testqbsp: add model bounds test map
2022-06-22 22:11:40 -06:00
b99ea58ed7
testqbsp: q1 leaf/node bounds tests
2022-06-22 21:43:41 -06:00
f84c794668
testqbsp: make "origin" test accept legacy ericwtools output
2022-06-22 21:43:41 -06:00
0fa779afaa
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-22 14:43:57 -04:00
c054db0f48
testqbsp: shouldn't use -keepprt as the tests are checking for the .prt files
2022-06-21 23:46:13 -06:00
54ac8123e3
use old WindingIsTiny
2022-06-22 01:02:12 -04:00
b77c25dcd4
qbsp: fix -keepprt
2022-06-21 22:05:54 -06:00
60df9eba81
disable `ChooseMidPlaneFromList` to fix regression
2022-06-21 21:07:26 -04:00
8332c78871
testqbsp: flag water_detail_illusionary as mayfail
2022-06-21 17:25:56 -06:00
40f370dbd5
Merge branch 'portalfaces' into brushbsp
2022-06-21 16:25:19 -06:00
36a8327452
cherry-pick 812159312e from @Shpoike
...
Don't strip extended mip data.
2022-06-21 14:11:58 -04:00
7e1ede2ac3
qbsp: remove old face creation code
2022-06-21 02:01:52 -06:00
57473f7b4a
Merge branch 'brushbsp' into portalfaces
2022-06-21 01:45:14 -06:00
98e27cf620
testqbsp: improve water_detail_illusionary test
2022-06-21 01:16:55 -06:00
6be54eadb0
testqbsp: improve water_detail_illusionary test
2022-06-21 01:05:41 -06:00
b3f88d6797
qbsp: remove redundant MergeAll call
2022-06-21 00:40:31 -06:00
84e007b7ce
qbsp: fix noclipfaces tests
2022-06-21 00:39:07 -06:00
e39c8f9cf6
qbsp: fix simple_worldspawn_detail_wall
2022-06-20 23:05:56 -06:00
6770d8aa34
testqbsp: remove mayfail
2022-06-20 20:56:19 -06:00
1c4b90a032
qbsp: fix detail_illusionary_noclipfaces_intersecting
2022-06-20 20:53:56 -06:00
df3e6d3988
remove Little* funcs, not used any more
...
remove byteswap as it wasn't used any more
re-introduce imemstream and omemstream to make it harder to accidentally use the wrong operators
add dynamic padding stream manipulator
use memstreams for BSPX
2022-06-20 21:39:08 -04:00
c79e263753
simplify bspx code
...
remove old obj preview for wrnormals
2022-06-20 20:42:34 -04:00
e422da15c3
simplify OutsideFill_Passable
2022-06-20 11:58:40 -04:00
83c1316cdd
docs
2022-06-20 02:25:02 -06:00
4d30257907
testqbsp: fix test expectation for detail_illusionary_noclipfaces_intersecting
2022-06-20 02:23:06 -06:00
b35233afa2
qbsp: fix assertion failure in qbspfeatures.map
2022-06-19 19:53:58 -06:00
5c5e6e1ea7
qbsp: fix brush_clipping_order
2022-06-19 17:32:18 -06:00
4f3ca8c252
qbsp: wip import MarkVisibleSides from qbsp3
2022-06-19 16:04:54 -06:00
59d6169b3d
qbsp: add a test of just a cube
2022-06-19 16:04:54 -06:00
5fc6cbc95e
qbsp: wip import MakeFaces from qbsp3
2022-06-19 16:04:54 -06:00
276b62e30a
Revert "first attempt at clustering leaffaces together"
...
This reverts commit a41c68886a
2022-06-18 16:26:31 -06:00
0a424ca79c
testqbsp: add a markfaces test to simple_sealed
2022-06-18 16:26:28 -06:00
3492ef2b9e
qbsp: fix invalid leaf bounds in MakeTreePortals_r
2022-06-18 16:13:00 -06:00
ccf605794e
qbsp: throw exception in ExportLeaf if a leaf bounds is invalid
...
add check in test suite that qbspfeatures.map doesn't get upgraded to BSP2 due to invalid leaf bounds
2022-06-18 16:11:29 -06:00
ea985eb5ac
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-18 17:29:13 -04:00
a41c68886a
first attempt at clustering leaffaces together
2022-06-18 17:07:36 -04:00
6fb3bf957a
qbsp: detail seals in q2 test passes now
2022-06-18 13:48:30 -06:00
b91973bae1
qbsp: remove old/unused portal code
2022-06-18 13:44:24 -06:00
8d5978dcc2
qbsp: switch to qbsp3 implementation for MakeTreePortals
...
Quick update to outside filling to remove cluster handling, because now we perform filling with
all leaf portals
2022-06-18 13:42:41 -06:00
158c65b056
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-18 12:53:53 -06:00
7eedf52bf4
sync up BaseWinding checking
...
add constructor to aabb to construct from range
2022-06-18 14:33:16 -04:00
6a310de784
sort brush result sets by file order for determinism
2022-06-18 13:54:07 -04:00
b14aaff705
qbsp: switch over to CreateVisPortals_r
2022-06-18 11:46:51 -06:00
501ccda2d1
qbsp: don't attempt to parallelize portal generation
2022-06-18 11:46:40 -06:00
214a2550f4
qbsp: isolate portal_state_t in prtfile.cc
2022-06-18 00:32:40 -06:00
1fb5753f60
qbsp: import CreateVisPortals_r from qbsp3
2022-06-17 23:59:19 -06:00
65e6fafb3e
qbsp: import MakeNodePortal, MakeTreePortals from qbsp3
2022-06-17 23:52:33 -06:00
7d3b5a9c3f
qbsp: import SplitNodePortals from qbsp3
2022-06-17 22:34:36 -06:00
af2dd987d8
qbsp: import BaseWindingForNode from qbsp3
2022-06-17 22:10:11 -06:00
3e2045479b
qbsp: move .prt writing to prtfile.cc to align with qbsp3
2022-06-17 20:31:37 -06:00
9423e68e9f
qbsp: fix _noclipfaces
2022-06-17 17:55:17 -06:00
2248b8cd73
testqbsp: add more portal assertions
2022-06-17 02:41:39 -06:00
00d9d403ea
testqbsp: fix wrong winding constructor being chosen
2022-06-17 01:58:26 -06:00
259d95e47c
testqbsp: add a first portal test
2022-06-17 01:53:08 -06:00
da346a931a
testqbsp: quick setup of code to run test suite against a reference q1 compiler
2022-06-17 00:59:18 -06:00
7ac4012f92
testqbsp: replace map.leakfile checks with checking .prt file existence
2022-06-16 23:33:55 -06:00
0edd52517a
testqbsp: read .prt files back in
2022-06-16 23:22:15 -06:00
f1823f30fa
testqbsp: rename LoadTestmap -> LoadTestmapQ1
2022-06-16 23:05:00 -06:00
8c90c5c3dc
qbsp: fix dangling std::string access through string_view
2022-06-16 20:58:46 -04:00
0b67acd4ba
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
...
# Conflicts:
# include/common/bspfile.hh
2022-06-16 20:22:36 -04:00
e57633bbca
the old Safe read/writes are gonedy now
2022-06-16 20:22:03 -04:00
83271c5dac
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-16 17:06:45 -06:00
5855ab3528
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-16 12:06:45 -04:00
41ef66190f
consistency rename; gtexinfo_t -> mtexinfo_t
2022-06-16 09:36:31 -04:00
617cd3b089
consistency rename; texdata_t -> maptexdata_t
2022-06-16 09:35:46 -04:00
c62480c337
consistency rename; mtexinfo_t -> maptexinfo_t
2022-06-16 09:35:08 -04:00
b8dcc7535e
qbsp: rename FreeAllPortals -> FreeTreePortals_r
2022-06-15 23:27:39 -06:00
dfb8d7c9fc
qbsp: refactoring portal code towards qbsp3
2022-06-15 21:37:19 -06:00
7ffae0754c
Merge remote-tracking branch 'github-desktop-paril/type-cleanup' into brushbsp
2022-06-15 19:15:48 -06:00
8afcc54b74
move making contents valid from brush parsing into gamedef
2022-06-15 09:07:37 -04:00
3474dd00c5
qbsp: add portal_t::onnode, tree_t from qbsp3
2022-06-15 00:45:58 -06:00
27baeb8657
testqbsp: add check for no bspx lumps
2022-06-14 23:48:49 -06:00
f5ed79c936
qbsp: fix dangling std::string access through string_view
2022-06-14 21:33:48 -06:00
7911782a3b
only use alias data if it's classname or if it's not overridden
2022-06-14 19:37:36 -04:00
23ae3edd56
implement entity aliases
2022-06-14 18:47:44 -04:00
eedabe6f1c
fix bugs
2022-06-14 18:38:22 -04:00
17656eff78
don't return string ref, since it can be modified after it's inserted because of the vector growing
2022-06-14 18:34:01 -04:00
78b979d670
Merge branch 'type-cleanup' into brushbsp
...
# Conflicts:
# include/light/entities.hh
# qbsp/brush.cc
# qbsp/map.cc
2022-06-14 17:19:30 -04:00
d24ea4922a
entdict cleanup
2022-06-14 17:18:13 -04:00
f1fd0bd30f
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-14 10:50:54 -04:00
54c3103bdc
mark it as warning
2022-06-14 10:50:47 -04:00
7827885f0f
add texturedef support
...
change Q2_CONTENTS_TRANSLUCENT parsing; remove it always, but if the surface doesn't have TRANS then swap it with DETAIL which is probably what they intended
2022-06-14 10:50:35 -04:00
bf36bd56f7
qbsp: fix qbsp_q1_sealing test case
2022-06-14 02:03:50 -06:00
a309e8467b
testmaps: add qbsp_q1_sealing.map
2022-06-14 00:44:50 -06:00
0266507833
testqbsp: tag qbsp_q2_detail_seals as mayfail
2022-06-13 23:37:46 -06:00
4e7ecbf9ff
testqbsp: add qbsp_q2_detail_seals
2022-06-13 22:50:01 -06:00
1cddbf1ad9
testqbsp: add qbsp_q2_seal_empty_rooms
2022-06-13 22:39:04 -06:00
7b38f24ae8
Q2 doesn't use the old animation method
2022-06-13 07:26:23 -04:00
Jonathan
Eric Wasylishen