Commit graph

462 commits

Author SHA1 Message Date
Ragnvald Maartmann-Moe IV
a2ed608ee7 Some more small speedups.
Not entirely thrilled with R_BuildLightMap inside 'store:'. Macros are a pain to work around...
2001-11-04 16:57:47 +00:00
Ragnvald Maartmann-Moe IV
dbb6e37bb7 Remove some unneeded variables.
Speed lightmap calculations up for r_lightmap_components 1.
Enough to give a 4.4% speedup to timedemo overkill.
Hint: int/float/int conversions are expensive.
2001-11-04 11:20:35 +00:00
Ragnvald Maartmann-Moe IV
fd19f9332d Tiny comment cleanup 2001-11-04 08:50:16 +00:00
Ragnvald Maartmann-Moe IV
de0b4f65fa modelalpha and currenentity cleanups. 2001-11-04 07:40:35 +00:00
Ragnvald Maartmann-Moe IV
961ea0b693 Move cshift render to before hud/text render, so that you can still read it while heavy cshift action is happening. 2001-11-03 07:50:57 +00:00
Ragnvald Maartmann-Moe IV
e8b36b1a71 Remove unused R_CullBlocked. 2001-11-03 07:30:15 +00:00
Ragnvald Maartmann-Moe IV
08a211385f Optimize some redundant math out of the particle aging loop. 2001-11-02 21:12:09 +00:00
Ragnvald Maartmann-Moe IV
3958b4a4b3 Age particle trails based on position in trail, during creation. 2001-11-02 20:47:47 +00:00
Bill Currie
7b4e5e69af now actually works (especially for double scan modes and the like) 2001-11-02 06:43:41 +00:00
Ragnvald Maartmann-Moe IV
c19c237e0e Whitespace. 2001-11-02 06:35:32 +00:00
Bill Currie
a98c5bb4c1 fix vid_fullscreen toggling (sgl) and archiving (all) 2001-11-02 06:11:32 +00:00
Bill Currie
a45b78b622 make all 8 X buffers available. no args uses the default buffer, giving 0-7
as an agument to in_paste_buffer specifies which buffer to use.
2001-11-01 22:52:22 +00:00
Bill Currie
9b8995b836 fix win32's missing clipboard support (bringing it back). some trickery will
be required to get ctrl-V working, but... *shrug*
2001-10-30 22:46:15 +00:00
Ragnvald Maartmann-Moe IV
d1c115da05 Whitespace. 2001-10-30 19:58:01 +00:00
Ragnvald Maartmann-Moe IV
3ad79cc970 Change particle limit from a short to an unsigned int. Possibly a tiny speedup, also allows for absurd particle counts... 2001-10-30 19:42:29 +00:00
Bill Currie
4685fccbac new command for -x11 and -glx: in_paste_buffer (eg in_bind imt_console
m_button3 in_paste_buffer). Makes X's clipboard available to quake (for
pasting:)
2001-10-30 18:20:56 +00:00
Bill Currie
d835b79352 this might fix the black screen in 8 bit X 2001-10-29 22:29:42 +00:00
Bill Currie
00514d744e this should fix the skating statues 2001-10-29 19:38:20 +00:00
Bill Currie
85c9e0ab1e more externs cleaned up 2001-10-29 17:46:03 +00:00
Bill Currie
8071e8398a put a couple externs back for win32. they need a bit more thought on how to
arrange things.
2001-10-29 16:45:03 +00:00
Bill Currie
1d442c496f setup the colormap /before/ calling Vid_InitGamma so VID_SetPalette gets
called with a valid colormap to update.
2001-10-29 06:46:46 +00:00
Bill Currie
78a3e398d5 * taniwha gets medieval on extern 2001-10-28 04:23:37 +00:00
Ragnvald Maartmann-Moe IV
5afce455df Undo taniwha's debugging insanity.
If you want to test for injecting more particles than can fit in the list, particle_new is the right place for the test. It's even there already, just commented out.
2001-10-28 00:47:21 +00:00
Bill Currie
10d83e090a externs in .c files are evil, evil evil (ok, so I haven't cleaned these ones
out yet:P). This fixes the recent GL crash.
2001-10-27 22:27:32 +00:00
Bill Currie
3601b5ba35 fix the minor breakage were /no/ particles were being generated 2001-10-27 21:39:58 +00:00
Bill Currie
74d3499f74 fix a seg caused by my changes from last night 2001-10-27 20:52:33 +00:00
Bill Currie
014785a9f2 lots of error checking for our phantom particle bug, but I was unable to
trigger it after 2h of play using the previous changes
2001-10-27 08:32:52 +00:00
Bill Currie
d9fd8dc29f make r_particles truely a flag and call R_MaxParticlesCheck when r_particles
changes
2001-10-27 08:31:45 +00:00
Bill Currie
1fab17ab33 d'oh. must read the clode closer :P 2001-10-26 05:31:39 +00:00
Adam Olsen
3bba5398ba - audit malloc usage. now everything checks the return value :) 2001-10-24 22:50:06 +00:00
Bill Currie
552a486d87 fix the libQFrenderer_sw.lai installation error. libtool requires -rpath
for /any/ installed lib, static or not.
2001-10-24 17:54:56 +00:00
Adam Olsen
dd19f7b500 - convert svc_deltapacketentities
- add a Host_NetError that dumps a packet log and disconnects, and use
  it instead of Host_EndGame in most cases
- fix a couple multiply-defined vars
2001-10-24 15:23:02 +00:00
Bill Currie
8e9505c100 /finally/ get asm in the sw renderer when not using --disable-shared. libtool
was using the wrong objects.
2001-10-23 18:48:49 +00:00
Bill Currie
bf309fb554 split the sprite and alias model rendering code out from gl_rmain.c into
their own files.
2001-10-23 17:20:56 +00:00
Bill Currie
6a5e3edcf7 and extern fixes for the windows side 2001-10-23 17:11:48 +00:00
Bill Currie
b5341f0d13 we now compile and link with -fno-common. this cleans up the multiple,
uninitialized declarations of variables.
2001-10-23 16:55:23 +00:00
Bill Currie
fa95bd35aa fix a really stupid brainfart that caused shift states to not work 2001-10-23 01:53:51 +00:00
Bill Currie
b6ad2223d2 attempt to handle the byte swapping of screenshots seen on voodoo2s in
windows
2001-10-22 19:46:34 +00:00
Bill Currie
1d697dc90d give in_win keyboard shift states for ascii conversions 2001-10-22 16:07:26 +00:00
Bill Currie
3252ee3eb6 fix the mangled key codes 2001-10-22 05:07:15 +00:00
Bill Currie
52252616ff pull the input code out of vid_wgl into in_win 2001-10-22 04:13:56 +00:00
Bill Currie
82aa0fde58 fix -wgl's keyboard input 2001-10-22 02:33:19 +00:00
Bill Currie
9a5ec9c187 ok, qw-client-wgl.exe works now (helps if scr_width and scr_height are set) 2001-10-22 02:15:30 +00:00
Chris Ison
2467671c72 removal of tdfx_brighten in preparation for gl_brighten 2001-10-21 21:29:54 +00:00
Bill Currie
e1fc77dd2b fix a crasher in win32. I don't know if linux crashed, but it should have. 2001-10-21 03:48:02 +00:00
Bill Currie
b3914eeaaa elimination of bare printf (with some exceptions) from libs: Sys_Printf is
used instead
2001-10-18 16:42:14 +00:00
Bill Currie
e765321452 wgl funcs are likely GLAPIENTRY type too :) 2001-10-16 22:37:11 +00:00
Bill Currie
2d068c0745 massive windows.h and WIN32 cleanup. 2001-10-16 21:40:45 +00:00
Jeff Teunissen
ce740fb4ec Joystick target fixed. 2001-10-16 05:06:31 +00:00
Bill Currie
8417d23a94 fix a nasty seg on gl startup causes by looped function pointers 2001-10-16 04:11:25 +00:00
Bill Currie
376a9105fa oops 2001-10-15 23:16:42 +00:00
Bill Currie
3402dfd51a libasm improvements 2001-10-15 23:09:03 +00:00
Jeff Teunissen
2e4d8d1473 Makefile fixes -- video driver libs are gone. 2001-10-15 22:32:28 +00:00
Jeff Teunissen
10424a5015 *** empty log message *** 2001-10-15 22:28:05 +00:00
Bill Currie
460a270a54 fix some init order issues brought up by the new gl_funcs.c code. 2001-10-15 19:06:22 +00:00
Bill Currie
fd25261ab3 hopefully better win32 dynamicly loaded gl support. if nothing else,
gl_funcs.c is easier to read :)
2001-10-15 18:24:30 +00:00
Bill Currie
41d01d54f9 put the INITGUID definition in the correct place 2001-10-15 17:32:43 +00:00
Bill Currie
f7b82bcb69 comment out the definition of INITGUID for now as it's causing linking problems 2001-10-15 16:30:15 +00:00
Bill Currie
62873d6980 diff snr -- 2001-10-11 17:31:41 +00:00
Bill Currie
49fe4e9f05 fix a misplaced s&r 2001-10-11 06:54:29 +00:00
Ragnvald Maartmann-Moe IV
1674e6a763 Clean up of models that are always fullbright. 2001-10-10 05:00:30 +00:00
Ragnvald Maartmann-Moe IV
db87121c2b Whitespace. 2001-10-10 04:59:43 +00:00
Ragnvald Maartmann-Moe IV
86a82b895d Whitespace. 2001-10-09 21:57:49 +00:00
Bill Currie
a65d98a35c r_dlight_max can now safely be 0 2001-10-09 21:50:51 +00:00
Ragnvald Maartmann-Moe IV
9cc671e6d2 Try #2.
Change r_maxparticles from short to unsigned int.
Make MAX_DLIGHTS into a cvar, r_dlight_max that sets the unsigned int r_maxdlights.
2001-10-09 20:35:17 +00:00
Bill Currie
757a0f690c fix a missing #ifdef HAVE_VIDMODE 2001-10-06 22:57:54 +00:00
Ragnvald Maartmann-Moe IV
24e80b21d4 Whitespace. Hiding commented out code is bad. 2001-10-06 01:14:23 +00:00
Ragnvald Maartmann-Moe IV
d657a590b5 Clean up extern functions, update noise_diamondsquare to match LordHavoc's fractalnoise. 2001-10-06 00:39:22 +00:00
Ragnvald Maartmann-Moe IV
8afd4a870e Revert an optimization that impacts legibility more than performance. 2001-10-06 00:31:57 +00:00
Ragnvald Maartmann-Moe IV
9daba0eef7 GL string and character rendering speed up and clean up. 2001-10-05 19:01:57 +00:00
Ragnvald Maartmann-Moe IV
72b198d650 Minor cleanup. 2001-10-05 18:55:40 +00:00
Bill Currie
a1d2cf3532 duplicate file name cleanup and make dist works 2001-10-03 17:50:36 +00:00
Bill Currie
87e59c0762 finally got sw's Makefile.am working too 2001-10-03 14:59:43 +00:00
Bill Currie
9aca46416c ok, sw32's Makefile.am now works with both 1.4 and 1.5 2001-10-03 14:49:14 +00:00
Bill Currie
95d3600452 fix skybox/skydom map vis issues. I hope this works on all drivers. 2001-10-03 02:51:30 +00:00
Bill Currie
c3735506c7 hey, I think this one is going to work!!! 2001-10-03 00:07:01 +00:00
Bill Currie
081a44e5bc this works a smidge better 2001-10-02 23:13:54 +00:00
Bill Currie
b866bcae61 seems automake isn't too happy about nested conditionals and main vars 2001-10-02 22:36:08 +00:00
Ragnvald Maartmann-Moe IV
256f6e94c1 Broken attempt at cleaning up Makefile.am's, for taniwha's perusal. 2001-10-02 22:02:10 +00:00
Bill Currie
4699bf6d5b files under inclue/QF are not allowed to include files from include (eg,
including config.h is a nono).
2001-10-02 21:14:11 +00:00
Ragnvald Maartmann-Moe IV
9c778bb539 Minor tweak of lightning sparks and teleport appearances, fix brief breakage of gl_sky_clip 1 & 2 with skyboxes. 2001-10-02 09:11:20 +00:00
Ragnvald Maartmann-Moe IV
9c21edc6d0 Whitespace. 2001-10-02 06:58:44 +00:00
Ragnvald Maartmann-Moe IV
820fcbb8d2 R_Mirror-related cleanups, and some whitespace. 2001-10-02 06:13:22 +00:00
Ragnvald Maartmann-Moe IV
5e6f77cddb Instead of glEnable/glDisable (GL_ALPHA_TEST) pairs for every sprite rendered, let's do it once for the entire sprite loop. Minor hit when there are no sprites, but 2+ it's a gain. Better worst case, rather than better peak performance. 2001-10-02 01:48:51 +00:00
Ragnvald Maartmann-Moe IV
63ac10dfde Clean up glDepthFunc and glDepthRange so it's properly initted, and not set needlessly every frame. 2001-10-02 00:01:05 +00:00
Ragnvald Maartmann-Moe IV
4b3c4e1eaf Whitespace. 2001-10-01 21:52:05 +00:00
Ragnvald Maartmann-Moe IV
fce4b903eb Fix double joystick init in sdl targets. 2001-10-01 21:50:35 +00:00
Bill Currie
c7031b20f3 move vid_fullcreen definition from *.c to vid.c and declaration from
context_x11.h to vid.h and remove all extern decls from *.c
2001-09-28 16:54:31 +00:00
Jeff Teunissen
e892131af5 Rename gl_libgl to gl_driver, nuke the last of the HAVE_GLX references,
and default gl_driver to OPENGL32.DLL on Win32.
2001-09-28 07:41:38 +00:00
Jeff Teunissen
e9c9c8bab6 fix up installs for -svga. 2001-09-28 06:55:27 +00:00
Bill Currie
b1f4a778f9 the rcsid commit from hell }:> 2001-09-28 06:26:31 +00:00
Jeff Teunissen
31b6da027c The video version. This WILL break QW and NQ until my next commit. 2001-09-28 05:33:58 +00:00
Jeff Teunissen
325303b037 And now for the 32-bit software renderer. 2001-09-27 21:58:10 +00:00
Jeff Teunissen
4c40bad808 Okay, this ought to work for software. 2001-09-27 21:53:59 +00:00
Jeff Teunissen
be9ee170d6 Okay, the GL renderer lib is fixed up. 2001-09-27 21:47:47 +00:00
Jeff Teunissen
b794d4c316 yaay, cleaned up. 2001-09-27 21:28:44 +00:00
Ragnvald Maartmann-Moe IV
bd1465ef3e Make blood puffs a little less ridiculously large and not overly dense. 2001-09-27 06:52:38 +00:00
Ragnvald Maartmann-Moe IV
35b767cd21 Remove scaling from R_RunParticleEffect, and make blood puff size variable in qw. 2001-09-27 03:09:24 +00:00
Ragnvald Maartmann-Moe IV
2941c07b0a Add small cyan light to lightning impacts. And restore particle direction use in nq. Greatly improves blood effects. 2001-09-27 00:43:46 +00:00
Chris Ison
0efd28abcc trying to get bootstrap to work in cygwin 2001-09-25 23:04:13 +00:00
Bill Currie
a439170dcf libasm cleanups 2001-09-25 22:12:55 +00:00
Bill Currie
06da30ac89 mingw build fixes again (including mostly working in sid: got some link issues) 2001-09-25 06:18:30 +00:00
Ragnvald Maartmann-Moe IV
5330fd5651 Whoops. 2001-09-24 18:03:36 +00:00
Ragnvald Maartmann-Moe IV
e2f14519fb Merge world.h. Also reduced smoke particle textures from 8 to 1, a considerable speedup through reduced texture thrash... 2001-09-24 17:52:13 +00:00
Bill Currie
c8ab7d04ef fix two bugs with glx extension checking: HAVE_GLX wasn't getting into
config.h and GLX_ARB_get_proc_address is not (any longer?) defined by mesa.
2001-09-23 03:41:05 +00:00
Ragnvald Maartmann-Moe IV
d247027954 Use a callback for gl_multitexture which sets gl_mtex_active (now a qboolean, rather than a macro). 0.6-1.0% speedup. 2001-09-23 03:24:23 +00:00
Bill Currie
bf1920a851 don't enable mtex if the required functions cannot be found. This shouldn't
normally happen, but is due to a currently broken QFGL_ExtensionAddress and
causes qf to seg when mtex is requested.
2001-09-23 03:18:58 +00:00
Ragnvald Maartmann-Moe IV
bb6796247c Kill r_particles->int_val testing in gl particle engine. Also merge a bit down to r_part.c/r_cvar.c. Properly declare cl_max_particles (how the heck was it working when only ever declared as exter cvar_t *cl_max_particles?).
Should be a minor speedup for gl, definitely a code cleanup.
2001-09-22 02:37:45 +00:00
Ragnvald Maartmann-Moe IV
fc1ab9640e r_numparticles is now r_maxparticles. Ah, the joy of sane variable names. 2001-09-19 18:07:09 +00:00
Ragnvald Maartmann-Moe IV
8af9c2321d Larger lightning sparks, and more importantly, cull particles more efficiently when bumping into max. R_LavaSplash and R_TeleportSplash need work, though. 2001-09-18 23:22:57 +00:00
Timothy C. McGrath
54e5a3e114 Fix for svgalib from joa, two liner. Very nice of him :)
Misty-chan
2001-09-18 22:38:08 +00:00
Adam Olsen
678068849e James' latest fullscreen patch, which works flawlessly for me :)
(and if anybody cares about the formatting they can change it AFTER
this is in)
2001-09-18 09:30:59 +00:00
Adam Olsen
7c75e264c9 - build fix for fbdev
- minor formatting tweak for in_common.c
2001-09-18 09:19:44 +00:00
Bill Currie
b79ff6378d mouse warpage fixes from james 2001-09-18 05:18:49 +00:00
Bill Currie
dd98622859 x11 vid_fullscreen improvements from james (thanks) 2001-09-18 04:53:01 +00:00
Bill Currie
b559b3a796 fix a key mapping issue reported by MasterLich 2001-09-18 04:38:18 +00:00
Ragnvald Maartmann-Moe IV
d3e8e4ed11 Sparks and a little smoke from TE_LIGHTNINGBLOOD.
And kill R_RunGunshotEffect.
2001-09-17 01:48:52 +00:00
Ragnvald Maartmann-Moe IV
a7d8e2c0ea TE_EXPLOSION2 now does colored lighting. And spark showers brightened up a bit. Sparks all yellow now, none of the weird dingy grey ones. ;) 2001-09-16 20:07:28 +00:00
Ragnvald Maartmann-Moe IV
431ac4eedb Convert particles to use byte colors instead of float. Roughly breaks even on Mesa on my machine. Should be a speedup under other drivers. 2001-09-14 12:11:54 +00:00
Bill Currie
8c026417d8 Wait for X to complete the previous operation before proceding to the next.
This causes the mouse to warp properly, but doesn't fix my disappearing window :(
(possibly a wm bug)
2001-09-10 21:55:34 +00:00
Bill Currie
95515e28d7 use XMapRaised instead of XMapWindow + XRaiseWindow 2001-09-10 17:18:31 +00:00
Bill Currie
0f30506b79 d'oh, got the return values backwards 2001-09-10 17:02:35 +00:00
Bill Currie
388513e005 several fullscreen toggling improvements including window location restoration 2001-09-10 16:53:33 +00:00
Bill Currie
a17d8fe452 turns out the window location code is needed after all. 2001-09-10 15:41:47 +00:00
Bill Currie
8ca44af043 fix a bug in the handling of case m (see skybox.fig) 2001-09-10 00:57:11 +00:00
Ragnvald Maartmann-Moe IV
7af79b96ec Lots of whitespace, header cleanups, and a few tiny optimizations. 2001-09-09 21:41:35 +00:00
Bill Currie
8a959d157b put my sky debug code back in (enabled for now) 2001-09-09 21:27:09 +00:00
Ragnvald Maartmann-Moe IV
28fe1dc004 Tweak rocket trails. Uglier, but don't bog down rocket snipers. Also a couple tiny optimizations and cleanups. 2001-09-09 19:37:07 +00:00
Bill Currie
b788eb6dbd remove some no-longer needed code (the window coord finder) and quientn
the mode setting code a little.
2001-09-08 06:25:37 +00:00
Bill Currie
b12ee9e166 unmap and re-map the window with the correct attributes for the current
setting of vid_fullscreen
2001-09-08 05:43:52 +00:00
Bill Currie
20188c6670 heh, and in_pre_amp 2001-09-08 03:34:28 +00:00
Bill Currie
cd0d260549 fix an exponential growth of in_mouse_amp when in_amp is > 1 2001-09-08 03:33:57 +00:00
Bill Currie
05f489735e code cleanups and possibly minor optimisations 2001-09-07 21:15:08 +00:00
Bill Currie
c762151df6 comment on the code duplication for the texture resamplers 2001-09-07 17:12:02 +00:00
Bill Currie
ffd9e727a8 roll the skin resampling loops back up 2001-09-07 17:05:56 +00:00
Ragnvald Maartmann-Moe IV
0d0e570676 Small particle trail speedup/legibility/flexibility improvement, at price of redundant code in sw/sw32. Tradeoffs. *sigh* 2001-09-07 05:37:11 +00:00
Bill Currie
d7675ada7a move the particle count multiplication out of the renderer and into the clien
(for blood and gunshot, anyway).
2001-09-06 05:41:15 +00:00
Ragnvald Maartmann-Moe IV
4c7e60e73a Rearrange "rocket" trail code. Some small optimizations, mostly a cleanup, will make tweaking individual effects separately easier. 2001-09-06 04:26:53 +00:00
Bill Currie
be7307faa9 move the dlight and lightmap code and data from r_main to r_light 2001-09-06 03:53:13 +00:00
Bill Currie
008d80df67 s/IMT_DEFAULT/IMT_0/g for the constant and move the name-enum entry for
IMT_DEFAULT to the bottom of the list so that IMT_0 gets written as such
rather than IMT_DEFAULT.
Also, clean up nq's EF_* dlight creation a bit (haven't touched
EF_MUZZLEFLASH: undecided on what to do).
2001-09-05 21:22:55 +00:00
Ragnvald Maartmann-Moe IV
7d52c663a3 Convert a few rand to qfrandom, and a tiny optimization (more of a cleanup, really). 2001-09-05 09:06:48 +00:00
Ragnvald Maartmann-Moe IV
55f0fed0b6 Replace lhrandom with qfrandom, a different convenience macro with better random number distribution (see man 3 rand). 2001-09-05 06:20:45 +00:00
Ragnvald Maartmann-Moe IV
d2c041cae6 Remove and ifdef out currently unused code. 2001-09-05 04:25:47 +00:00
Bill Currie
4249bba636 make sure input is grabbed when going fullscreen on init 2001-09-05 03:41:29 +00:00
Bill Currie
f9e610bf6b fix a seg witn +set in_grab on the command line 2001-09-05 03:14:41 +00:00
Ragnvald Maartmann-Moe IV
75aaccf9f0 Prettier, but slower particle effects. Also skip particle physics when r_particles 0. 2001-09-05 02:04:02 +00:00
Bill Currie
2e1a5112bd give r_particles a callback to clear all particles when set to 0 and do
some general cleanup to the gl particles code
2001-09-05 00:08:54 +00:00
Ragnvald Maartmann-Moe IV
65c526c057 Some minor cleanups, and lots of particle effects tweaks.
Less blinding rocket trails is probably the most noticable change, other than a nice speedup in nq timedemos. Little change for overkill, though. Aw...
2001-09-04 10:32:51 +00:00
Bill Currie
83e3f10520 fix a silly with joystick buttons 2001-09-04 04:28:31 +00:00
Bill Currie
dc4cd343b5 id's sky code is back (gl_sky_clip 2 when no skybox is loaded). Not as fast
as the black polygons (duh:) and not as nice looking as the sky dome, but also
not as slow (fps when standing in the normal coridor looking at the sky in
start: 26 for skydome, 37 for id skys, 44 for black). Good for when you want
to see sky other than black but your card can't handle the fillrate
requirements of skydome. I'll clean up the sqrt in there soonish.
2001-09-03 06:12:10 +00:00