Commit graph

190 commits

Author SHA1 Message Date
Ragnvald Maartmann-Moe IV
3d572df460 Bug fix (we weren't removing particles from the list until the frame after they died, which caused particle slots to be wasted).
Fix for a bug in particle trail pre-aging (sometimes created some 0 age particles).
And a couple small optimizations.
2001-11-09 12:09:46 +00:00
Ragnvald Maartmann-Moe IV
14aa428871 Switch to dot texture for sparks, and drop particle size. A little less cartoony effect. 2001-11-07 06:57:34 +00:00
Ragnvald Maartmann-Moe IV
f2f8513141 Reduce number of rand() calls in teleport and lava splash effects. Also preserves entropy, and we all know how important that is! 2001-11-06 21:02:18 +00:00
Ragnvald Maartmann-Moe IV
ceb307aead Cleanups, whitespace, convert some ints to unsigned int. Whee! 2001-11-06 05:06:37 +00:00
Ragnvald Maartmann-Moe IV
1c5701f51f Fix a few minor quirks with particle trails. 2001-11-06 04:42:17 +00:00
Ragnvald Maartmann-Moe IV
6af4eae1e5 Couple of cleanups (remove unused variables) and a small optimization. 2001-11-05 14:59:05 +00:00
Bill Currie
dc779acdb5 build the texture chains such that they get rendered front to back. seems to
only get about 0.17% speedup in overkill (with just about every thing off),
but it might make more of a difference in-game.
2001-11-05 06:20:35 +00:00
Ragnvald Maartmann-Moe IV
a856cbc413 Fix for r_lightmap_components 4 weirdness. 2001-11-04 20:58:46 +00:00
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
Ragnvald Maartmann-Moe IV
d1c115da05 Whitespace. 2001-10-30 19:58:01 +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
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
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
Adam Olsen
3bba5398ba - audit malloc usage. now everything checks the return value :) 2001-10-24 22:50:06 +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
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
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
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
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
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
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
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
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
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
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
be9ee170d6 Okay, the GL renderer lib is fixed up. 2001-09-27 21:47:47 +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
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
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
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
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
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
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
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
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
Ragnvald Maartmann-Moe IV
ed4de07e9a Header and variable declaration cleanups, tiny bit of whitespace. 2001-09-01 08:57:04 +00:00
Bill Currie
ea614fc2c6 turns out the sprite models are /not/ relocatable, so back out that change
in favor of cleaning up the accessors
2001-08-31 17:33:25 +00:00
Adam Olsen
384dfb7b66 - partial work for putting sprites in the cache.
doesn't currently build.
2001-08-31 15:32:11 +00:00
Adam Olsen
f1a016c8a5 - Refine the Cache_Get callback, to use a void * instead of a char *
- Switch alias models over to Cache_Get/Cache_Release
2001-08-31 12:22:45 +00:00
Bill Currie
d81d7fd02c glColor cleanup 2001-08-30 18:24:19 +00:00
Bill Currie
0d55476711 make VectorSubtract and VectorCompare macros and clean up the readability
of R_DrawParticles
2001-08-29 20:19:54 +00:00
Bill Currie
5902dcca6a code cleanup 2001-08-29 03:27:31 +00:00
Ragnvald Maartmann-Moe IV
793efd6976 Whitespace. 2001-08-27 01:00:03 +00:00
Ragnvald Maartmann-Moe IV
b1666defb9 Remove unused code. 2001-08-26 19:47:35 +00:00
Ragnvald Maartmann-Moe IV
da1c680364 Whitespace. 2001-08-26 17:13:33 +00:00
Ragnvald Maartmann-Moe IV
06dd45bdb1 Merge common lighting code. Still some lightmap-related code in *_rsurf.c that might be mergable. This is the first step towards 3 component lighting for the sw32 renderer.
Note that gl_lightmap_components is now r_lightmap_components, and gl_dlight_lightmaps is now r_dlight_lightmaps.
2001-08-25 23:23:14 +00:00
Ragnvald Maartmann-Moe IV
c6266aba36 sw32. Flee in terror. This'll break compilation for everything until -sdl32 compiles. sw32 wont work for a while either, so don't get overly excited yet. 2001-08-25 02:47:11 +00:00
Ragnvald Maartmann-Moe IV
e7fb6a1100 Whitespace, comment cleanups, and a very tiny cleanup/micro-optimization for R_AddDynamicLights. 2001-08-22 11:00:25 +00:00
Bill Currie
ec3eed4c7a don't do the lerp calcs for blend == 0 or blend == 1 2001-08-21 05:46:55 +00:00
Bill Currie
0d82df96b0 ah, found the correct fix :) 2001-08-21 05:29:15 +00:00
Bill Currie
7ea46cf4ed disable lerping of the shadedots. stops the flicker but some lighting will
probably be a little funny.
2001-08-21 05:16:30 +00:00
Bill Currie
9bad6b89bb lerping works again. flames no longer flicker, but players do a /little/ 2001-08-21 03:49:17 +00:00
Ragnvald Maartmann-Moe IV
b868a09661 Kill off gl_view.c and sw_view.c. Renderer merge is more or less complete now. Software and gl renderers now calculate color shifts the same way, and sw looks a bit different now. Powerups don't shift enough in sw right now, IMO. 2001-08-10 00:28:57 +00:00