Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Added bspc to the solution (with initial ql support) #104

Merged
merged 1 commit into from Jul 31, 2012

Conversation

Projects
None yet
3 participants
Contributor

QBall147 commented Jul 30, 2012

currently does not compile on linux (using scons). To compile for linux go to the bspsc directory and type 'make', then copy the resulting ./bspc to the /install dir

Owner

TTimo commented Jul 30, 2012

Cool. Where does that code come from, is it straight from the Quake III
Arena GPL release, or was it modified in between, etc.?
I thought there was another github with an updated/maintained version of
bspc .. should we use that instead of pulling a fork into our own tree?

On Mon, Jul 30, 2012 at 6:32 AM, QBall147 <
reply@reply.github.com

wrote:

currently does not compile on linux (using scons). To compile for linux go
to the bspsc directory and type 'make', then copy the resulting ./bspc to
the /install dir

You can merge this Pull Request by running:

git pull https://github.com/QBall147/GtkRadiant bspc

Or you can view, comment on it, or merge it online at:

#104

-- Commit Summary --

  • Added bspc to the solution (with ql support)

-- File Changes --

M radiant.sln (8)
A tools/quake3/bspc/.deps (249)
A tools/quake3/bspc/.gitignore (5)
A tools/quake3/bspc/Conscript (75)
A tools/quake3/bspc/LICENSE (339)
A tools/quake3/bspc/Makefile (109)
A tools/quake3/bspc/README.md (48)
A tools/quake3/bspc/_files.c (63)
A tools/quake3/bspc/aas_areamerging.c (390)
A tools/quake3/bspc/aas_areamerging.h (24)
A tools/quake3/bspc/aas_cfg.c (254)
A tools/quake3/bspc/aas_cfg.h (77)
A tools/quake3/bspc/aas_create.c (1141)
A tools/quake3/bspc/aas_create.h (136)
A tools/quake3/bspc/aas_edgemelting.c (108)
A tools/quake3/bspc/aas_edgemelting.h (24)
A tools/quake3/bspc/aas_facemerging.c (282)
A tools/quake3/bspc/aas_facemerging.h (24)
A tools/quake3/bspc/aas_file.c (549)
A tools/quake3/bspc/aas_file.h (25)
A tools/quake3/bspc/aas_gsubdiv.c (656)
A tools/quake3/bspc/aas_gsubdiv.h (25)
A tools/quake3/bspc/aas_map.c (849)
A tools/quake3/bspc/aas_map.h (23)
A tools/quake3/bspc/aas_prunenodes.c (89)
A tools/quake3/bspc/aas_prunenodes.h (24)
A tools/quake3/bspc/aas_store.c (1082)
A tools/quake3/bspc/aas_store.h (107)
A tools/quake3/bspc/aasfile.h (252)
A tools/quake3/bspc/be_aas_bspc.c (277)
A tools/quake3/bspc/be_aas_bspc.h (23)
A tools/quake3/bspc/brushbsp.c (1872)
A tools/quake3/bspc/bspc.c (1036)
A tools/quake3/bspc/bspc.sln (19)
A tools/quake3/bspc/bspc.vcproj (1771)
A tools/quake3/bspc/cfgq3.c (84)
A tools/quake3/bspc/csg.c (1005)
A tools/quake3/bspc/deps/botlib/aasfile.h (267)
A tools/quake3/bspc/deps/botlib/be_aas.h (221)
A tools/quake3/bspc/deps/botlib/be_aas_bsp.h (89)
A tools/quake3/bspc/deps/botlib/be_aas_bspq3.c (487)
A tools/quake3/bspc/deps/botlib/be_aas_cluster.c (1545)
A tools/quake3/bspc/deps/botlib/be_aas_cluster.h (38)
A tools/quake3/bspc/deps/botlib/be_aas_debug.c (777)
A tools/quake3/bspc/deps/botlib/be_aas_debug.h (62)
A tools/quake3/bspc/deps/botlib/be_aas_def.h (306)
A tools/quake3/bspc/deps/botlib/be_aas_entity.c (437)
A tools/quake3/bspc/deps/botlib/be_aas_entity.h (63)
A tools/quake3/bspc/deps/botlib/be_aas_file.c (582)
A tools/quake3/bspc/deps/botlib/be_aas_file.h (42)
A tools/quake3/bspc/deps/botlib/be_aas_funcs.h (47)
A tools/quake3/bspc/deps/botlib/be_aas_main.c (429)
A tools/quake3/bspc/deps/botlib/be_aas_main.h (61)
A tools/quake3/bspc/deps/botlib/be_aas_move.c (1101)
A tools/quake3/bspc/deps/botlib/be_aas_move.h (71)
A tools/quake3/bspc/deps/botlib/be_aas_optimize.c (312)
A tools/quake3/bspc/deps/botlib/be_aas_optimize.h (33)
A tools/quake3/bspc/deps/botlib/be_aas_reach.c (4547)
A tools/quake3/bspc/deps/botlib/be_aas_reach.h (68)
A tools/quake3/bspc/deps/botlib/be_aas_route.c (2209)
A tools/quake3/bspc/deps/botlib/be_aas_route.h (67)
A tools/quake3/bspc/deps/botlib/be_aas_routealt.c (240)
A tools/quake3/bspc/deps/botlib/be_aas_routealt.h (40)
A tools/quake3/bspc/deps/botlib/be_aas_sample.c (1394)
A tools/quake3/bspc/deps/botlib/be_aas_sample.h (69)
A tools/quake3/bspc/deps/botlib/be_ai_char.c (790)
A tools/quake3/bspc/deps/botlib/be_ai_char.h (48)
A tools/quake3/bspc/deps/botlib/be_ai_chat.c (3017)
A tools/quake3/bspc/deps/botlib/be_ai_chat.h (113)
A tools/quake3/bspc/deps/botlib/be_ai_gen.c (134)
A tools/quake3/bspc/deps/botlib/be_ai_gen.h (33)
A tools/quake3/bspc/deps/botlib/be_ai_goal.c (1821)
A tools/quake3/bspc/deps/botlib/be_ai_goal.h (118)
A tools/quake3/bspc/deps/botlib/be_ai_move.c (3610)
A tools/quake3/bspc/deps/botlib/be_ai_move.h (142)
A tools/quake3/bspc/deps/botlib/be_ai_weap.c (543)
A tools/quake3/bspc/deps/botlib/be_ai_weap.h (104)
A tools/quake3/bspc/deps/botlib/be_ai_weight.c (912)
A tools/quake3/bspc/deps/botlib/be_ai_weight.h (83)
A tools/quake3/bspc/deps/botlib/be_ea.c (508)
A tools/quake3/bspc/deps/botlib/be_ea.h (66)
A tools/quake3/bspc/deps/botlib/be_interface.c (881)
A tools/quake3/bspc/deps/botlib/be_interface.h (57)
A tools/quake3/bspc/deps/botlib/botlib.h (516)
A tools/quake3/bspc/deps/botlib/l_crc.c (151)
A tools/quake3/bspc/deps/botlib/l_crc.h (29)
A tools/quake3/bspc/deps/botlib/l_libvar.c (294)
A tools/quake3/bspc/deps/botlib/l_libvar.h (63)
A tools/quake3/bspc/deps/botlib/l_log.c (169)
A tools/quake3/bspc/deps/botlib/l_log.h (46)
A tools/quake3/bspc/deps/botlib/l_memory.c (463)
A tools/quake3/bspc/deps/botlib/l_memory.h (76)
A tools/quake3/bspc/deps/botlib/l_precomp.c (3233)
A tools/quake3/bspc/deps/botlib/l_precomp.h (180)
A tools/quake3/bspc/deps/botlib/l_script.c (1441)
A tools/quake3/bspc/deps/botlib/l_script.h (247)
A tools/quake3/bspc/deps/botlib/l_struct.c (462)
A tools/quake3/bspc/deps/botlib/l_struct.h (76)
A tools/quake3/bspc/deps/botlib/l_utils.h (37)
A tools/quake3/bspc/deps/botlib/lcc.mak (55)
A tools/quake3/bspc/deps/botlib/linux-i386.mak (92)
A tools/quake3/bspc/deps/qcommon/cm_load.c (839)
A tools/quake3/bspc/deps/qcommon/cm_local.h (196)
A tools/quake3/bspc/deps/qcommon/cm_patch.c (1773)
A tools/quake3/bspc/deps/qcommon/cm_patch.h (103)
A tools/quake3/bspc/deps/qcommon/cm_polylib.c (737)
A tools/quake3/bspc/deps/qcommon/cm_polylib.h (68)
A tools/quake3/bspc/deps/qcommon/cm_public.h (76)
A tools/quake3/bspc/deps/qcommon/cm_test.c (478)
A tools/quake3/bspc/deps/qcommon/cm_trace.c (1471)
A tools/quake3/bspc/deps/qcommon/cmd.c (715)
A tools/quake3/bspc/deps/qcommon/common.c (3317)
A tools/quake3/bspc/deps/qcommon/cvar.c (906)
A tools/quake3/bspc/deps/qcommon/files.c (3419)
A tools/quake3/bspc/deps/qcommon/huffman.c (437)
A tools/quake3/bspc/deps/qcommon/ioapi.h (75)
A tools/quake3/bspc/deps/qcommon/md4.c (303)
A tools/quake3/bspc/deps/qcommon/msg.c (1757)
A tools/quake3/bspc/deps/qcommon/net_chan.c (742)
A tools/quake3/bspc/deps/qcommon/puff.h (43)
A tools/quake3/bspc/deps/qcommon/q_platform.h (374)
A tools/quake3/bspc/deps/qcommon/q_shared.h (1304)
A tools/quake3/bspc/deps/qcommon/qcommon.h (1190)
A tools/quake3/bspc/deps/qcommon/qfiles.h (581)
A tools/quake3/bspc/deps/qcommon/surfaceflags.h (80)
A tools/quake3/bspc/deps/qcommon/unzip.c (4299)
A tools/quake3/bspc/deps/qcommon/unzip.h (338)
A tools/quake3/bspc/deps/qcommon/vm.c (835)
A tools/quake3/bspc/deps/qcommon/vm_interpreted.c (889)
A tools/quake3/bspc/deps/qcommon/vm_local.h (190)
A tools/quake3/bspc/deps/qcommon/vm_powerpc_asm.h (156)
A tools/quake3/bspc/deps/qcommon/vm_ppc.c (1479)
A tools/quake3/bspc/deps/qcommon/vm_ppc_new.c (2119)
A tools/quake3/bspc/deps/qcommon/vm_sparc.h (78)
A tools/quake3/bspc/deps/qcommon/vm_x86.c (1196)
A tools/quake3/bspc/faces.c (978)
A tools/quake3/bspc/gldraw.c (232)
A tools/quake3/bspc/glfile.c (149)
A tools/quake3/bspc/l_bsp_ent.c (180)
A tools/quake3/bspc/l_bsp_ent.h (58)
A tools/quake3/bspc/l_bsp_hl.c (893)
A tools/quake3/bspc/l_bsp_hl.h (314)
A tools/quake3/bspc/l_bsp_q1.c (620)
A tools/quake3/bspc/l_bsp_q1.h (275)
A tools/quake3/bspc/l_bsp_q2.c (1134)
A tools/quake3/bspc/l_bsp_q2.h (98)
A tools/quake3/bspc/l_bsp_q3.c (824)
A tools/quake3/bspc/l_bsp_q3.h (81)
A tools/quake3/bspc/l_bsp_sin.c (1186)
A tools/quake3/bspc/l_bsp_sin.h (106)
A tools/quake3/bspc/l_cmd.c (1234)
A tools/quake3/bspc/l_cmd.h (158)
A tools/quake3/bspc/l_log.c (215)
A tools/quake3/bspc/l_log.h (42)
A tools/quake3/bspc/l_math.c (289)
A tools/quake3/bspc/l_math.h (93)
A tools/quake3/bspc/l_mem.c (441)
A tools/quake3/bspc/l_mem.h (51)
A tools/quake3/bspc/l_poly.c (1411)
A tools/quake3/bspc/l_poly.h (120)
A tools/quake3/bspc/l_qfiles.c (663)
A tools/quake3/bspc/l_qfiles.h (91)
A tools/quake3/bspc/l_threads.c (1505)
A tools/quake3/bspc/l_threads.h (45)
A tools/quake3/bspc/l_utils.c (259)
A tools/quake3/bspc/l_utils.h (79)
A tools/quake3/bspc/lcc.mak (61)
A tools/quake3/bspc/leakfile.c (101)
A tools/quake3/bspc/linux-i386.mak (109)
A tools/quake3/bspc/map.c (1274)
A tools/quake3/bspc/map_hl.c (1114)
A tools/quake3/bspc/map_q1.c (1174)
A tools/quake3/bspc/map_q2.c (1162)
A tools/quake3/bspc/map_q3.c (680)
A tools/quake3/bspc/map_sin.c (1211)
A tools/quake3/bspc/nodraw.c (47)
A tools/quake3/bspc/portals.c (1297)
A tools/quake3/bspc/prtfile.c (287)
A tools/quake3/bspc/q2files.h (487)
A tools/quake3/bspc/q3files.h (384)
A tools/quake3/bspc/qbsp.h (477)
A tools/quake3/bspc/qfiles.h (487)
A tools/quake3/bspc/sinfiles.h (365)
A tools/quake3/bspc/tetrahedron.c (1389)
A tools/quake3/bspc/tetrahedron.h (24)
A tools/quake3/bspc/textures.c (228)
A tools/quake3/bspc/tree.c (283)
A tools/quake3/bspc/writebsp.c (595)

-- Patch Links --

https://github.com/TTimo/GtkRadiant/pull/104.patch
https://github.com/TTimo/GtkRadiant/pull/104.diff


Reply to this email directly or view it on GitHub:
#104

Contributor

QBall147 commented Jul 30, 2012

I believe it was taken from the Quake III Arena GPL, yes.

This was the latest I could find:
https://github.com/bnoordhuis/bspc v2.1h

As for whether or not we should add it to our own tree: discuss :D

I'm quite happy to leave it out, as long as I/we can still add QL support to it :)

Contributor

bnoordhuis commented Jul 30, 2012

@QBall147 Can you send the QL changes as a PR?

Contributor

QBall147 commented Jul 30, 2012

sure

Owner

TTimo commented Jul 30, 2012

I'd be fine having our build scripts pull from Ben's repository

On Mon, Jul 30, 2012 at 4:52 PM, QBall147 <
reply@reply.github.com

wrote:

sure


Reply to this email directly or view it on GitHub:
#104 (comment)

Contributor

QBall147 commented Jul 30, 2012

Sounds good to me

TTimo added a commit that referenced this pull request Jul 31, 2012

Merge pull request #104 from QBall147/bspc
Added bspc to the solution (with initial ql support)

@TTimo TTimo merged commit 06ac3b7 into TTimo:master Jul 31, 2012

Owner

TTimo commented Jul 31, 2012

Pulling this in to get a build out, but we should consider switching to an external repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment