Commit graph

421 commits

Author SHA1 Message Date
Bill Currie
735a35b2f9 compile fixes from Artur Frysiak <wiget@pld.org.pl> 2001-06-05 17:23:03 +00:00
Bill Currie
e339e82c01 hash.h is now const correct as is a lot of qfcc 2001-06-04 04:52:14 +00:00
Ragnvald Maartmann-Moe IV
85333a9f96 Convert cd audio libs to plugins. Windows untested, dos and sgi not converted yet. 2001-06-01 22:55:33 +00:00
Bill Currie
7ad0f7ed2b various compile fixes for mingw. 2001-06-01 00:39:31 +00:00
Bill Currie
06064ec390 compat.h:
create a field_offset macro that takes a structure type and a field and
	returns the offset of the field within the structure
everything else:
	use field_offset to calculate the size of variable sized structs
2001-05-31 18:11:05 +00:00
Bill Currie
323015b11a include/QF header cleanup. including config.h (or any file from include) is
a nono because headers in include/QF get installed, but include don't and thus
would break quakeforge-dev.
2001-05-31 05:33:13 +00:00
Bill Currie
6bf58ab1af no header includes cvar.h now 2001-05-31 03:41:35 +00:00
Bill Currie
940598f240 merge pcx.c, tga.c and wad.c. util seemed the most logical place, but LoadPCX
had to be modified to get away from vid.h (better designe now IMO anyway)
2001-05-30 20:56:53 +00:00
Bill Currie
80be659b4a white space 2001-05-30 20:55:28 +00:00
Adam Olsen
8ca626dacc add -export-dynamic to linker lines, so you can use sound plugins with static builds. 2001-05-30 18:35:19 +00:00
Bill Currie
d7830293a6 more printf format attributes 2001-05-30 05:38:17 +00:00
Joseph Carter
05adfd0e53 quakefs.h -> vfs.h
quakeio.h -> vfile.h

More diff reduction between trunk and my VFS code.  Also took the time to
put some headers in order and fix a few #include's pointed out by moving
things around a bit.
2001-05-30 04:34:06 +00:00
Joseph Carter
186d577818 s/QFile/VFile/g - makes my diffs much smaller and more manageable for the
VFS work.
2001-05-30 03:21:19 +00:00
Bill Currie
18fd21da77 merge the particle system 2001-05-29 19:58:35 +00:00
Bill Currie
763829560a client.h clean 2001-05-29 19:52:10 +00:00
Bill Currie
78702c07e4 make gl_dyn_part.c and sw_rpart.c independent of client.h and host.h 2001-05-29 19:43:15 +00:00
Bill Currie
04d4df1e19 fix nq's skin code so it doesn't upload skins every frame 2001-05-27 04:23:39 +00:00
Bill Currie
4c5b977902 move cl_math.S into renderer/sw/transform.S (never before realised it was
part of the renderer)
2001-05-26 03:33:09 +00:00
Chris Ison
3035224bec disable cl_math.S asm 2001-05-25 22:57:25 +00:00
Bill Currie
1038f88a64 disable asm in the software renderer for now. This will allow me to fix the
files one at a time and allow others to use software independent of asm usage
(even if a little slowly (~14% slower on my dual c450)).
2001-05-25 14:57:31 +00:00
Bill Currie
a87c4bbd93 vid.c:
Don't bother checking vid_gamma for CVAR_ROM becuase it is impossible to
	get to VID_UpdateGamma when it is set except for when the cvar is
	initially created, and we /want/ the code to execute in that case.
vid.h:
	add initialized to viddef_t
vid_common_gl.c:
	actually /use/ gammatable (it tends to help)
vid_*.c:
	clean up rendundant decls of gammatable, vid_initialized (now
	vid.initialized) and make sure vid.initialized gets set.
gl_view.c:
	remove gammatable decls
2001-05-25 04:03:47 +00:00
Bill Currie
5ed553f876 more files missed in the move 2001-05-25 02:45:57 +00:00
Bill Currie
600bcfb108 forgot to remove these 2001-05-24 19:28:07 +00:00
Bill Currie
73e6e1684f FINALLY, the nq and qw renderers are merged. the view and particle subsystems
are not yet merged due to their dependence on the client, but that will come
soon.
2001-05-24 19:22:35 +00:00
Bill Currie
55ee68cf38 whew 2001-05-24 19:19:32 +00:00
Bill Currie
d44901a8d6 oopsie 2001-05-24 19:18:51 +00:00
Bill Currie
05f9470b7c oops, got a little too agressive with the V_CheckGamma cleanup 2001-05-24 18:50:02 +00:00
Bill Currie
f21ad90ba4 total nukage of brighten, brightness and contrast. 2001-05-24 16:30:25 +00:00
Bill Currie
a3518d44ed Nuke V_CheckGamma, moving its sole contribution to VID_UpdateGamma in vid.c 2001-05-24 15:48:39 +00:00
Bill Currie
d87d374fcf white space 2001-05-24 04:50:12 +00:00
Chris Ison
3cc3392a8a fixed paused being displayed by default in gl 2001-05-23 10:20:27 +00:00
Bill Currie
1a25bc9349 gl_screen.c and screen.c are now client clean (and merged :) 2001-05-23 06:33:23 +00:00
Bill Currie
ec7335029d gl_draw.c is now client clean. 2001-05-23 04:05:10 +00:00
Bill Currie
f49608b881 copy it to nq and clean out the commented out code 2001-05-23 03:33:39 +00:00
Bill Currie
a8e1da5d99 make dist and compile fixes for mingw cross building 2001-05-22 19:13:23 +00:00
Bill Currie
c500fd7479 make dist fixups 2001-05-22 17:09:03 +00:00
Joseph Carter
2b4c31b7ae Noise reduction in draw vs gl_draw 2001-05-22 09:24:56 +00:00
Bill Currie
4a80639556 sw and gl rmisc are now client clean. the graphing functions ahve been pulled
out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and
{gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something
is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
Bill Currie
0a4b53c817 gl_rsurf is now client clean 2001-05-21 23:09:46 +00:00
Bill Currie
da8715f27d sw_ralias.c and gl_rmain.c are now client clean. this involved a bit of a
revamp of skins. keep an eye out for broken skins (especially in nq)
2001-05-21 22:25:35 +00:00
Ragnvald Maartmann-Moe IV
ddceaf78b3 Merge most of cshift calcs from sw and gl to r_view.c 2001-05-21 19:53:57 +00:00
Ragnvald Maartmann-Moe IV
46b5ce2d09 Remove client.h from gl_sky_clip. Changed an error message to not use cl_name. 2001-05-21 15:59:02 +00:00
Ragnvald Maartmann-Moe IV
853dfceac6 Minor cleanups, not client.h or host.h clean yet, though. 2001-05-21 04:41:57 +00:00
Ragnvald Maartmann-Moe IV
4d09685df7 Remove client.h from sw_rsurf.c. Prepare gl_rsurf.c for same. 2001-05-21 03:39:41 +00:00
Ragnvald Maartmann-Moe IV
a9c9a46c37 client.h gone from gl_rlight.c and sw_rlight.c.
cl_lightstyle -> r_lightstyle
2001-05-21 03:08:07 +00:00
Bill Currie
ece576ed4b reduce gl_rmain's dependency on cl*.h 2001-05-21 00:22:35 +00:00
Ragnvald Maartmann-Moe IV
1aef81e9ef Minor makefile cleanups. 2001-05-20 23:30:16 +00:00
Ragnvald Maartmann-Moe IV
62eefb49af Remove gl_cull cvar. Was enabled regardless of the setting of the cvar, in any case. 2001-05-20 22:02:44 +00:00
Ragnvald Maartmann-Moe IV
d9b509b885 nonintel stuff makes more sense in nonintel.c 2001-05-20 21:47:18 +00:00
Ragnvald Maartmann-Moe IV
ee8bdb0742 sw_rvars.c was just a little bit silly for a simple variable declaration. 2001-05-20 21:44:05 +00:00
Bill Currie
337430a113 sw_rmain.c is now client and chase clean. 2001-05-20 20:38:51 +00:00
Ragnvald Maartmann-Moe IV
3f816c0aa3 whitespace. 2001-05-20 18:07:39 +00:00
Ragnvald Maartmann-Moe IV
a07d05e054 whitenoise-- 2001-05-20 16:29:41 +00:00
Bill Currie
44943e78de better fix for the dlights problem (will prevent similar problems in the
future)
2001-05-20 06:23:46 +00:00
Bill Currie
88302bd5f0 fix the broken dlights. turns out realtime is not the right thing (cl.time is) 2001-05-20 06:13:20 +00:00
Bill Currie
d360b01827 move dlight stuff out of cl_* into r_main.c. nq dlights seem to be broken,
but that seems to have been from before this work
2001-05-20 05:42:52 +00:00
Ragnvald Maartmann-Moe IV
f7330f078e Change meaning of gl_lightmap_components a bit. Setting 4 changed to reduce texture memory waste by a bit. Really only an optimization for nvidia drivers anyways. This also should fix a quality issue in 16bpp with it set to 4. 2001-05-20 04:36:20 +00:00
Bill Currie
cf2e098434 header order 2001-05-20 04:26:22 +00:00
Bill Currie
a41af75e56 cl.worldmodel is only remfereced once in the renderer (and that will be
going away shortly)
2001-05-20 04:25:36 +00:00
Bill Currie
daca64ed04 more cl*.h dependency cleanups realtime and cl.time are no longer reffed 2001-05-20 03:54:55 +00:00
Ragnvald Maartmann-Moe IV
844ed4a41e tiny header cleanup. 2001-05-20 03:38:58 +00:00
Bill Currie
d1c2b0ec52 r_efrag.c no longer relies on cl*.h 2001-05-20 02:39:56 +00:00
Bill Currie
e0512e4af3 r_efrag.c is almost client.h free 2001-05-20 01:58:59 +00:00
Bill Currie
aa09f5ce7a hopefully fix Despair's torches 2001-05-20 01:05:05 +00:00
Bill Currie
f834f99de7 diffsnr++ 2001-05-20 00:34:40 +00:00
Bill Currie
916b52f24c more diff S/N ratio improvements 2001-05-19 23:38:56 +00:00
Ragnvald Maartmann-Moe IV
2edaee8f5d Whitespace. 2001-05-19 23:31:20 +00:00
Bill Currie
0d573c6fcf rename Chase_Init to Chase_Init_Cvars and shift the call.
Call SCR_UpdateScreen at the end of Host_Init so you're not stuck with a
black screen during initial loading
2001-05-19 22:26:06 +00:00
Bill Currie
9698c19921 fix beams, grens, nails, etc 2001-05-19 21:09:48 +00:00
Ragnvald Maartmann-Moe IV
e9857d8213 Merges, and cl_writecfg now works in nq. 2001-05-19 20:57:29 +00:00
Ragnvald Maartmann-Moe IV
d55f9e4a4d diff noise. blech. 2001-05-19 17:32:04 +00:00
Ragnvald Maartmann-Moe IV
0c7cc403b8 diff noise reduction. 2001-05-19 17:02:56 +00:00
Bill Currie
7f0d8ed7e0 correct the scale init and enable the qsg inits in cl_tent 2001-05-19 05:53:50 +00:00
Ragnvald Maartmann-Moe IV
9f124853e5 whitespace 2001-05-19 02:09:08 +00:00
Bill Currie
fef41a4e70 cl_main.c cl_parse.c:
entity_t baseline fixes
gl_ngraph.c:
	make r_LineGraph non-static
2001-05-19 01:58:31 +00:00
Bill Currie
ec5daaa764 finally merge render.h. nq will NOT currently compile. I'll fix that when I
get back onto my computer at home
2001-05-19 00:23:21 +00:00
Adam Olsen
9cc30959e4 Sound now uses runtime plugins. Much thanks to Deek for doing all the
thinking :)
set fs_pluginpath to point to the right dir, and set snd_plugin to pick a sound
plugin.

Current issues:
- alsa 0.5 won't build properly, dunno why
- segfault on exit.  I think I know the cause of this, and how to fix it
- alsa 0.9, gus, sgi, sun, and win32 havn't been tested
2001-05-19 00:05:35 +00:00
Bill Currie
378adbf8f6 diff noise reduction 2001-05-18 23:57:38 +00:00
Bill Currie
a771ef7b83 missed setting the viewent QSG stuff 2001-05-18 22:47:48 +00:00
Bill Currie
c7527ed664 merge in the QSG stuff (bringing gl_rmain closer) 2001-05-18 22:33:35 +00:00
Bill Currie
18e6b43168 diff noise reduction in render.h and its fallout 2001-05-18 22:07:10 +00:00
Bill Currie
1ea84a32bf unused file 2001-05-18 21:23:25 +00:00
Bill Currie
5316476f9a whitespace 2001-05-18 21:21:59 +00:00
Ragnvald Maartmann-Moe IV
6bb969b40c diff noise reduction 2001-05-18 21:07:08 +00:00
Bill Currie
1c87b2ef94 more merging 2001-05-18 21:06:45 +00:00
Bill Currie
f0c6dfcb1a now identical 2001-05-18 21:05:38 +00:00
Ragnvald Maartmann-Moe IV
9949108f45 draw.c now identical in qw and nq. 2001-05-18 20:52:15 +00:00
Ragnvald Maartmann-Moe IV
51cb61aea2 keys.c is now identical in nq and qw, as well as less of a whitespace mess. 2001-05-18 20:38:22 +00:00
Bill Currie
788218d9d7 turned out just a copy was needed 2001-05-18 20:22:59 +00:00
Bill Currie
69ab5c981c 99% merge of d_*.[cS]. just d_polyse to look at 2001-05-18 20:19:20 +00:00
Bill Currie
664c640e42 total merge of the particle system (except r_part.c isn't in qw yet) 2001-05-18 19:58:49 +00:00
Bill Currie
6ee0692e58 complete the merge of sw_rpart.c. this involved adding old_origin to entity_t
and setting it up correctly
2001-05-18 19:21:51 +00:00
Ragnvald Maartmann-Moe IV
1dbfea351a console.c mergable. Little bit of cleanup of client.h 2001-05-18 18:33:37 +00:00
Bill Currie
a735b92bab kill the allowskybox varible. it wasn't ever checked anyway 2001-05-18 18:04:55 +00:00
Bill Currie
e75a2b96e9 cl_entities[0] is no longer referred to in the sw renderer. insted,
r_worldentity is used.
2001-05-18 17:50:19 +00:00
Bill Currie
eb95bcae84 move the gib language out of nq and into its own dir (hehe, libQFgib:) 2001-05-17 21:45:56 +00:00
Bill Currie
d62ac62ff5 allow commands other than set to be executed from ~/.quakeforgerc 2001-05-17 21:32:59 +00:00
Bill Currie
d820a6ecee fix up the libs dependencies so the targets get relinked if any of the QF
libs get updated (vital for static builds)
2001-05-17 16:52:47 +00:00
Bill Currie
a344c9fbd2 lib link order fixing so stat libs work 2001-05-17 08:29:04 +00:00
Bill Currie
4a690f8723 fix nq's startup code re commandline vs config file (also make sure comands
aren't double executed)
2001-05-17 07:53:22 +00:00
Bill Currie
35a52bb634 diff noise reductions + fix what looks to be a bug with surf flushing 2001-05-16 17:20:42 +00:00
Bill Currie
8f4394de4f various merge cleanups including moving the contents of R_Textures_Init into
Mod_Init
2001-05-16 17:08:56 +00:00
Bill Currie
0efc398423 diff noise cleanup 2001-05-16 06:04:38 +00:00
Bill Currie
72cc67e863 kill r_fullbright and r_draworder
`merge' skin handling
2001-05-16 06:01:34 +00:00
Bill Currie
266e6b3474 put TE_BLOOD and TE_LIGHTNINGBLOOD into nq and clean up some other diffs.
down to just old_origin vs ent->msg_origins
2001-05-16 03:55:19 +00:00
Bill Currie
e2944a82c9 forgot to remove the debug info 2001-05-16 03:37:53 +00:00
Bill Currie
3461e3d106 get the gunshot effect back 2001-05-16 03:24:08 +00:00
Bill Currie
793a5ff084 run the correct particle effect for TE_GUNSHOT 2001-05-15 22:03:23 +00:00
Bill Currie
e61c33c9d9 merge of cl_tents and r_efrag. 2001-05-15 21:34:54 +00:00
Ragnvald Maartmann-Moe IV
e7c2ed82db whitespace... 2001-05-15 21:13:07 +00:00
Bill Currie
8826182522 misc non-functional cleanups 2001-05-15 20:03:56 +00:00
Ragnvald Maartmann-Moe IV
63a4cc271f whitespace 2001-05-15 19:25:33 +00:00
Ragnvald Maartmann-Moe IV
c278652d9a diff noise reduction 2001-05-15 19:22:39 +00:00
Ragnvald Maartmann-Moe IV
e88cdda35a whitespace. 2001-05-15 19:19:38 +00:00
Ragnvald Maartmann-Moe IV
4206b93721 diff noise reduction 2001-05-15 19:00:53 +00:00
Ragnvald Maartmann-Moe IV
5d52236da1 Whitespace and comment cleanup. 2001-05-15 17:38:43 +00:00
Ragnvald Maartmann-Moe IV
dd81f9bf30 Change light setting from 256 and 200 to 255, for fullbright models. 2001-05-15 17:38:02 +00:00
Bill Currie
40cbc5ed3c cl.items in nq is now cl.stats[ITEMS] as per qw 2001-05-15 17:22:53 +00:00
Bill Currie
9c9e22f253 fix segfault when using -abyss etc 2001-05-15 06:35:47 +00:00
Bill Currie
350920399e that wasn't quite the right thing to do 2001-05-15 05:38:06 +00:00
Bill Currie
ba0d0c755c do key_dest right 2001-05-15 05:27:14 +00:00
Bill Currie
7b4e395dcb massive merging madness mounds 2001-05-15 04:50:53 +00:00
Bill Currie
eb65d61322 more merge madness 2001-05-15 03:27:55 +00:00
Ragnvald Maartmann-Moe IV
cf7487b692 Dead cvar removal, diff noise cleanup. The usual. 2001-05-15 02:19:36 +00:00
Bill Currie
86d76ed39a enable the mirror code. no idea how well it works 2001-05-14 20:49:18 +00:00
Bill Currie
1b74d305a8 diff noise reduction 2001-05-14 20:35:32 +00:00
Ragnvald Maartmann-Moe IV
0c16f56c23 diff noise reduction. 2001-05-14 19:46:16 +00:00
Bill Currie
59d033f3d4 fix the black alias models 2001-05-14 06:54:14 +00:00
Bill Currie
9064530d1d diff noise reduction 2001-05-14 06:48:59 +00:00
Bill Currie
a2ac0b5c0e forgot this 2001-05-14 06:48:11 +00:00
Bill Currie
afef935399 95% merge gl_rmain.c
nq is actually generally working again, except alias models are black
2001-05-14 06:47:38 +00:00
Bill Currie
879a133c19 forward port the x11 repeat fix 2001-05-14 05:37:47 +00:00
Ragnvald Maartmann-Moe IV
91200a862d Whitespace. 2001-05-14 03:08:24 +00:00
Ragnvald Maartmann-Moe IV
56f76e8192 More cleanups. 2001-05-14 01:22:58 +00:00
Ragnvald Maartmann-Moe IV
924cdf917d Fix a new bug with dlights, more cleanups. 2001-05-13 23:15:34 +00:00
Ragnvald Maartmann-Moe IV
048a80ce23 Merges and cleanups... 2001-05-13 22:57:27 +00:00
Ragnvald Maartmann-Moe IV
87894c0d39 Whitespace. 2001-05-13 17:01:17 +00:00
Bill Currie
871db9606b missed the init of gl_sky_divide 2001-05-13 04:20:09 +00:00
Ragnvald Maartmann-Moe IV
4b758624a9 Whitespace and comment cleanups. 2001-05-13 04:17:05 +00:00
Bill Currie
c7ee39acbb rename the qw c declaration of the client name cvar from name to cl_name 2001-05-13 04:01:06 +00:00
Ragnvald Maartmann-Moe IV
220f8a6e38 Renderer merge continues. gl_rlight, gl_rmisc, gl_rmain, and gl_rsurf the current victims. 2001-05-13 00:28:50 +00:00
Ragnvald Maartmann-Moe IV
86b2363244 emptiness shuffled. 2001-05-11 20:50:16 +00:00
Ragnvald Maartmann-Moe IV
a2b5fe36bb Whitespace. 2001-05-11 19:53:23 +00:00
Bill Currie
105d1ee7d9 well, that didn't last long, did it?
merge r_cvar.h
2001-05-11 19:33:17 +00:00
Ragnvald Maartmann-Moe IV
f8c15a1ed3 *poke* 2001-05-11 19:30:26 +00:00
Bill Currie
4ff86056db pull all rendering cvar declarations and initialisations out of the misc
files and put them into r_cvar.[ch] getting ready for the renderer merge
2001-05-11 19:21:48 +00:00
Bill Currie
6ba3288744 more diff noise reduction. just down to the diferences in the way gl stuff
is handled.
2001-05-11 16:23:00 +00:00
Bill Currie
b775a6f308 remove some diff noise to ease merging 2001-05-11 06:11:17 +00:00
Bill Currie
8ce3fa5e8f `merge' gl_refrag.c and sw_refrag.c into r_efrag.c like what was done in qw 2001-05-11 06:09:01 +00:00
Bill Currie
44317f299e merge gl_mesh.c into libQFmodels 2001-05-11 05:59:17 +00:00