Commit Graph

2214 Commits

Author SHA1 Message Date
Eric Wasylishen 1b586e62d9 ci: mac: print shared library deps 2021-09-12 01:30:20 -06:00
xDShot 4a1feadaab
#include <limits.h> (#319)
Fixes error about undefined INT_MAX in common/bspfile.cc
2021-09-12 00:15:02 -06:00
Eric Wasylishen 81d58e5e89 test: add -noverbose to qbsp invocations 2021-09-11 13:47:36 -06:00
Eric Wasylishen 66f6362773 ci: checkout recursive 2021-09-11 13:27:11 -06:00
Eric Wasylishen 3d9d167360 build: fix build-osx.sh 2021-09-11 13:12:25 -06:00
Eric Wasylishen 2c3afefa50 cmake.yml: fix typo 2021-09-11 12:42:44 -06:00
Eric Wasylishen 82cd5e43ea cmake.yml: run existing build scripts 2021-09-11 12:41:49 -06:00
Eric Wasylishen 8b00905549
ci: github actions starter script 2021-09-11 11:50:10 -06:00
Ozkan Sezer b2911290a7
fix hexen2 hull sizes (#318) 2021-09-11 11:46:03 -06:00
Jonathan 8cdb9ff6c4 Initial attempt at leafbrushes 2021-09-09 05:11:47 -04:00
Jonathan 35040d1bd3 Q2 working sorta 2021-09-09 02:13:28 -04:00
Jonathan 9800f4f738 Mostly all native!! 2021-09-09 00:26:17 -04:00
Ozkan Sezer 69cb6b981f
bsputil: write ents in binary mode and print its crc in 4-digit hex (#317) 2021-09-08 17:50:32 -06:00
Jonathan 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
Jonathan 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
Jonathan 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
Jonathan acc65953ce Use tie for mtexinfo too 2021-09-06 22:15:59 -04:00
Jonathan 398b865c96 throw array in there too 2021-09-06 22:13:45 -04:00
Jonathan 9602772450 Use tie for operator</> of surfflags_t 2021-09-06 22:12:57 -04:00
Jonathan 437459a4dd Finish using game everywhere 2021-09-06 18:09:13 -04:00
Jonathan dd3bcebe39 Fix missing newline 2021-09-06 17:29:09 -04:00
Jonathan 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
Jonathan 8c7df2b062 Merge branch 'master' into qbsp-use-common
# Conflicts:
#	qbsp/writebsp.cc
2021-09-06 17:25:12 -04:00
Jonathan 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
Eric Wasylishen 99f1da85a7 Merge remote-tracking branch 'origin/master' into qbsp-use-common 2021-09-06 15:12:09 -06:00
Eric Wasylishen 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
Eric Wasylishen 71bb22dc28 qbsp: auto switch to extended limits formats 2021-09-06 14:20:51 -06:00
Eric Wasylishen b1892d6aa3 qbsp: merge from master 2021-09-06 13:52:28 -06:00
Eric Wasylishen 648ef89845 qbsp: naming fix 2021-09-06 13:44:36 -06:00
Eric Wasylishen 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
Eric Wasylishen dc81db8b2f testmaps: add phongtest2.map 2021-09-05 17:57:13 -06:00
Jonathan 8fd1d89b8d Fix double-delete
Fix typo
2021-09-05 17:39:17 -04:00
Jonathan 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
Eric Wasylishen c90ac7d6a7 common: bsp29: validate edges/marksurfaces 2021-09-05 01:28:58 -06:00
Eric Wasylishen 948932f333 common: bsp29: validate clipnodes 2021-09-05 01:10:23 -06:00
Eric Wasylishen a0ccb765e8 common: validate bsp29 nodes and faces 2021-09-05 01:04:39 -06:00
Eric Wasylishen f978d2a8d5 common: start adding overflow checks to ConvertBSPFormat 2021-09-05 00:44:25 -06:00
Jonathan 04ad8e2962 OOP wad file stuff 2021-09-04 23:23:03 -04:00
Jonathan 3b656e6ef1 Cleanup & preserve texture name for q2bsp 2021-09-04 22:15:04 -04:00
Jonathan b01fddf7f1 More Q2 support 2021-09-04 18:49:01 -04:00
Eric Wasylishen 54799a11fc qbsp: restore bspx brushes writing 2021-09-04 11:47:33 -06:00
Eric Wasylishen 1e6e938ead qbsp: restore writing LMSHIFT bspx lump 2021-09-04 10:47:43 -06:00
Eric Wasylishen 047bc1299a qbsp: fix tests 2021-09-01 01:19:24 -06:00
Eric Wasylishen 54d9e08033 qbsp: handle target bsp version 2021-09-01 00:42:30 -06:00
Eric Wasylishen 3cbf54749e qbsp: fix -onlyents 2021-08-31 23:53:40 -06:00
Eric Wasylishen bc44af4d1d qbsp: fix unused variable warnings 2021-08-31 22:42:49 -06:00
Eric Wasylishen 2e09ad509b Merge remote-tracking branch 'origin/master' into qbsp-use-common 2021-08-31 22:40:51 -06:00
Jonathan 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
Eric Wasylishen 8ed7dc9c05 qbsp: build fix 2021-08-30 01:18:47 -06:00
Eric Wasylishen fd32600c4d build: silence "inherits via dominance" warning 2021-08-30 01:05:45 -06:00