qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-12-13 06:00:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
11327 commits 17 branches 20 tags 29 MiB
Commit graph

4430 commits

Author SHA1 Message Date
Bill Currie
39920a4ea7 Fix the type when converting set of everything to string. 2012-12-07 19:35:37 +09:00
Bill Currie
c76231ca30 Add some very basic tests for sets. 
They test creation, empty, everything and inversion. Already found a bug
(typo: "everythign" :P)
 2012-12-07 19:34:34 +09:00
Bill Currie
e0c92b6089 Rename set_iter_t's member to value. 
Makes more sense now that the membership of the value depends on the
inversion of the set.
 2012-12-06 21:11:38 +09:00
Bill Currie
eb8fd55677 Move set.c into libQFutil. 
Also move the ALLOC/FREE macros from qfcc.h to QF/alloc.h (needed to for
set.c).

Both modules are more generally useful than just for qfcc (eg, set
builtins for ruamoko).
 2012-12-06 20:52:53 +09:00
Bill Currie
34e3ac1468 Fix jumpb's operand types. 
Aliasing the jump table to an integer broke statement_get_targetlist with
the new alias def handling, and was really wrong anyway. I probably did
that due to being fed up with things and wanting to get qfcc working again
rather than spending time getting jumpb right.
 2012-12-05 22:20:55 +09:00
Bill Currie
a12eb940f1 Remove the hard-coded bsp maximum depths. 
The depth limits in the gl and glsl renderers and in the trace code really
bothered me, but then the fix hit me: at load-time, recurse the trees
normally and record the depth in the appropriate place. The node stacks can
then be allocated as necessary (I chose to add a paranoia buffer of 2, but
I expect the maximum depth will rarely be used).
 2012-11-28 21:29:03 +09:00
Bill Currie
67b796f851 Fix a silly error in bsp extents checking. 
Found while hunting for rhinodemons.
 2012-11-23 14:38:15 +09:00
Bill Currie
fe9fb41f93 Correct some very suspicious looking code. 
While accessing short foo[2][4]; as foo[0][0..7] should work in theory, who
knows what gcc does with it when optimizing. I don't know if this will fix
johnnyonflame's bsp loading problem, but no point in having rhinodemonic
code hanging around.
 2012-11-23 14:35:34 +09:00
Bill Currie
4b503c7f72 Store the requested size in the block. 
This necessitated disabling the id2 padding, but it's only commented out
incase there's more growth. Now the (compiler) error in -addObjectNoRetain
is caught ealier.
 2012-11-19 21:50:42 +09:00
Bill Currie
8ee98e1ef5 Rename memblock_s's size to block_size. 
In order to improve the pointer checking, I plan on adding a size field to
represent the requested size.
 2012-11-19 21:35:27 +09:00
Bill Currie
49ad301d3d Add improved memory checking to progs. 
With pr_boundscheck >= 2, pointer access will be checked against allocated
blocks (qfvalgrind?:). Currently extremely basic, but it seems to work.
 2012-11-19 20:03:21 +09:00
Bill Currie
d0c37bbc51 Change the int<->float conversion opcode string. 
Using "=" was rather confusing, so changing it to "<CONV>" seems to be a
good idea. As the string is used only for selecting opcodes at compile
time, only qfcc is affected.
 2012-11-16 14:47:54 +09:00
Bill Currie
b8b626ee81 Change the int<->float conversion opcode string. 
Using "=" was rather confusing, so changing it to "<CONV>" seems to be a
good idea. As the string is used only for selecting opcodes at compile
time, only qfcc is affected.
 2012-11-16 14:45:11 +09:00
Bill Currie
d5c831b6da Add a little test case for accessing types. 
Using ruamoko to access ruamoko type encodings is actually quite pleasant
:)
 2012-11-15 13:40:11 +09:00
Bill Currie
6b46cde7c8 Move retainCount out of Object. 
Going by "standard" Objective-C, retainCount really doesn't belong in
Object itself. The way GNUStep does it is to stash retainCount in memory
just below the object by allocating extra bytes for the count and returning
a pointer just beyond those extra bytes. Now Ruamoko does the same. This
fixes the inconsistencies in structure layouts for Protocol and class
structs between qfcc generated (internal) structs and user visible structs.
 2012-11-08 20:24:25 +09:00
Bill Currie
1f9735d0cb Correct the dump format for conj.q. 2012-10-27 11:45:10 +09:00
Bill Currie
ec42bde527 Make hash tables more const correct. 
And clean up the resulting mess :/
 2012-10-27 11:44:31 +09:00
Ozkan Sezer
6e04fd5ff6 signed int viddef_t members 
The attached patch (against quakeforge git) changes the [con]width,
[con]height, and most importantly the rowbytes members of viddef_t
from unsigned to signed int, like in q2.  This allows for a properly
negative vid.rowbytes which may be needed in, e.g. a DIB sections
windows driver if needed.  Along with it, I changed a few places
where unsigned int is used along with comparisons against the relevant
vid.* members.
One thing I am not 100% sure is the signedness requirements of
d_zrowbytes and d_zwidth: q2 has them as unsigned but I am not sure
whether that is because they are needed as unsigned or it was just an
oversight of the id developers. They do look like they should be OK
as signed int to me, though: comments?

==
Note from Bill Currie: I had to do some extra changes as many
signed/unsigned comparisons were somehow missed.
 2012-10-21 09:00:50 +09:00
Bill Currie
eccc1b5b51 Put the over-size range back to its original value. 
This fixes the horribly different results between optimized and unoptimized
qfbsp (there is still a difference of 1 brushface). Unfortunately, it also
severely limits the maximum size of a map.
 2012-09-18 09:25:10 +09:00
Bill Currie
709da6e7d7 Rotate the skybox -90 degrees on the z axis (gl) 
Now gl and glsl match again, and quake's skies are now "correct" (assuming
fitzquake is the standard).
 2012-09-13 08:36:28 +09:00
Bill Currie
14f089d08e Correct the orientation of the skybox (for glsl). 
It turns out the expected orientation of the sky cube is exactly that of
Blender's default cube looked at from the front view (num-1) and the front
face being the nearest face. This put's Marcher's sun nicely in the view
when exiting the cave.
 2012-09-12 19:06:07 +09:00
Bill Currie
536ee48a97 Some minor skybox improvements suggested by mh. 
Rearrange the sky_suffix and sky_coords arrays and remove the sky_target
array such that the faces can be loaded using
GL_TEXTURE_CUBE_MAP_POSITIVE_X + i (apparently certain drivers break if
the faces aren't loaded in the correct order).

Also, the nomalization of the direction vector in the fragment isn't
necessary.
 2012-09-12 15:20:35 +09:00
Bill Currie
433d9d138b Hook up the pointfile loader in glsl. 
I was always wondering what that was for (never bothered looking at the
command registration, I guess :P).
 2012-09-12 09:54:24 +09:00
Bill Currie
45c48a6215 Fix bsp2 loading. 
Just some problems with the handling of extended bsp29 files. I'm not
quite happy with the code, but it will do for now.
 2012-09-08 09:41:00 +09:00
Bill Currie
cfb856b9cf Fix byteswapping of a node's firstface/numfaces. 
I'd forgotten to fix this.
 2012-09-08 09:38:22 +09:00
Bill Currie
beb0b9e0fc Fix a segfault when no interfaces are available. 2012-09-08 09:37:48 +09:00
Bill Currie
0ce32a793e Return the correct size for set_bsp*_write(). 
Need to subtract the size of the bsp_t/bsp29_t struct. Now old and new
qfbsp produce identical bsps (so long as they're both unoptimized, or
(probably) both optimized).
 2012-09-07 20:42:04 +09:00
Bill Currie
2d30cddc66 Implement bsp2/bsp29 writing. 
It's ugly, inefficient, and untested, but it should work.
 2012-09-07 18:27:20 +09:00
Bill Currie
3df85a6abe Fix reading bsp29 files. 2012-09-07 17:37:46 +09:00
Bill Currie
a37c5465e1 First step for BSP2 support. DOES NOT WORK! 
All of the nastiness is hidden in bspfile.c (including the old bsp29
specific data types). However, the conversions between bsp29 and bsp2 are
implemented but not yet hooked up properly. This commit just gets the data
structures in place and the obvious changes necessary to the rest of the
engine to get it to compile, plus a few obvious "make it work" changes.
 2012-09-07 16:09:24 +09:00
Bill Currie
69fb78278f Remove the redundant endian conversions from bsp loading. 
It's obvious that it's been a very long time since anybody's tried playing
QF on a big-endian machine: double converting data isn't good :/
 2012-09-07 15:45:59 +09:00
Bill Currie
6ba6959205 Allow any NxN or 2NxN sky texture for glsl. 
Maps that specify a skybox often use a fake sky texture, sometimes 16x16.
Having a hardcoded requiredment of 256x128 is a tad inappropriate.
 2012-09-05 14:02:44 +09:00
Bill Currie
d6a1daaf30 Force a refdef update when nearclip or farclip change. 2012-08-29 09:55:17 +09:00
Bill Currie
abc81cee85 Avoid building unneeded libs. 
Having better dependency info in build_control.m4 would be nice, but this
works well enough for now.
 2012-08-20 14:12:20 +09:00
Bill Currie
9bfcdad35a Fix some type-size safety issues. 
Expecting int to be 32 bits is a little dangerous, and the function
versions of swap/noswap should be unsigned rather than signed.
 2012-08-19 13:37:06 +09:00
Bill Currie
0bd613b73d Disable vorbisfile's static callbacks. 
Since we use callbacks anyway, they're not needed, and this fixes the
warnings/errors when using ps3toolchain.
 2012-08-19 08:05:50 +09:00
Bill Currie
bf41851bd9 Check for ioctl availability. 
This gets networking compiling. Now the build gets all the way to qfcc,
where it dies with waidpid/execvp errors :P
 2012-08-18 22:02:02 +09:00
Bill Currie
575693e4a0 A bunch of networking compile fixes. 
This isn't everything needed to get networking compiling, but it's pretty
close.
 2012-08-18 21:49:30 +09:00
Bill Currie
78f7604efc Evil hack to handle duplicated sdl key syms. 2012-08-18 21:44:51 +09:00
Bill Currie
9250eb83bf Yet more char index issues. 
Should be getting near the end of these as qfcc tries to link in my hacked
up tree :)
 2012-08-18 21:42:49 +09:00
Bill Currie
7f805c2527 Use pkg-config for zlib. 
Helps cope with zlib being in weird places (eg, ps3toolchain)
 2012-08-18 21:41:33 +09:00
Bill Currie
3b047a3cc1 Check for getuid and cope when it's not there. 
The ps3toolchain doesn't have getuid or getpwent. Nor does it have
timeGetTime, so use Sys_DoubleTime instead.
 2012-08-18 21:37:54 +09:00
Bill Currie
6200d35109 Don't include SDL_byteorder.h 
We don't need it and it's not always available.
 2012-08-18 21:35:24 +09:00
Bill Currie
6f484ee757 Add support and tests for 3x3 matrices. 2012-08-18 16:29:57 +09:00
Bill Currie
cc35209f86 Yet more char index issues :P 2012-08-18 12:20:08 +09:00
Bill Currie
ee27c49e70 Separate the checks for building dirent.c and fnmatch.c. 
ps3's libc has opendir and friends, but not fnmatch.
 2012-08-18 12:12:45 +09:00
Bill Currie
5613b272da Whee, another char index issue. 2012-08-18 11:50:35 +09:00
Bill Currie
d074f4a983 Hack in a fake version of "access". 
It seems access is unimplemented in the ps3 toolchain.
 2012-08-18 11:45:26 +09:00
Bill Currie
62face768f Fix some char index issues. 2012-08-18 11:02:52 +09:00
Bill Currie
7928274b6e Test for and include sys/select.h. 2012-08-18 10:57:42 +09:00
Bill Currie
6e1f043719 Clean up some unused or local functions. 2012-08-18 09:36:43 +09:00
Bill Currie
a1a2060583 Yet another ps3 plugin fix. 
Returning an uninitialized pointer... ouch. Hopefully the last one.
 2012-08-17 10:24:41 +09:00
Bill Currie
cbaad33638 Fix a couple more ps3 plugin related warnings. 
Whee :P
 2012-08-17 10:20:35 +09:00
Bill Currie
41876e8c37 Some compile fixes for when dlopen is not available. 
It seems the ps3 gameos build env is... not what we've come to take for
granted.
 2012-08-17 09:18:00 +09:00
Bill Currie
5b054dd98b Add "slow grav" for smoke. 
Removes one more set of hard codings from particle types.
 2012-08-12 11:42:18 +09:00
Bill Currie
5a5b31bae4 Correct the direction of pt_fire particles. 
sub_grav() was accelerating the particle in the wrong direction. Down being
+ve gravity caused a bit of confusion (though it was a c&p error).
 2012-08-10 13:56:01 +09:00
Bill Currie
31dead3dcd Fix 16-bit mdl loading for glsl. 
The extra precision verts are offset by numverts, not numposes :P
 2012-08-07 17:06:01 +09:00
Bill Currie
1406cf13de Mask the QFS_Rename message with SYS_FS. 
It really should have been masked all along, but I guess developer 1 was
too noisy back then.
 2012-07-21 22:34:10 +09:00
Bill Currie
372defc1be Support up to 128 dlights. 
More or less as per MH's tut, but really just finishing something that
should have been done years ago.
 2012-07-21 13:58:54 +09:00
Bill Currie
106257d6e9 Allow reconstructed builtins to be found by name. 
Certain versions of qcc (fteqcc comes to mind :P) strip the names from
builtin functions. This breaks saved games that happen to have a builtin
function in a saved function variable. The earlier builtin name
reconstruction patch happened to fix the writing of save games for such
progs, and this one fixes the reading.
 2012-07-20 16:17:26 +09:00
Bill Currie
15484956f7 Make con_speed 0 instant. 
Nice for recording, and should give more accurate timedemos.
 2012-07-18 14:50:49 +09:00
Bill Currie
d73b5045d8 Do not do any contents evaluation if not printing contents. 
Fixes a segfault when tracing progs caused by the recent entity number
change.
 2012-07-18 10:46:59 +09:00
Bill Currie
8691a2fbd1 Dump a stack trace when running out of edicts. 2012-07-18 10:30:58 +09:00
Bill Currie
7d8b0f96d6 Correct the fog distance calculations. 
It turns out the pixel's z coord is correctly obtailed by
gl_FragCoord.z/gl_FragCoord.w.
 2012-07-17 19:10:10 +09:00
Bill Currie
c4309e7abc Correct the fog blend calculation for transparency. 
The incoming pixel's alpha should not be affected by fog. This fixes the
ugly square smoke particles in foggy maps.
 2012-07-17 19:08:36 +09:00
Bill Currie
c66e437ebe Enable shadows for grenades. 
Now that shadevector is correctly transformed, grenade shadows aren't quite
so silly.
 2012-07-17 17:12:34 +09:00
Bill Currie
a7327acb80 Set up shadevector for gl alias models. 
The setup had been lost at some stage, thus shadows were always directly
under the entity. Unlike the original quake shadow code, the vector is
correctly transformed into the entity's space.
 2012-07-17 17:10:48 +09:00
Bill Currie
fbc0ad59df Implement gl shadows for pure triangle alias models. 
I finally found the cause of Despair's gl shadows non-rendering+segfault...
the shadow code expected triangle fans and strips but was getting simple
triangles. Oops.
 2012-07-17 16:11:42 +09:00
Sander van Dijk
3c04de1116 Better default vid_gamma value. 2012-07-17 06:30:01 +09:00
Bill Currie
134f9b0e9e Force pr_keys.c to get linked in. 
Nothing in the main program currently uses Key_Progs_Init, so the object
file wasn't getting pulled into the link. However, it's quite necessary for
the client console plugin :/
 2012-07-16 18:18:13 +09:00
Bill Currie
8333e6578c Fix non-static sw renderer for 32bit x86. 
Yet another undefined symbol caused by iqm support. This time caused by
asm/not asm.
 2012-07-15 22:34:00 +09:00
Bill Currie
0f34ab8762 Move pr_keys.c from console to video/targets. 
It wasn't very accessible/usable in the client console plugin.
 2012-07-15 07:39:50 +09:00
Bill Currie
f9c6eacb84 Really fix sw32 renderer loading. 
It seems I never tested the sw32 renderer in a non-static build since I put
in IQM support.
 2012-07-15 07:30:17 +09:00
Bill Currie
fd6b5edb73 Don't set triangle draw type in sw32 iqm renderer. 
It's not used and causes link errors (I never noticed on my system).
 2012-07-14 19:48:57 +09:00
Bill Currie
fcf7150c62 Remove some old renderer specific files. 2012-07-14 07:32:53 +09:00
Bill Currie
a9adc94aa8 Force builtin function descriptors to have a name. 
That is, the descriptors loaded from the progs file. Some compilers (eg,
fteqcc :P) strip builtin names from the progs, which makes debugging
difficult.
 2012-07-13 10:22:25 +09:00
Bill Currie
6fe32103ea Do a bit of bound() usage auditing. 
While these seem to be mostly harmless, having function calls in the
bounded value can be nasty.
 2012-07-12 19:33:51 +09:00
Bill Currie
a822a683cd Fix the inverted lighting for sw32. 
LordHavoc had made lighting positive for sw32, but I had done something in
the plugin code that broke that (probably something to do with the
colormap loading). Going back to id's original code fixes the issue.
 2012-07-12 18:15:45 +09:00
Bill Currie
12319cfcdf Revert "Slightly reducde the number of calls to glUniformMatrix4fv." 
This reverts commit e170f4ee75.

It turns out I messed up something in the patch. I noticed the problem
while playing digs04.bsp: many sub-model surfaces, particularly those with
animated textures, were not being transformed correctly. As this patch did
not make a large performance difference, it's probably better to just
revert it. I might revisit it later.
 2012-07-11 08:12:57 +09:00
Bill Currie
ede65fb28c Use the correct source for the backtile width/height. 
Yay, no more garbage on the screen :)
 2012-07-09 15:56:51 +09:00
Bill Currie
5014825b39 Fix the backtile for glsl. 
Since the backtile is loaded into a scrap and used as a subtexture, we
can't use GL's texture wrapping, thus do the wrapping ourselves. There are
some minor issues with the wrong part of the scrap being drawn: need to
investigate where the bug is (vrect, make_quad, etc).
 2012-07-09 15:11:03 +09:00
Bill Currie
6e0907a6b1 Delay the "too many entities" check. 
Rather than checking the raw edict count in the entities file against the
progs' max_edicts, check the allocated entity's number. This allows loading
of sophisticated maps (eg, digs04) that prune many of their entities.
 2012-07-09 15:07:34 +09:00
Bill Currie
ce16750b04 Cache the max_edicts value in the progs struct. 
Makes checks a little easier.
 2012-07-09 15:06:42 +09:00
Bill Currie
e91b06a144 Better name for the edict count parameter to PR_LoadProgsFile. 2012-07-09 15:02:49 +09:00
Bill Currie
37260018a2 Acutally use the vertex colors for alias models. 
Thanks to Spirit trying QF on nvidia drivers, the missing attributes were
found. Now he shouldn't get gl errors :)
 2012-07-08 16:52:13 +09:00
Bill Currie
a6d9f5d931 Fix a parallel make issue. 2012-07-06 12:35:50 +09:00
Bill Currie
dbbd6f4535 Fix a couple of missing particle function pointers. 
Discovered while getting the location markers working again.
 2012-07-06 10:18:05 +09:00
Bill Currie
428d57b7e1 Don't attemt fullbright processing for an unavailable skin. 
In the end, it turns out this is the correct fix for the gl seg on
overkill, because build_skin will correctly use the fully setup player skin
if the glskin doesn't have a texture associated with it.
 2012-07-05 10:30:41 +09:00
Bill Currie
80bc0e9fb8 Make nq and qw use the new entity state struct. 
This isn't really the best solution, but it does get things being shared
with the minimum of fuss.
 2012-07-05 09:39:16 +09:00
Bill Currie
dea2f48477 Move entity_state_t into client/entities.h 
Also, start working on the shared entity manager.
 2012-07-05 09:39:16 +09:00
Bill Currie
b65c41efcb Move the colormod lookup table into a new lib. 
libQFclient is now here :) The first shared code is the lookup table.
 2012-07-05 09:39:16 +09:00
Bill Currie
ef9e8d05c4 Avoid some unnecessary state changes. 
Doesn't make much difference but it doesn't hurt.
 2012-07-03 18:20:32 +09:00
Bill Currie
ee1cb24e3d Move the call to R_SetFrustum to gl_R_SetupFrame. 
This was meant to be part of the previous commit, but I forgot to write the
file :P
 2012-07-03 16:08:12 +09:00
Bill Currie
a8e0bcabf9 Call R_SetFrustum in all renderers. 
It turns out glsl, sw and sw32 weren't getting any benefit from R_CullBox
because the frustum wasn't setup :P. Get another 8% out of bigass1
(174->184fps). bigass1 now runs 2x as fast as it did before I started this
optimisation run :)
 2012-07-03 15:57:33 +09:00
Bill Currie
e58cd75660 Bound r_maxdlights properly. 
QF's implementation doesn't support more than 32 dlights (32 bit int).
 2012-07-03 15:27:48 +09:00
Bill Currie
eefefb79b0 Rename char_queue to draw_queue. 2012-07-03 14:45:16 +09:00
Bill Currie
b25de4d995 Rewrite the 2d code to use a scrap. 
This severely reduces the calles to BindTexture, and more importantly,
glUseProgram, EnableVertexAttribArray etc. The biggest changes are:

 o  icons and text are all in the one giant texture
 o  icons and text are mixed in the one queue

This gave ~9% speedup for bigass1 (159->174fps).
 2012-07-03 13:38:35 +09:00
Bill Currie
df35b22af4 Parameterize the linear filtering of scrap textures. 2012-07-03 12:10:24 +09:00
Bill Currie
e170f4ee75 Slightly reducde the number of calls to glUniformMatrix4fv. 
It doesn't make a big difference to bigass1 (yet ?), but it does clean up
apitrace a little.
 2012-07-03 10:57:35 +09:00
Bill Currie
1a6b56b0a2 Call glTexSubImage2D only once per frame. 
Instead of once per surface... ouch. Gives about 20% speed boost on demo1
(154.7->185.7)
 2012-07-02 20:01:28 +09:00
Bill Currie
8fa92bf206 Add 32 button support to sdl and win as well. 
The world isn't x11 (much as I'd like it to be)
 2012-07-02 16:51:14 +09:00
Bill Currie
7cd8806ec0 Add support for up to 32 mouse buttons. 
My new mouse reports only up to 9 (skipping 6 and 9, it seems), but I
/have/ seen 32 button mice...
 2012-07-02 16:33:57 +09:00
Bill Currie
4da3be5cd6 Get a minor speed gain in glsl bsp rendering. 
About 4% (99.5 to 104.4) from not calling VertexAttrib4fv or BindTexture
when not necessary.
 2012-06-29 22:13:20 +09:00
Bill Currie
603fe92cba Add a callback for when key_dest is set. 2012-06-29 18:00:21 +09:00
Bill Currie
3406cad99a Many distcheck fixes. 
Yay, bitrot :P
 2012-06-29 10:49:21 +09:00
Bill Currie
415decb983 Use memmove instead of strcpy when deleting chars. 
It seems recent(?) 64-bit strcpy implementations of strcpy don't work
properly for overlapping regions even when moving down. Quite the
surprise, as I thought that would always work. *shrug*
 2012-06-23 20:54:55 +09:00
Bill Currie
7b231bc70e Add support for /*..*/ comments to idparse 2012-06-23 19:43:22 +09:00
Bill Currie
aa2a8e8909 Mostly "merge" cl_screen.c. 
Down to protocol/networking differences.
 2012-06-15 22:02:17 +09:00
Bill Currie
b2290d92c9 Nuke UNALIGNED_OK. 
It's not really necessary (and was effectively dead anyway).
 2012-06-15 22:02:17 +09:00
Bill Currie
e730608dd7 Implement r_flatlightstyles from fitzquake. 2012-06-15 22:02:14 +09:00
Bill Currie
b4ad695e16 Make info_t opaque. 
I didn't like the way client/server code was poking around at the
implementation. Instead, provide a couple of accessor functions for the
same information.
 2012-06-14 22:46:23 +09:00
Bill Currie
ac1bf2a158 Don't save unnamed fields. 
There will normally be only one unnamed field (if any), and it's always the
null field. This will put an eventual end to the "'' is not a field"
messages.
 2012-06-10 20:56:22 +09:00
Bill Currie
7d84800250 Remove an unnecessary if. 
It needed during initial development of the patch, but with the refactoring
of s_init, it became redundant.
 2012-05-28 07:58:11 +09:00
Bill Currie
01fb4f265d Attempt to reconnect to jack on loss of connection. 2012-05-28 07:46:22 +09:00
Bill Currie
dbc203b625 And a few more bits of whitespace. 2012-05-23 08:21:27 +09:00
Bill Currie
23a38738fc Massive whitespace cleanup. 
Lots of trailing whitespace and otherwise blank lines.
 2012-05-22 08:23:22 +09:00
Bill Currie
85da69a96a Transform normals wrt bones in sw and sw32. 
Better lighting :), though any scaling/shearing will produce funny results,
and sw32's lighting is broken in general.
 2012-05-20 15:21:25 +09:00
Bill Currie
b5add680f7 Add Mat4as3MultVec. 
to transform a vertex without the translation (eg, for normals) without
having to have separate matrices.
 2012-05-20 15:20:18 +09:00
Bill Currie
0fbaa2a88a Add sw32 support for iqm models. 
That was easy :)
 2012-05-20 14:23:41 +09:00
Bill Currie
3087e685cc Convert texcoords to fixed point. 
Bah, another weekend wasted on an oversight :( However, Mr. Fixit looks
quite alright in the quake palette.
 2012-05-20 10:02:44 +09:00
Bill Currie
f0285e5a08 Correct the texcoord conversion. 
1.0 is to represent the last pixel, not one past it.
 2012-05-20 08:51:15 +09:00
Bill Currie
e2db2dcb63 Support static iqm models. 
Segging on a model with no animations is not nice :P
 2012-05-19 21:26:11 +09:00
Bill Currie
d25f39cc7d Remove pskindesc from affinetridesc_t. 
It's never used after being set.
 2012-05-19 09:29:05 +09:00
Bill Currie
c1eb3e77c3 Process each vertex texcoord only once. 
Double converting texcoords results in 0,0 for all affected texcoords. Mr
Fixit was looking rather ill. Now he looks weird (something wrong in the
renderer?).
 2012-05-19 09:15:26 +09:00
Bill Currie
d41bf32d91 Hopefully fix color conversion. 
Hard to tell because the triangle rendering is still messed up. However,
storing negative values in bytes doesn't work :)
 2012-05-19 09:14:07 +09:00
Bill Currie
be9c0697a2 Give sw iqm its own transform setup. 
IQMs don't need to be scaled or offset. This fixes iqms not rendering,
though they actually were: just super tiny.
 2012-05-19 00:43:26 +09:00
Bill Currie
c0517b1d97 Factor out the blend palette creation. 
gl, sw and sw32 use blend palettes, so share the code. This also abandons
the optimization for transforming verts in sw (had all sorts of problems
anyway). sw still doesn't work, though.
 2012-05-19 00:34:15 +09:00
Bill Currie
e069757ceb Refactor the skin setup code. 2012-05-19 00:18:03 +09:00
Bill Currie
fb10f38fd4 SW now tries (but fails miserably) to render iqm models. 
Something seems to be very wrong with the transforms.
 2012-05-18 23:31:14 +09:00
Bill Currie
da87ac0ce5 Remove some unused parameters. 2012-05-17 21:33:22 +09:00
Bill Currie
da313cfae7 Load iqm models in the sw renderers. 
sw32 loses 32 bit textures :/
loading is /slow/ (converting rgb(a) to 8bit palette... ouch.
 2012-05-17 21:17:48 +09:00
Bill Currie
7637f35616 Remove the test scaling. 
Heh, forgot to remove it again :)
 2012-05-17 16:02:13 +09:00
Bill Currie
c3801d46e5 Render iqm models in GL. 
There are still many issues to sort out, but the basics are working.

Problems:
	rendered fullbright (no lighting done)
	normals are ignored
	extra textures (glow etc) not used/loaded

4 models on the screen don't seem to be a problem.
 2012-05-17 15:58:29 +09:00
Bill Currie
f958afad53 Optionally allocate extra data for iqm blend frames. 
Also, correct the blend parameter type (int->float. oops).
 2012-05-17 15:57:07 +09:00
Bill Currie
c0df07b607 Enable loading of iqm models in gl. 
They don't render yet, but the engine doesn't segfault.
The vertex blend indices are rewritten with blend palette indices.
 2012-05-17 15:55:38 +09:00
Bill Currie
23284536b5 Move IQM freeing into common code. 2012-05-16 18:09:44 +09:00
Bill Currie
041d63c828 Move the frame blending into common code. 2012-05-16 17:44:18 +09:00
Bill Currie
8ada7c02a3 Remove the vertex scaling. 
It was there only because mrfixit is rather small (8qu?) and it made
finding him easier :). Anyway, any scaling should be done in the engine.
 2012-05-16 08:13:59 +09:00
Bill Currie
9984925fe8 Correct a comment. 2012-05-15 21:08:47 +09:00
Bill Currie
31772afd13 Add in some ambient light for iqm models. 
Though the bsp loader doesn't yet support colored lighting, the ambient
light will be colored when it does. With this, I guess iqm model support is
done for glsl until I figure out how I want to do dual quaternion support.
 2012-05-15 21:08:47 +09:00
Bill Currie
111377f1be Use buffer objects for iqm vertex arrays and elements. 2012-05-15 21:08:47 +09:00
Bill Currie
5740dba467 Mark iqm models as need-load when clearing. 
This fixes the segfault on map change.
 2012-05-15 21:08:47 +09:00
Bill Currie
0fd2b01665 Update the shader to work as it should :) 
I always thought it whould be "light - point" :P. Also, in normal maps, 127
is 0.
 2012-05-15 21:08:47 +09:00
Bill Currie
c454b96d2a Translate lights into entity space. 
Finally, lights work "properly". Probably the nicest lighting we've ever
had :) (still have to put in ambient, though).
 2012-05-15 21:08:47 +09:00
Bill Currie
1375c3cf03 Finally, load textures for iqm :) 2012-05-15 21:08:47 +09:00
Bill Currie
a032aa5adf Get the lights working (as such). 
They work nicely now when the normal map and texture are bypassed (don't
know what texture is getting used currently).
 2012-05-15 21:08:47 +09:00
Bill Currie
8c5e278bf8 Implement frame blending for iqm. 
Now that I have things working... :)
 2012-05-15 21:08:47 +09:00
Bill Currie
a938c7fb14 Almost fix the animations. 
There's still a problem with his finger tips and feet, but the rest of his
limbs seem to be working well. Much thanks to Spike for encouraging me to
do a dump of the matices that are actually sent to the card.

It turns out that animated joints remain relative right up to the last
moment.
 2012-05-15 21:08:46 +09:00
Bill Currie
4ba69b511b Make quat_origin the right type. 
It's quat_t, not vec3_t :P.
 2012-05-15 21:08:46 +09:00
Bill Currie
202ab04572 Ensure the rotation quats are normalized. 
Doesn't make any noticeable difference, but it doesn't hurt.
 2012-05-15 21:08:46 +09:00
Bill Currie
31d89782ef Use the correct index variable when byteswapping the arrays. 
Not the cause of the broken animations :(
 2012-05-15 21:08:46 +09:00
Bill Currie
7cda91a879 Temporarily disable dual quaternions. 
The animation data isn't getting loaded or used properly (not sure yet).
This helps ensure it's not something I've done wrong with dual quats.
 2012-05-15 21:08:46 +09:00
Bill Currie
4b38048a5c Create functions for rotation and translation. 2012-05-15 21:08:46 +09:00
Bill Currie
5b4fdd2a93 Use the correct position for light calcs. 
I should have remembered that gl_FragCoord wasn't right.
 2012-05-15 21:08:46 +09:00
Bill Currie
2080c337d7 Avoid using malloc/free every model/frame. 2012-05-15 21:08:46 +09:00
Bill Currie
c2e0674d50 Implement R_IQMGetLerpedFrames(). 
Like R_AliasGetLerpedFrames, but for IQM. It calcualtes the current frame
number and blend between the previous and current frames.
 2012-05-15 21:08:46 +09:00
Bill Currie
8387d987e2 Change position to vposition. 2012-05-15 21:08:46 +09:00
Bill Currie
099ef348c6 Advance the vertex attrib index. 
Disabling the array right after enabling it was causing things to just not
work :P
 2012-05-15 21:08:46 +09:00
Bill Currie
d1d4c6142c Get the frame data from the right places. 
Always using joint[0] of the frames wasn't very useful.
 2012-05-15 21:08:46 +09:00
Bill Currie
74cb49ef7c Free the blended frame data. 2012-05-15 21:08:45 +09:00
Bill Currie
551dfc47fb Build the iqm vertex arrays in the correct order. 
They need to be built in ascending type order (makes life easier in the
renderer).
 2012-05-15 21:08:45 +09:00
Bill Currie
bea8f8f9c4 Fix a segfault when searching for dlights. 
Uninitialized var bites my bum :P
 2012-05-15 21:08:45 +09:00
Bill Currie
2e98c31175 Check the corrent bits when reading scale frame data. 
Fixes the invalid reads when loading an iqm (at least for mrfixit).
 2012-05-15 21:08:45 +09:00
Bill Currie
9c69404163 Attempt to render iqm models. 
Things are a right mess (segfaults, invalid accesses on load, etc), but
hey, it's a start :)
 2012-05-15 21:08:45 +09:00
Bill Currie
15fd3be73a Allow iqm models when storing efrags. 2012-05-15 21:08:45 +09:00
Bill Currie
a880f33152 Set the model type for iqm. 
Forgot this rather important step :P
 2012-05-15 21:08:45 +09:00
Bill Currie
41e7a6c70c Search for the "nearest" dlights. 
Nearness is a function of both distance and intensity: distant bright
lights can take priority over close dim lights.
 2012-05-15 21:08:45 +09:00
Bill Currie
0becd35b65 Begin work on rendering iqm models. 
No chance of working yet, but the shaders compile :)
 2012-05-15 21:08:45 +09:00
Bill Currie
078cb10caf Add a stride field to iqm_t. 
Since iqm vertex arrays are variable, and I don't want to calculate the
stride every time I render a model, cached the value used when building the
arrays.
 2012-05-15 21:08:45 +09:00
Bill Currie
15d35fbdc9 Add mvp_mat and some comments. 2012-05-15 21:08:45 +09:00
Bill Currie
59c5bf2f9e Code up an initial version of the iqm vertex shader. 
Probably more bugs than an old kitchen cupboard :P
 2012-05-15 21:08:45 +09:00
Bill Currie
6ab3bd45e5 Implement IQM animation loading. 
Bone poses are converted to dual quaternions + shear + scale for nice
skinning. Will likely be slow for software skinning, but too bad.
 2012-05-15 21:08:45 +09:00
Bill Currie
bf38e6073e Implement iqm joint loading. 2012-05-15 21:08:44 +09:00
Bill Currie
9f253454e4 Implement and test Mat4Inverse(). 2012-05-15 21:08:44 +09:00
Bill Currie
fa6270322f Make Mat4Decompose a little more intuitive. 
Params are now in application order (good thing not much code uses it yet).
 2012-05-15 21:08:44 +09:00
Bill Currie
de131c18ad Add VectorShear and really test Mat4Decompose. 
And the tests really exercised VectorShear (first attempt had things
messed up when more than one shear value was non-zero). Also,
Mat4Decompose wasn't orthogonalizing the z axis row. Oops. Anyway,
Mat4Decompose is now known to work well, and the usage of its output is
understood :)
 2012-05-15 21:08:44 +09:00
Bill Currie
8cea6b0a1e Fix a scaling snafu in Mat4Decompose. 
Found when checking how rotation affects non-uniform scaling (haven't
written proper tests yet: need to figure out how).
 2012-05-15 21:08:44 +09:00
Bill Currie
82abd5e426 More matrix tests. 2012-05-15 21:08:44 +09:00
Bill Currie
730f9668bd Add support for mat4 * vec3 2012-05-15 21:08:44 +09:00
Bill Currie
50af8a562e Add tests for matrix decomposition and fix the bugs. 2012-05-15 21:08:44 +09:00
Bill Currie
52ab4f64f9 Add code for loading vertex colors. 
And correct an oopsie in bledweights.
 2012-05-15 21:08:44 +09:00
Bill Currie
215d2e9747 Add a function to decompose a matrix. 
The function gives rotation(quaternion), scale, shear, and translation (all
three as vectors), shear is (XY, XZ, YZ).
 2012-05-15 21:08:44 +09:00
Bill Currie
1be9384f10 Load the iqm vertex and triangle data. 
Still have the meshes, joints and animations to go.
 2012-05-15 21:08:43 +09:00
Bill Currie
8aabb704d2 Add tests for inverting a dual quad transform. 2012-05-15 21:08:43 +09:00
Bill Currie
f874aeb941 Add support for duals and dual quaternions. 
Not everything is unit-tested, but the currently important stuff is.
 2012-05-15 21:08:43 +09:00
Bill Currie
3b938592c3 Dump some gl limits. 2012-05-15 21:08:43 +09:00
Bill Currie
26a878da48 Stub out the iqm loader. 2012-05-15 21:08:43 +09:00
Bill Currie
e6c0512f31 Ensure dstring has space for terminating 0. 
It seems (some versions of) windows vsnprintf don't count the terminating 0
when limiting the number of chars written to the buffer. Nor do they
guarantee the output string will be terminated.
 2012-05-10 14:48:43 +09:00
Bill Currie
0036a5e113 Ensure edict_size is never 0. 
Avoids division by / in NUM_FOR_EDICT
 2012-05-06 21:35:42 +09:00
Bill Currie
099d9ec3f2 Move the increment of order out of the loop. 
I don't know what gcc's optimizations would do with it, but it seems quite
reasonable to pull the code out of the loop by hand.
 2012-05-05 18:01:00 +09:00
Bill Currie
cf5c9f067f Make GL_DrawAliasShadow const correct. 
Despair's having troubles with segfaults that I can't reproduce. If it's a
strict aliasing problem, this might help.
 2012-05-05 17:55:30 +09:00
Bill Currie
a43bd755ca Fix the 32-bit x86 build of the software renderer. 
I really need to remove the sledge-hammer approach, but this at least gets
QF working out-of-the-box on 32-bit x86 systems.
 2012-04-28 13:02:36 +09:00
Bill Currie
8791b35e55 Add support for half floats. 
iqm and OpenGL use them, so they might come in handy. The tests use values
from wikipedia and a couple extra.
 2012-04-26 20:55:11 +09:00
Bill Currie
1a0ccf6a92 Add vec = quat * vec to the progs engine. 2012-04-26 11:58:20 +09:00
Bill Currie
0a22a98b60 Fix some mis-versioned opcodes. 
Many of the quaternion opcodes were marked as being available for id progs.
oops
 2012-04-26 10:26:43 +09:00
Bill Currie
efaef89c5f Add a shortcut function for quaterion/vector multiplication. 
I got the idea from blender when I discovered by accident that quat * vect
produces the same result as quat * qvect * quat* and looked up the code to
check what was going on. While matrix/vector multiplication still beats the
pants off quaternion/vector multiplication, QuatMultVec is a slight
optimization over quat * qvect * quat* (17+,24* vs 24+,32*, plus no need to
to generate quat*).
 2012-04-26 09:48:08 +09:00
Bill Currie
7b0d48313d Fix a signed type mixup. 
I mis-applied calim's patch, and gcc failed to tell me :(
 2012-04-26 07:28:22 +09:00
Bill Currie
20b7a46100 Remove a bogus model type check. 
This allows 16-bit alias models to render when viewd straight on.
 2012-04-25 11:50:20 +09:00
Bill Currie
ba7046ea09 Allow large skins in sw32. 
Dirty rotten magic numbers :P
 2012-04-25 10:47:44 +09:00
Bill Currie
866c56c236 Do not try to lerp entities when their model changes. 
This avoids sending invalid pose data to the renderer. The symptom was a
vertex array offset higher than the vertex array size. Discovered by calim
of nouveau while he was debugging a driver problem found by QF. Many
thanks.
 2012-04-25 10:09:23 +09:00
Bill Currie
a7870a98a1 Apply a couple of patches from calim of nouveau. 
One's an actual bug, the other a bit of error checking (not sure how
necessary it is, but it's in code that we don't /want/ to run, so it can't
hurt :)
 2012-04-25 08:48:46 +09:00
Bill Currie
e167300a84 Fix a segfault in the sw32 renderer on entering e1m7 
While this particular tigger of the real bug was caused by 659d95221e
(hopefully fix both the "get stuck waiting for 3d" bug and the null
worldmode bug.), the real bug was lurking in the code since the dawn of
time (from sw32's perspective). This fix is as per LordHavoc's suggestion
(heh, despite the years, he knows his code), but I spent the time hunting
down the trigger to understand just what was going on.

It turns out that (0,0,0) is too close to a wall (probably on, but the
slight default offset is too close) and the above commit changed the first
rendered frame to be before the player origin was set rather than after.
This fix feels correct to me because noclipping around with the sw32
renderer would probably hit the same bug with a bit of bad luck. Thus
ensure the index resulting from zi never exceeds 65535.
 2012-04-24 22:02:20 +09:00
Bill Currie
95cef4a73e Correct a spelling error. 2012-04-24 14:12:54 +09:00
Bill Currie
bc1b483525 Nuke the rcsid stuff. 
It's pretty useless in git.
 2012-04-22 10:56:32 +09:00
Bill Currie
1fd84477a2 Rename char to dchar in the text vertex shader. 
Thanks to Spirit :)

Turns out certain drivers (nvidia?) reserve "char" even though opengl does
not. This should fix his missing console text.
 2012-04-21 20:59:04 +09:00
Bill Currie
3b07928373 Fix an inconsistent numeric constant. 
While checking the shaders to see if there might be anything obvious to
work around the current nouveau shader issues, I found a 1 that should have
been a 1.0. I'm surprised it ever compiled.
 2012-04-20 16:30:25 +09:00
Bill Currie
561484842c Fix some snafus in PL_ParseData 
Found them by inspection while writing a python version of qfplist.
 2012-04-17 21:26:33 +09:00
Bill Currie
878764f79d Fix some segfaults in nq-server. 2012-04-15 15:11:16 +09:00
Bill Currie
6f026e9116 Fix some segfaults in server model loading. 
I'd forgotten to test the servers when I did the vid_plugin changes.
 2012-04-15 14:12:00 +09:00
Bill Currie
bbd277cb72 Fix building libQFrenderer as a helper library. 2012-04-12 17:16:40 +09:00
Bill Currie
61ae793367 Fix two broken symbols for sw32. 
Now all 4 render plugins load as standard plugins (though there's still a
problem with libQFrenderer.so)
 2012-04-12 17:12:24 +09:00
Bill Currie
633f70b2f1 Remove a functionally dead symbol. 
The only purpose clearnotify seemed to be serving was to stop the console
plugin from loading :P
 2012-04-12 17:05:42 +09:00
Bill Currie
7fc99f9c60 Fix gl and glsl support in sdl. 2012-04-12 16:47:37 +09:00
Bill Currie
ab486dcdf6 Unregister the quit command before registering it. 
This fixes the quit menu not working.
 2012-04-12 15:07:28 +09:00
Bill Currie
e784754a11 Disable the gl_triplebuffer check in glsl. 
It doesn't seem to have any useful effect in QF (even before the plugin
project) other than setting the number of frames to update. I'm not sure if
it's a useless variable or one where the user is supposed to match it to
the system configuration. Anyway, with this, the glsl plugin now works.
 2012-04-12 14:40:02 +09:00
Bill Currie
8401704c4e Connect up palette setting for gl and glsl. 
The GL plugin now seems to work. GLSL still segs :(
 2012-04-12 13:57:05 +09:00
Bill Currie
525dbcc13e Ensure code paths stay within the one renderer. 
The gl renderer calling sw functions is bad news. Still all black, but I
think that's because palette setting is disabled.
 2012-04-11 22:45:23 +09:00
Bill Currie
898bfa5e5f Split up the vid plugin init sequence. 
This gets gl so it no longer segs. However, the screen remains black
(expect for cshifts).
 2012-04-11 16:44:38 +09:00
Bill Currie
6ff658afe4 Use r_funcs in the client console plugin. 
Getting the sw renderer's functions when running gl was nasty.
 2012-04-11 16:38:15 +09:00
Bill Currie
d62772e9cc Separate render module loading from initialization. 
This allows the vid module to load the render module and access render
specific functions before the renderer initializes, which happens to need
an initialized vid module...
 2012-04-11 14:58:56 +09:00
Bill Currie
799a0ae018 Fix a bogus cshift calculation in sw32. 
Found via valgrind and gammatable having become malloced instead of static.
 2012-04-11 14:58:55 +09:00
Bill Currie
07ab5600c9 Recache viddef in *D_InitCaches. 
sw32 now at least doesn't seg, but doesn't draw any 3d. sw renderer seems
to work.
 2012-04-11 14:58:55 +09:00
Bill Currie
42868d308e Initialize the skins and particles subsystems. 2012-04-11 14:58:55 +09:00
Bill Currie
6ea4e6617a Connect up viddef properly. 
Or mostly so, anyway. sw32 is actually putting stuff on the screen.
 2012-04-11 14:58:55 +09:00
Bill Currie
4d9c3408a1 Start putting the pieces back together. 
The renderer now gets initialized and things sort of work (qw-client will
idle, though nothing is displayed). However, as the viddef stuff is broken,
it segs on trying to run the overkill demo.
 2012-04-11 14:58:55 +09:00
Bill Currie
1d864521e9 Fix the sprite model loader for plugins. 2012-04-11 14:58:55 +09:00
Bill Currie
cbdbfdd12f Fix the alias model loader for plugins. 2012-04-11 14:58:55 +09:00
Bill Currie
52e518bb1b Fix skin functions for plugins. 2012-04-11 14:58:55 +09:00
Bill Currie
f5d6959f4b Copy out the model functions pointer. 2012-04-11 14:58:55 +09:00
Bill Currie
6f7b4276e9 Move VID_InitBuffers back from the renderer to targets. 
First, it was nearly identical between sw and sw32 (one paranoia line in
sw32), and second, it's common enough.
 2012-04-11 14:58:55 +09:00
Bill Currie
a093e6af97 Move palette setting into viddef_t. 2012-04-11 14:58:55 +09:00
Bill Currie
e08d5ccb41 Move the gl util functions into viddef_t. 
Static plugins almost link now, just two more symbols to sort out.
 2012-04-11 14:58:55 +09:00
Bill Currie
7ed33f6345 Hide D_FlushCaches. 
There'd been a way to do so all along :/ There might be some issues with
this, but those will be easy to fix :)
 2012-04-11 14:58:55 +09:00
Bill Currie
7865f6afe1 Rename sw's R_Init to sw_R_Init. 
For now, the only symbol I'll bother messing with in the sw renderer.
 2012-04-11 14:58:54 +09:00
Bill Currie
1dd1aec48f Make libgl_handle static. 
This will make life interesting for getting the final stages working, but
it helps for now.
 2012-04-11 14:58:54 +09:00
Bill Currie
772af29cb3 Move the gl cvars into gl. 
That gets rid of the gl_overbrite_f clash. They were put in r_cvar for
saving to the config file, but that was before seta existed.
 2012-04-11 14:58:54 +09:00
Bill Currie
65bd29353c Make a start on putting the pieces together. 
Still many undefined and multiply defined symbols, but there seems to be a
light in this darkness. I just hope it's not an oncoming train :)
 2012-04-11 14:58:54 +09:00
Bill Currie
d445b4ef88 Rename the glsl qfgl functions to qfegl. 
Keep them separate from the gl renderer :)
 2012-04-11 14:58:54 +09:00
Bill Currie
36504547a8 Rename the public symbols for gl, glsl and sw32. 
Evil hack, but it does the job.
 2012-04-11 14:58:54 +09:00
Bill Currie
8de5c9ae3f Do a final cleanup before doing the big rename. 2012-04-11 14:58:54 +09:00
Bill Currie
f7007825e4 Run the vacuum cleaner over sw32's global variables. 
This seems to be everything that can be made static.
 2012-04-11 14:58:54 +09:00
Bill Currie
db4a463727 Remove VISIBLE from the files that will go into the plugins. 2012-04-11 14:58:54 +09:00
Bill Currie
eb536dc995 Remove D_BeginDirectRect and D_EndDirectRect from gl/glsl. 
They were never really needed anyway (they're for the sw renderer).
 2012-04-11 14:58:54 +09:00
Bill Currie
e991c1fed3 Make a bit of progress cleaning up vid for plugins. 2012-04-11 14:58:54 +09:00
Bill Currie
80f5cc59e9 Plug a memory leak. 
Allocating (and not freeing) rects every frame... ouch.
 2012-04-11 14:58:54 +09:00
Bill Currie
96b80433d8 Make some progress in getting static plugins to link. 
Still many redefined symbols (and I expect more to come), and many
undefined symbols too.
 2012-04-11 14:58:54 +09:00
Bill Currie
5f5305d61d Map vr_data/funcs to vid_render_data/funcs. 2012-04-11 14:58:54 +09:00
Bill Currie
ad61c7a30c Start working on creating the render plugins. 
Things blow up quite nicely. :)
 2012-04-11 14:58:53 +09:00
Bill Currie
8530959752 Link the model libs to the render plugins. 2012-04-11 14:58:53 +09:00
Bill Currie
8e91fb7bc1 Get the basics linking. 
Still, nothing will work: no plugins are loaded and they're all broken
anyway.

glx, sgl, glslx etc are going away, just the basics will be built: fbdev
(probably go away eventually), sdl, x11 and hopefully someday win. That's
actually the only reason anything links.
 2012-04-11 14:58:53 +09:00
Bill Currie
a4c280f2b2 Take the first step towards render plugins. 
No clients link. Even if they did, nothing would work.
 2012-04-11 14:58:53 +09:00
Bill Currie
1cbabf72c9 Fix a buffer overflow. 
gcc 4.7 found it :)
 2012-04-11 14:56:49 +09:00
Bill Currie
39e1ccc506 Don't try to process skins in GL without a player model. 
If the client receives a skin updated message from the server before having
loaded the player model (shouldn't happen, but some servers have very
strange programmers), no skin data is avaible for updating, so just bail
out.
 2012-03-14 16:08:48 +09:00
Bill Currie
82679066cc Run a vacuum cleaner over the diffs between x11 and glx init. 
X11 and GLX init are nowhere near as scary as I thought they were, once
they've been tidied up.
 2012-02-18 21:33:54 +09:00
Bill Currie
eff8ebd9ba Fix a snafu. 
In all that, I forgot to test non-asm builds.
 2012-02-18 14:54:20 +09:00
Bill Currie
72fb96245f Cleanup global symbols for the sw and sw32 renderers. 
Names not mangled, but those symbols that could be made static have been.
Also, many dead variables have been removed.
 2012-02-18 14:34:14 +09:00
Bill Currie
ef37ed39a9 Clean up global symbols for the glsl renderer. 
Where possible, symbols have been made static, prefixed with glsl_/GLSL_ or
moved into the code shared by all renderers. This will make doing plugins
easier but done now for link testing. The moving was done via the gl
commit.
 2012-02-18 11:48:52 +09:00
Bill Currie
447ff2f2f5 Clean up global symbols for the gl renderer. 
Where possible, symbols have been made static, prefixed with gl_/GL_ or
moved into the code shared by all renderers. This will make doing plugins
easier but done now for link testing.
 2012-02-18 11:48:52 +09:00
Bill Currie
057da55385 Fix the incorrect linkage of libQFrenderer* 
They're now currently not installed, but they were still building as shared
libs, and thus the installed bins were broken.
 2012-02-18 11:46:46 +09:00
Bill Currie
78789a6833 Add support for blender's environment maps. 
QF will now load a single image with (${skyname}_map.*) using blender's
layout. That is, 3x2 with the top row being back, right, front and the
bottom row being bottom, top, left.
 2012-02-16 20:47:38 +09:00
Bill Currie
bfdb2b20d5 Clearify skybox layout. 
Turns out quake skynames have left and right backwards.
 2012-02-16 20:42:49 +09:00
Bill Currie
ce6ab908a5 Don't include the specific plugin headers in plugin.h. 
This lets files that use plugins not depend on plugins they don't use.
 2012-02-13 22:02:07 +09:00
Bill Currie
699ab70482 Fix audio again. 
Bah, even though audio no longer needs models, it was still linking with
it :P
 2012-02-13 16:44:30 +09:00
Bill Currie
2ab1367245 Update to reflect the new dependency status. 2012-02-13 16:25:22 +09:00
Bill Currie
3cb4cb59b5 Link QFgamecode directly into QFruamoko. 
First step in the library "merge down".

QFgamecode is now a convenience library. The only things that mention it
directly now are ruamoko and qfcc.
 2012-02-13 15:05:31 +09:00
Bill Currie
9a91aff93c Move the ambient level check out of the sound renderer. 
Instead, the client gets the current leaf and passes ambient_sound_level
from the leaf to S_Update.
 2012-02-13 13:44:29 +09:00
Bill Currie
d8a37bc791 Correct the usage of gzFile. 
Thanks to spirit for pointing that QF wasn't compiling with zlib 1.2.6
(archlinux, not yet in debian).

I was using gzFile as "gzFile *gzfile", but gzFile is already a pointer. In
older versions of zlib (including the 1.2.3 that's in debian), gzFile is
declared as a void *, and it seems that gcc is happy with assigning void **
to void *. However, in recent zlib, gzFile is now struct gzFile_s *, which
gcc is most definitely unhappy about assigning to struct gzFile **.

I just hope that either I had misread the type back when I wrote quakeio,
or that nobody is using such an ancient zlib.
 2012-02-13 09:00:31 +09:00
Bill Currie
02d24189ef Use QF_NEED for plugins. 
At the moment, the selection of the default sound driver etc is broken.
 2012-02-12 11:37:25 +09:00
Bill Currie
4707706f5d Use QF_NEED for the renderer and model libraries. 
This breaks RPM building, but I can fix that later.
 2012-02-10 13:29:45 +09:00
Bill Currie
7a8f91edda Move bi_gib.c from ruamoko to gib. 
This makes gib depend on gamecode, but removes the dependency on gib from
ruamoko. Unfortunately, carne now needs to be linked against gamecode even
though it never uses it.
 2012-02-09 10:00:54 +09:00
Bill Currie
da4fb6178c Correct the client console plugin's dependencies. 2012-02-09 09:51:50 +09:00
Bill Currie
e34f0178b6 Build GLSL clients for SDL. 
Just about to do a release, and I realized windows users wouldn't have any
way of checking out the new renderer. I'll add wglsl when I get a chance to
do some testing.
 2012-02-08 22:05:58 +09:00
Bill Currie
fe3f0fa7ce Remove snax' object module. 
We don't use it for anything. If we ever want it again, we can just pull
it from history.
 2012-02-08 15:21:57 +09:00
Bill Currie
b59ffd4cf1 Fix win32 (mingw) builds. 2012-02-07 20:18:23 +09:00
Bill Currie
0a277376ed Fix static builds. 2012-02-07 20:17:32 +09:00
Bill Currie
8ecf74753c Refer to local libs without a path. 
I'm sure I've been here before... Anyway, using $(top_builddir)/... to
refer to a local lib confuses make and breaks parallel builds.
 2012-02-07 18:45:55 +09:00
Bill Currie
9fbff2f4d5 Do an audit of the Makefile.am files. 
o All instances of LIBADD/LDADD have a corresponding DEPENDENCIES
    specificatiion.
  o libraries now use a lib_ldflags macro to keep things consistent
  o duplication of source/lib names has been minimized (particularly in
    the libraries; more work needs to be done for the executables)
  o automake spec blocks have been organized (again, more work needs to be
    done for the executables)
 2012-02-07 16:04:19 +09:00
Bill Currie
b5019c8e33 Nuke the engine dicrectory from gamecode. 
Not the contents, of course :) Anyway, finally, that totally useless
directory is gone.
 2012-02-06 23:44:52 +09:00
Bill Currie
a694eed968 Add Draw_Picf to allow smooth placement on low-res consoles. 2012-02-06 19:32:30 +09:00
Bill Currie
14c0e22494 Tweak Draw_MakePic to be a little more usable. 2012-02-06 15:50:32 +09:00
Bill Currie
c98ffa4eda Create a message buffer API for Ruamoko 
The api hides all the gory details of message buffer setup and usage
(particularly the differences between writing and reading). Most
importantly, the api provides a safe way to read and write binary data
(always little endian).
 2012-02-06 15:50:32 +09:00
Bill Currie
042f310ed7 Add MSG_WriteBytes to match MSG_ReadBytes. 2012-02-06 15:04:01 +09:00
Bill Currie
42b87ee80c Fix the memory leak in rua Draw_CachePic. 2012-02-06 12:49:57 +09:00
Bill Currie
be9f05ea14 Catch progs zone errors and give a stack dump. 2012-02-06 12:48:22 +09:00
Bill Currie
cef004fc15 Fix a type mismatch on android. 2012-02-05 14:28:23 +09:00
Bill Currie
4bd6bca6f2 Fix a prototype/definition mismatch. 2012-02-05 14:27:48 +09:00
Bill Currie
8c3db9a10d Fix regex.c for android. 
Android's headers declare bcmp etc in strings.h, but don't the functions
don't exist in the libs.
 2012-02-05 14:26:23 +09:00
Bill Currie
201532ea7e Fix missing library references when linking. 2012-02-05 14:25:22 +09:00
Bill Currie
3bd75cefd8 Autoconfiscate log2f. 
Android doesn't supply log2f for us (though it does have all the other
float calls ruamoko wants).
 2012-02-05 14:23:33 +09:00
Bill Currie
6f10f0cea6 Fix the x86 sw renderer (intel asm). 
I'd forgotten about assembly code versions when I was doing my testing
when I redid skins. Thanks to Sander for pointing it out.
 2012-02-02 17:32:27 +09:00
Sander van Dijk
49453b690f glsl_main.c: initialize t[] to silence compiler warning. 2012-02-02 16:55:33 +09:00
Sander van Dijk
82adc67a67 glsl_bsp.c: __builtin_expect() to avoid compiler warnings. 2012-02-02 16:55:25 +09:00
Bill Currie
f800e79a38 Make the init process more dependency based. 
Most subsystems that depend on other subsystems now call the init functions
themselves. This makes for much cleaner client initialization (more work
needs to be done for the server).
 2012-02-01 21:52:47 +09:00
Bill Currie
b9bb7d95bb Remove calls to Sbar_Changed from the libraries. 
If this breaks things, we'll have to sort something out, but again, no libs
reaching into the exe.
 2012-02-01 20:06:14 +09:00
Bill Currie
5efc78b920 Move the call to R_Particles_Init_Cvars into R_Init_Cvars. 2012-02-01 20:05:11 +09:00
Bill Currie
4b390909f2 Move r_gravity to it's rightful home. 
r_part.c makes much more sense.
 2012-02-01 20:03:16 +09:00
Bill Currie
fa0ff96533 Clean up the mess with host_basepal and vid_colormap. 
Libs should not be reaching into the exe :P
 2012-02-01 19:52:13 +09:00
Bill Currie
d76e4608ab Rewrite the ruamoko draw api internals. 
Update for using resources, and add wrappers for Draw_MakePic and
Draw_DestroyPic/Draw_UncachePic.
 2012-02-01 18:19:54 +09:00
Bill Currie
bc2aca53c3 Add functions to create/destroy qpics. 
The creation uses raw 8-bit data (and the system palette). Destroying a
qpic loaded via other means will probably produce nasal demons.
 2012-02-01 17:46:15 +09:00
Bill Currie
2b6adaa2d4 Do some more const correctness. 2012-02-01 17:44:55 +09:00
Bill Currie
7e406c20e5 Allow uncaching of qpics. 
qpics loaded via Draw_CachePic can now be uncached via Draw_UncachePic.
 2012-02-01 16:55:35 +09:00
Bill Currie
a849cf7698 Fix a stale include problem. 
Thanks to iku for pointing it out.
 2012-02-01 14:13:00 +09:00
Bill Currie
a131a7ab9d Fix the gl test... again :/ 
Actually, it probably doesn't make any difference, but making it look
right is still important.
 2012-02-01 13:01:24 +09:00
Bill Currie
706f09b247 Put the transparent surfaces on the water chain. 
I'd actually done this the first time, but then got confused and forgot the
waterchain works with multiple textures. This is actually the right place
as all transparent surfaces need to be sorted irrespective to their
textures. Really, waterchain needs to be renamed.
 2012-01-31 18:08:06 +09:00
Bill Currie
b286a35281 Sort transparent surfaces back to front. 
This allows overlapping transparent surfaces to look like they are
overlapping each other rather than only the nearest one showing.
 2012-01-31 16:17:09 +09:00
Bill Currie
1052bd2624 Fix the segfault on leaving e1m2. 
Problem and solution found by Deek, reason by me.
 2012-01-31 09:51:44 +09:00
Bill Currie
c3d2365bd8 Fix a missed default_color init. 
Wish I'd caught this earlier :/
 2012-01-30 21:02:13 +09:00
Bill Currie
c01255a387 Fix a case&paste error. 
Doesn't fix the color problem for water surfaces on my eeepc, though :(
 2012-01-30 20:31:58 +09:00
Bill Currie
8f0ce733ff Sanitize color handling a little. 2012-01-30 20:31:37 +09:00
Bill Currie
4b948de225 Ensure the lightmap gets rebuilt when the dlights disappear. 
I didn't realize what that line was for when I copied the code from GL :/
 2012-01-30 18:41:27 +09:00
Bill Currie
e4f63fba6c Fix some integer shift overflows. 
Thanks to Ozkan Sezer for pointing them out.
 2012-01-30 09:13:06 +09:00
Bill Currie
f8dfee6de7 Merge branch 'master' into glsl 2012-01-29 22:36:35 +09:00
Bill Currie
497718cc40 Plug the memory/texture/vbo leaks. 
QF still leaks about 3MB/run on demo1, but even 100 runs didn't show any
render issues.
 2012-01-29 22:32:35 +09:00
Bill Currie
b03e937b67 Implement brush entity alpha. 
http://www.celephais.net/board/view_thread.php?id=60157& has a good map for
testing (you see an example straight away if you look up). (+set max_edicts
2048)
 2012-01-29 16:56:50 +09:00
Bill Currie
8f869c001b Fix the missing world on map reload. 
If the map got reloaded but the current leaf didn't change the world (and
most entities) didn't get drawn. Forcing a vis update by first setting
r_viewleaf to null and marking surfaces does the trick :)
 2012-01-29 16:09:35 +09:00
Bill Currie
462a9047c6 Fix the missing fog on particles and sprites. 
Bah, definitely need a metter method of parameter interrogation.
 2012-01-29 10:35:23 +09:00
Bill Currie
731236ee07 Implement global fog. 
Sprites and particles don't seem to be getting fogged correctly, but bsp
and alias models are working.
 2012-01-29 10:27:28 +09:00
Bill Currie
4734c5b64a Implement water alpha. 2012-01-28 21:20:34 +09:00
Bill Currie
7e078c7f9c Revamp cshifts and implement in glsl. 
The renderer should now be free of any direct access to client code. Even
3d rendering is now done via a function pointer.

The cshift code is done as a 2d screen function.
 2012-01-28 20:45:14 +09:00
Bill Currie
315db554b5 Add some instrumentation to check render speeds. 2012-01-28 14:10:47 +09:00
Bill Currie
2595251162 Do not update every visible lightmap every frame. 
This takes nq from ~25fps to 65-72 fps on Unforgiven's start map.
 2012-01-27 21:48:25 +09:00
Bill Currie
d18aa2fe3e Do not try to unregister ports with a lost jackd. 
libjack seems to get stuck when unregistering ports with a broken
connection.
 2012-01-27 19:58:03 +09:00
Bill Currie
8ac9ff0134 Link libQFmodels* agains libQFimage. 
This is the correct fix for server linking wrt LoadPCX. Sort of. Really, it
would be better to disconnect the dependencies.
 2012-01-27 19:55:30 +09:00
Bill Currie
03c7441265 Fix server linking wrt skin stuff. 2012-01-27 17:37:52 +09:00
Bill Currie
ca2c861671 Fix team colors in GL NQ. 2012-01-26 13:53:52 +09:00
Bill Currie
5dcaeae97b Fix custom skins in GL for QW. 2012-01-26 12:50:37 +09:00
Bill Currie
df87cffe15 Start working on the new GL skin code. 2012-01-24 23:06:07 +09:00
Bill Currie
695b38e5e5 Fix a segfault when merging rects. 2012-01-24 19:56:59 +09:00
Bill Currie
d8d21b00f4 Fix some issues found found by valgrind. 
Buffer underflow and though strcpy has always been safe there, change to
memmove. Had the added benefit of helping me create more test cases for
better coverage.
 2012-01-24 19:54:21 +09:00
Bill Currie
6104db50e1 Fix a gl matrix stack overflow. 
I'd missed a couple of places for glPopMatrix (worse, one was push!).
 2012-01-24 12:10:37 +09:00
Bill Currie
1ef24e0404 Fix a gl matrix stack overflow. 
I'd missed a couple of places for glPopMatrix (worse, one was push!).
 2012-01-24 12:08:12 +09:00
Bill Currie
6df8867d69 Implement custom skins for glsl. 2012-01-24 10:27:05 +09:00
Bill Currie
d6683711f4 Clean up some redundant defines. 2012-01-24 09:37:46 +09:00
Bill Currie
19dc579a5a Fix custom player skins for the sw renderers. 2012-01-23 23:38:32 +09:00
Bill Currie
3dbb5724db Rename Skin_SetColormap_ to Skin_SetupSkin. 2012-01-23 21:40:12 +09:00
Bill Currie
08990ebb5a Make top/bottom color work for GLSL. 
Works quite nicely (love those colormaps).
 2012-01-23 19:24:12 +09:00
Bill Currie
9a4b065eaf Fix top/bottom colors for the SW renderers. 2012-01-23 17:33:19 +09:00
Bill Currie
e3f76de898 Avoid a division by zero. 
Doing a cache profile on an unused cache wasn't nice.
 2012-01-23 16:46:52 +09:00
Bill Currie
7bfddd7ffe Gut most of the old skin code. 
Custom skins are smashed on most targets. Player colors don't work, etc.
However, this will let me do a much cleaner implementation.
 2012-01-23 16:16:30 +09:00
Bill Currie
61c127abc0 Make a start on skin support. 
I had this lying around for a while since it was more important to get
other things working first.
 2012-01-22 15:49:01 +09:00
Bill Currie
76cb60461d Tweak the size of point particles. 
This looks fairly reasonable, but should probably be tweaked further to
base the point size on resolution.
 2012-01-21 22:05:24 +09:00
Bill Currie
5080a6f37e Enable the point size shader variable. 
This is a rather "evil" hack because GLES doesn't seem to need
GL_VERTEX_PROGRAM_POINT_SIZE, but GL does, and all my work is currently
done in GL rather than GLES. Point particles now work, but the sizes are
all wrong.
 2012-01-21 21:54:36 +09:00
Bill Currie
68d956583d Draw ALL of the particles, not just 2/3 of them. 
Using quads requires 4 elements, but triangles require 6. I'd gotten the
element array setup right, but I'd forgotten to tweak vacount when drawing
the particles.
 2012-01-21 20:16:18 +09:00
Bill Currie
8345f07db2 Implement QF style particles. 
Actually looks pretty good against the sw style world.
 2012-01-21 19:51:18 +09:00
Bill Currie
4955caafe5 Make the dynamic textures more readily available. 
I want to get QF style particles going in glsl (since id style is currently
stuck at one pixel), but I don't want multiple copies of the texture code.
 2012-01-21 19:13:01 +09:00
Bill Currie
358bbc4439 Disable the sky spin effect. 
It's cool, but not appropriate as a default. All that's needed is a way to
set (and optionally update) sky_velocity (map vars? qc?).
 2012-01-21 17:18:29 +09:00
Bill Currie
62c5070d8b Use the correct type for particle colors. 
Sending byte data as floats doesn't work too well :P Fixes the colors of
the particles, but not the size :(.
 2012-01-21 16:17:54 +09:00
Bill Currie
2cb2f230fd Print out the point size range. 
I'm not sure if there's a bug in mesa, or if I'm doing something wrong, but
GL_POINTS doesn't seem to be working properly. I get the points, but
writing to gl_PointSize doesn't make a difference despite the size range
being 1-255.
 2012-01-21 15:48:21 +09:00
Sander van Dijk
197481bdbb in_sdl.c: default to "have_focus" to "1". 2012-01-21 09:27:35 +09:00
Sander van Dijk
25ffe6bc3e cd_sdl.c: fix typo. 2012-01-21 09:27:30 +09:00
Sander van Dijk
8e6c3f7bf8 Make gl_rsurf.c compile without warnings with "gcc (GCC) 4.4.5 20101112 (Red Hat 4.4.5-2)". 2012-01-20 20:51:29 +09:00
Bill Currie
5e1a80e016 Implement particles as points. 
Unfortunately, the maximum point size on Intel hardwar seems to be 1, so I
can't tell if the colors are right.

This is largely just a hacked version of GL's particle code.
 2012-01-19 10:39:03 +09:00
Bill Currie
63893b6a2f Zap some magic numbers. 2012-01-19 10:36:10 +09:00
Sander van Dijk
d8432e78bb Fix a wrongly negated condition in snd_win.c:SNDDMA_UnblockSound(). 2012-01-18 21:39:17 +09:00
Bill Currie
470500f79d Fix an oopsie between pahdr and paliashdr. 
I understand the reasons, but ooh, the sw renderer is ugly in places.
 2012-01-17 21:00:19 +09:00
Bill Currie
42bb10a3d7 Clear out the lightmap scrap at each level change. 
This allows the demo loop to run more than 4 times (12 demos). Once the
rest of the resource management is done, demos should run indefinitely.
 2012-01-17 19:31:50 +09:00
Bill Currie
fc43e5a307 Allow clearing of a scrap. 
This "frees" all rectangles and subpics allocated from a scrap. subpics
are owned by the scrap from which they are allocated.
 2012-01-17 19:31:50 +09:00
Bill Currie
3669e3aa2e Make alias model caching optional. 
For now, only the glsl loader disables caching, but it stores the frame
vertices in GL memory, so its hunk usage is relatively lower (and will be
lower still when I get skins sorted out).
 2012-01-17 19:31:50 +09:00
Bill Currie
fb428f8067 Rename mod_flood.c to floodfill.c 2012-01-17 19:31:50 +09:00
Bill Currie
05bf637466 SDL sound patches from SVD. 
Thanks to "Sander van Dijk" <a.h.vandijk@gmail.com>, we now have much
better SDL sound support.

Here's the promised cleaned up version of the "double buffer" approach
patch for "snd_sdl.c". I've taken some more time to re-read and test
it this time, and it seems to behave well. All memory that is used by
both the main thread and the SDL audio thread is prefixed with "shm_",
and locking is used to ensure that only one thread accesses it at the
same time.
 2012-01-17 19:14:42 +09:00
Bill Currie
0abb8a7554 Merge the particle physics. 2012-01-15 20:14:36 +09:00
Bill Currie
ece78f7605 Clean out some useless functions. 
D_Start/EndParticles in the sw renderers will likely never have any
content, so no point in calling or even having them.
 2012-01-15 09:34:10 +09:00
Bill Currie
e7b01bb6b6 Put the transparent color back to 0,0,0,0 rgba. 
Blended sprites were a tad ugly without that.
 2012-01-14 22:20:23 +09:00
Bill Currie
c884ef5f80 Convert the colormap to a 2D palette. 
This skips one level of indirection in the alias model and brush shaders.
Hopefully, this will improve performance on my eeepc.
 2012-01-14 21:42:42 +09:00
Bill Currie
928dd92276 Use 0.0 instead of 0.5 for t for palette lookups. 
I realized it's pretty silly using colormap + palette when I can just
combine the two into one and have a 2D palette. This is in preparation for
that.
 2012-01-14 20:51:43 +09:00
Bill Currie
2425498479 Enable the view model. 2012-01-14 20:07:43 +09:00
Bill Currie
de022ae72d Rewrite GL_LoadQuakeMipTex to generate mips itself. 
Relying on GL to generate mips for 8 bit textures doesn't produce nice
results. These aren't the greatest, either, but they're better.
 2012-01-14 19:02:06 +09:00
Bill Currie
7739ba3ea9 Move the 2D set out of the 3D code. 
It really belongs exclusively in the screen setup code.
 2012-01-13 19:51:45 +09:00
Bill Currie
f5f8b65c81 Fix the wonky viewsize border. 
2D mode wasn't getting set after rendering the world. oops.
 2012-01-13 19:47:16 +09:00
Bill Currie
eb2e688c9e Clean up some whitespace. 2012-01-13 19:46:52 +09:00
Bill Currie
617107f9c1 Perform some black magic. 
}:>
 2012-01-12 21:23:39 +09:00
Bill Currie
cbd13ac54e Implement QuatExp and fix up QuatBlend's param names. 2012-01-12 21:22:06 +09:00
Bill Currie
ba1b819173 Merge skyid and skybox begin/end. 2012-01-12 17:34:29 +09:00
Bill Currie
6e2d625d36 Load the skybox faces into the correct cubemap slots. 
Quake and GL are rotated relative to each other, so care must be taken
when loading and rendering.
 2012-01-12 15:13:19 +09:00
Bill Currie
f1eea0176c Fix the too near far-clip plane. 
I don't know if I miss-copied that, or if there's a bug in FTE's code.
 2012-01-12 13:41:06 +09:00
Bill Currie
a66fcb8448 Implement skyboxes. 
The texture assignments are incorrect, but it's otherwise working.
 2012-01-12 11:05:34 +09:00
Bill Currie
8bcef272e6 Render the id skys :) 
Wow... smooth.
 2012-01-11 21:26:12 +09:00
Bill Currie
7ba7130f42 Load the sky texture as two separate textures. 
The sky texture is normally 256x128, with each 128 wide side being the two
layers of the sky.
 2012-01-11 21:09:57 +09:00
Bill Currie
b43d03a98b Let the render specific texture loader decide on sky texture loading. 
This is necessary to allow the glsl texture loader to process the sky
textures.
 2012-01-11 21:08:04 +09:00
Bill Currie
f6f2e4f406 Create and load the id sky shader. 2012-01-11 16:02:20 +09:00
Bill Currie
89ae6eca8b Even better? 
It's difficult getting the same result because GL st are 0-1 but sw quake's
st are 0-inf % 64.
 2012-01-11 07:51:15 +09:00
Bill Currie
5dbf913d41 Get the turbulence more correct. 
This looks right, and should be easier to tweak.
 2012-01-11 06:38:27 +09:00
Bill Currie
d2dae4cc58 Produce a saner turbulence. 
I'm not quite sure it's right. Need to watch sw's turb a bit more.
 2012-01-10 21:11:21 +09:00
Bill Currie
3508972d66 Draw water surfaces... with some really funky turbulence. 
It seems I misunderstood the sw turbulence code.
 2012-01-10 20:50:47 +09:00
Bill Currie
e38d72f50b Get brush entity rendering working. 
Unfortunately, the intel driver on my eeepc doesn't like the mipmas for
plat_top2 or +2floorsw. If I either don't load their mipmaps, or skip
drawing them, things seem to work nicely.
 2012-01-10 13:06:02 +09:00
Bill Currie
3326aceed8 Rewrite the texture chain index list building. 
It turns out my complicated plan was just that: complicated. Although there
are currently some bugs, the method I used to build the VBO in the first
place will work equally well for building the index lists.
 2012-01-09 21:16:08 +09:00
Bill Currie
754dda92ff Get the lightmap texture properly. 2012-01-09 21:13:40 +09:00
Bill Currie
ef311b60d6 Remove a now dead function. 2012-01-09 18:55:30 +09:00
Bill Currie
2b45cd693f Fix the black overbright dlights. 
t was unsigned and underflowing. This fixes the problem but keeps the
bitshift unsigned clean.
 2012-01-09 18:05:41 +09:00
Bill Currie
310ba49f17 Make the dynamic lightmaps... dynamic. 2012-01-09 16:46:20 +09:00
Bill Currie
0005c97865 Temporary weaks so things look halfway decent. 
GL mipmaps and paletted textures don't mix, and lightmaps work quite well
with linear sampling.
 2012-01-09 16:26:28 +09:00
Bill Currie
12fd6bd390 Fix the segfault on map change. 
I had forgotten to call R_ClearTextures when I'd rearranged the code.
 2012-01-09 10:16:54 +09:00
Bill Currie
cd91fe7c8d Set the pixel unpack alignment to 1. 
4 hours chasing that one down. ouch.
 2012-01-09 02:18:39 +09:00
Bill Currie
8779755e9c Dump allocated rects for glsl_scraps BLAH. 2012-01-09 01:31:29 +09:00
Bill Currie
f658e6c32e Initialize d_lightstylevalue. 
"Let there be light!", but chaos still reigns (broken lightmap updates).
 2012-01-09 01:30:26 +09:00
Bill Currie
1229d24ef6 Get world rendering mostly working. 
Just some problems with lightmaps. There also seem to be some issues with
seams (t-junctions?) and far clip, but they're quite separate.

There's also a problem with a segfault when loading a second map.
 2012-01-08 22:09:51 +09:00
Bill Currie
7428a91526 Try, but fail, to render the world. 2012-01-08 20:39:36 +09:00
Bill Currie
ea377b80c5 Remove some redundate statements. 2012-01-08 20:38:56 +09:00
Bill Currie
f8d7bcf271 Rename R_RecursiveWorldNode to R_VisitWorldNodes in gl. 2012-01-08 18:16:33 +09:00
Bill Currie
6abaa5ea74 Build the display list for all loaded brush models. 
The entire vertex set from every model is put into one list (not yet
uploaded). chains of elements arrays are build for non-instanced models
(instanced models will have their chains built each frame).
 2012-01-08 17:45:44 +09:00
Bill Currie
fa82c37bd0 Pre-invert subpic->size. 
I forgot to do this earlier :/
 2012-01-08 17:44:28 +09:00
Bill Currie
601cc6e3d1 Make a start on bsp rendering. 
Still nothing being rendered: still in the process of building the display
lists, but I'm making good progress. Get this into git before something
goes wrong :)
 2012-01-08 10:29:38 +09:00
Bill Currie
ec7d01f9b2 Merge out R_TextureAnimation. 2012-01-08 10:21:08 +09:00
Bill Currie
655252a506 Fix some warnings. 2012-01-07 23:11:56 +09:00
Bill Currie
aa27a3f49c Load bsp model textures as repeating mipmaps. 2012-01-07 18:05:54 +09:00
Bill Currie
204c1aba03 Don't use the miptex_t after converting to texture_t. 2012-01-07 17:08:07 +09:00
Bill Currie
29a0dc0b68 Actually build the lightmaps, and fix a silly bug in the scrap allocator. 
Also, add a command for dumping scrap statistics.
 2012-01-07 15:35:08 +09:00
Bill Currie
8a5658ed61 Implement the bulk of the lightmap code. 
Now just to get surface rendering going and hook in the lights.
 2012-01-07 14:53:23 +09:00
Bill Currie
a988c192ab Fix OSS sound. YAY!!! 
Much thanks to Spirit from quaddicted for his patient help in testing, and
Spike for his heckling ;)
 2012-01-06 21:21:45 +09:00
Bill Currie
0993803006 Add texture sub-image management. 
The planned uses are lightmaps and 2d icons.
 2012-01-06 16:24:13 +09:00
Bill Currie
c25327f4ed Add union and merge functions and tests. 2012-01-06 12:57:25 +09:00
Bill Currie
73f2c12815 Delete the intersection rect when finished. 2012-01-06 11:04:50 +09:00
Bill Currie
981760e19a Add tests for vrect. 2012-01-06 11:04:34 +09:00
Bill Currie
2ae044effd Split out vrect_t to its own file and add support functions. 
The rest is cleanup after removing a wart from one of the field names.
 2012-01-06 09:52:14 +09:00
Bill Currie
42266cddd5 Get models being lit by the world's lightmaps. 
Even though the world isn't rendered yet.
 2012-01-05 22:37:02 +09:00
Bill Currie
423e08ce21 Add demo to "movie" conversion. 
It currently writes a series of png files (QF/qfmvNNNNNN.png), at a fixed
rate of 30fps, with no sound recording.
 2012-01-05 19:19:37 +09:00
Bill Currie
b13a2b6dbd Move screenshots to $fs_userpath/QF. 
I got tired of screenshots getting scatter across the tree. ShotsPath in
the dirconf can override this.
 2012-01-05 17:07:27 +09:00
Bill Currie
297a4e2756 Put the D_FlushCaches mess back. 
It turns out that when it is called is highly timing sensitive :(
However, the rest of R_ClearState remains.
 2012-01-05 15:50:20 +09:00
Bill Currie
03bcfb9483 Set the default hudtype. 
Yay, Deek for finding another bug in qf :). He had an old dirconf that
didn't specify HudType and thus caused the status bar code to blow up. Set
the default to "id" if none is found.
 2012-01-05 14:02:53 +09:00
Bill Currie
764cd91879 Set the default hudtype. 
Yay, Deek for finding another bug in qf :). He had an old dirconf that
didn't specify HudType and thus caused the status bar code to blow up. Set
the default to "id" if none is found.
 2012-01-05 14:00:57 +09:00
Bill Currie
6f18035c12 Fix up alias-16 support. 
After getting in contact with serplord, I now know that the sw alias
loading was correct. Turns out the gl loaders was mostly correct, just a
mistaken subtract rather than add. And with that, I can implement alias-16
support in glsl. better yet, since all the work is done in the loader, the
renderer doesn't know anything about it :) However, I need to create some
16-bit models for testing.
 2012-01-05 12:52:12 +09:00
Bill Currie
c6bcd7aedb Normalize the vertex normals. 
I was wondering why the lighting looked a little extreme in overkill.
 2012-01-05 12:45:43 +09:00
Bill Currie
bfc743fdcd Add my point shaders before I lose them. 2012-01-04 18:47:03 +09:00
Bill Currie
8fbc6221f7 Get sprite interpolation working. 
It's not perfect (it can't be), but it looks a whole lot nicer than no
interpolation.
 2012-01-04 18:31:35 +09:00
Bill Currie
6050901e0e Break out the entity blend calculations. 
This allows alias and sprite model lerping to share the code.
 2012-01-04 18:30:47 +09:00
Bill Currie
836209e5c6 Enable lerping of alias models. 
Done in hardware }:>
 2012-01-04 16:36:43 +09:00
Bill Currie
f0e88bbe85 Rip out the duplicate lerp code and merge it. 
While the vertex lerping needs to be duplicated in the current GL code,
there's no need for the setup code to be duplicated. Also, I want it for
GLSL.
 2012-01-04 16:26:52 +09:00
Bill Currie
99381b8b8c Rework the alias vertex shader and rendering code for lerping. 
Lerping isn't actually done yet (need to get both poses and blend), but
this still renders correctly with blend forced to 0.0.
 2012-01-04 14:35:34 +09:00
Bill Currie
add5440ad1 Upload the normals with the vertex data. 
Not all hardware can access a texture sampler from the vertex shader, and I
don't want multiple paths this early in the game. Now, vertex normals are
uploaded as shorts. Should be 14 bytes per vertex (was 10, could have been
8 if I had put the normal index with the vertex rather than st).
 2012-01-04 09:42:00 +09:00
Bill Currie
fea7acd871 Enable vis calculation. 
One nice thing about this project: I now KNOW that efrags works the way I
wanted it to: all those torches are now toggleable via r_novis :)
 2012-01-03 23:20:01 +09:00
Bill Currie
d0a0440056 Make R_SplitEntityOnNode easier to read. 2012-01-03 23:19:21 +09:00
Bill Currie
454047ab92 Make r_novis 0 take effect immediately. 2012-01-03 23:17:49 +09:00
Bill Currie
0797183201 Merge R_MarkLeaves from gl, sw, and sw32. 
Other than novis, they're functionally identical. Now sw and sw32 have
novis as well.
 2012-01-03 21:09:13 +09:00
Bill Currie
091b714e4c Implement dynamic lighting. 
This uses the same calculations as the software renderer. However, as the
lightmap calculations are not done yet, if there is no dlight in the
vicinity, there will be no light. demo1 is pretty cool to watch :)
 2012-01-03 20:36:07 +09:00
Bill Currie
209c4cda8b Scale the light level index correctly before colormap lookup. 
With this, lighting seems to be working. I'm not certain the normals are
100% correct, but I can see something happening on rotating models.
 2012-01-03 19:57:47 +09:00
Bill Currie
e8f863c76f Remove the hedgehogs from the garden. 
While the first frame was fine, any subsequent ones were not. I had
forgotten that hdr->poseverts held the edited vertex count rather than
hdr->mdl.numverts.
 2012-01-03 18:11:39 +09:00
Bill Currie
d7bc437e2c Fix the borked texture coordinates. 
Silly me, doing byte based pointer math on a non-byte pointer :P
 2012-01-03 18:10:35 +09:00
Bill Currie
185fded944 Re-enable the matrix optimizations. 
Turns out my concatenations were correct.
 2012-01-03 18:09:33 +09:00
Bill Currie
21c7b84379 Enable face culling and depth testing. 
I spent way too long trying to figure out why triangle order wasn't making
any difference... :P
 2012-01-03 18:08:01 +09:00
Bill Currie
1437cbec91 Make the face culling a little more sensible. 
GL Quake was weird, culling front faces. Partly understandable, since
Quake's front order is clockwise and GL's default order is
counter-clockwise. However, since the order can be specified, that should
be done instead. Thus, specify the winding order as clockwise (for quake's
data), set culling for back-face removal, and then mess with the winding
direction in the mirror and fish-eye code.
 2012-01-03 18:06:26 +09:00
Bill Currie
62e564c5cd Send ALL of the model's verts to GL. 
Triangles have 3 vertices, not one :P
 2012-01-03 11:47:40 +09:00
Bill Currie
ba04cf73d0 Add my test tetrahedrons. 2012-01-03 09:34:17 +09:00
Bill Currie
baab15279f Correct the alias vertex data types. 
Vertex locations need to be unsigned byte rather than byte (GL is funy
with that). s and t need to be at least short, and since the normal index
is embedded in the st vector, it needs to be the same type. With this, my
test tetrahedrons seem to be working.
 2012-01-03 09:34:17 +09:00
Bill Currie
c378acab6b Actually load up the mvp and normal matrices. 
Rather critical. I thought I'd done that :/
 2012-01-03 09:34:17 +09:00
Jeff Teunissen
86edf54c40 Build and ignore cleanups 
GLSL renderer build was checking for BUILD_GL instead of BUILD_GLSL in a
few places. Also, ignore the GLSL .fc and .vc files and the binaries.
 2012-01-02 14:16:19 -05:00
Bill Currie
2a3151cecd Hook in alias model drawing. 
Nothing is visible yet.
 2012-01-02 20:28:40 +09:00
Bill Currie
72e3a8d507 Merge sw and sw32 alias frame selection. 
I'm leaving GL for later because lerping complicates things. I'll sort it
out when I implement lerping in GLSL.
 2012-01-02 17:47:22 +09:00
Bill Currie
1c480bf75e Merge the alias skin selection code. 
We really don't need 4 copies of identical code when 1 will do :P
 2012-01-02 15:57:43 +09:00
Bill Currie
540bccbc27 Load all the alias vertex data as bytes. 
I had forgotten I wanted to do it this way.
 2012-01-02 13:41:12 +09:00
Bill Currie
a57835866a Build the vertex normals texture. 2012-01-02 13:40:48 +09:00
Bill Currie
6b4a10819a Add an RGB texture loader. 2012-01-02 13:15:19 +09:00
Bill Currie
7e5b3304fc Create the colormap texture. 2012-01-02 11:19:23 +09:00
Bill Currie
fd67f3500b Load the alias model shaders. 2012-01-02 11:18:34 +09:00
Bill Currie
df3d9fe4df Correct the fullbright start color extraction. 
I don't know what despair and I were thinking, but we obviously didn't
understand the colormap code at the time.
 2012-01-02 10:53:57 +09:00
Bill Currie
7be08534be Clearify the program dump info a little. 
Calling programs shaders was a little confusing when I use shader to refer
to the sub-programs (vertex and fragment shaders). Also, print the program
number as well.
 2012-01-02 10:22:03 +09:00
Bill Currie
2ad5aa7aed Unbind the array and element array buffers when done. 
Not doing so wreaked havoc on my 2d rendering (what's he doing here, and
why's he messing with my redering? ;)
 2012-01-02 10:08:56 +09:00
Bill Currie
d1419c30db Make a start on alias model rendering. 
The vertex and fragment shaders are written, and R_InitAlias is stubbed,
but that's it so far.
 2012-01-01 23:58:12 +09:00
Bill Currie
f3884c659c Finish alias skin loading and load vertex data into GL. 2012-01-01 23:55:27 +09:00
Bill Currie
f18cd65526 Implement the "cache" in Draw_CachePic. 2011-12-31 20:36:24 +09:00
Bill Currie
3eae8426e6 Implement in-game screenshots. 2011-12-31 17:24:20 +09:00
Bill Currie
d8dbfa9c24 Create WritePNGqfs so screenshots can be written as png. 2011-12-31 17:23:32 +09:00
Bill Currie
718595db45 Implement sprite rendering. 
Sprite interpolation seems to work, even :) (maybe)
 2011-12-31 14:39:33 +09:00
Bill Currie
091e16f9d2 Bring in GL's R_RecursiveWorldNode as R_VisiteWorldNodes. 
No surface queuing is done, but entities get queued.
 2011-12-31 14:33:20 +09:00
Bill Currie
ea2ae1436c Fix some bugs in the new matrix functions/macros. 2011-12-31 13:20:31 +09:00
Bill Currie
55e53b796d Make a start on getting sprites rendering. 
The plan is to do interpolated sprites based on a discussion I had with
LordHavoc about them: blending between the two sprite frames. He didn't
mention it, but it looks like blending between the sprite frames' verts is
necessary too.
 2011-12-30 21:11:59 +09:00
Bill Currie
16f84cd496 Hopefully get the 3d view and projection transforms setup. 2011-12-30 21:10:24 +09:00
Bill Currie
20d93466c7 Frag some magic numbers. 
More annoying than hipnotic's gremlins.
 2011-12-30 21:07:35 +09:00
Bill Currie
35bf957d08 Add a 4x4 matrix type and some functions for it. 2011-12-30 20:11:53 +09:00
Bill Currie
edb05fdfce Rename Vector3Scale and QuatCompScale. 
They are now VectorCompMult and QuatCompMult.
 2011-12-30 20:04:55 +09:00
Bill Currie
bcdcd7b36d Implement sprint glsl loading. 
That was... easy.
 2011-12-30 09:36:57 +09:00
Bill Currie
a87a60a6fd Flush the text buffer before drawing conback or menus. 
Ok, now really done until I notice something else (I forgot this one
momentarily).
 2011-12-29 18:23:09 +09:00
Bill Currie
047b7bcc32 Implement Draw_TileClear. 
With this, 2d seems to be finished. YAY.
 2011-12-29 18:15:15 +09:00
Bill Currie
a1035aafe9 Implement Draw_TextBox. 2011-12-29 17:51:31 +09:00
Bill Currie
0e521a7779 Correctly detect going past the end of the pcx data. 
palette is just that, the palette, and often won't point to the end of the
pcx data. Use the right end :).
 2011-12-29 11:27:54 +09:00
Bill Currie
2b44a25c6b Flush console text after each screen function. 
This on its own doesn't fix menus being overwritten with console text, but
it's an important step.
 2011-12-29 11:26:14 +09:00
Bill Currie
9fec4d5be0 Implement Draw_Fill. 
Almost there with 2d.
 2011-12-29 11:25:27 +09:00
Bill Currie
9d0ed6b885 Fix the missing text. 
Silly case and paste error cleared out my text vertex array prematurely.
 2011-12-29 08:47:32 +09:00
Bill Currie
bece72e746 Use a quick hack to get colored crosshairs working. 2011-12-28 21:45:20 +09:00
Bill Currie
e69a583f1b Work around a bug in mesa. 
Since I'm not specifying the api when creating my context, mesa is giving
me GL2. This is fair enough, but in GL2, vertex attribute 0 is the vertex
position. This too, is fair enough. The problem is, mesa is assigning 0 to
my vcolor attribute and thus I can't set it. The work around is simply to
swap the declaration order of vcolor and vertex (this really shouldn't work
eiter, I suspect).
 2011-12-28 20:43:56 +09:00
Bill Currie
6a44978a0f Fix reading of GL_CURRENT_VERTEX_ATTRIB. 
Turns out it returns a vec4. oops.
 2011-12-28 20:41:26 +09:00
Bill Currie
8ee13ef8c2 Do some clipping in the draw routines. 
After fixing Maraakate's crash, I thought it would be a good idea to put
the fixes into QF, too.
 2011-12-28 19:20:18 +09:00
Bill Currie
4e7af5c3e0 Add a function to dump the info for all attribute arrays. 2011-12-28 14:27:59 +09:00
Bill Currie
411ab8f359 Be noisy when resolving uniforms and attributes. 2011-12-28 12:58:26 +09:00
Bill Currie
be9530afb6 Dump a lot of info about shader programs. 
New developer bit: SYS_GLSL (2048).
 2011-12-28 12:40:28 +09:00
Bill Currie
b657905c83 Bring in Despair's gl error checking from the gl renderer. 2011-12-28 09:05:36 +09:00
Bill Currie
151cc05882 Add support for vertex colors. 
As I need to control the alpha, they're sent as rgba rather than quake
palette indices. Text works well. All other 2d stuff does not :(.
 2011-12-28 09:04:26 +09:00
Bill Currie
b943b6d6e8 Implement crosshairs, mostly. 
Colored crosshairs aren't supported yet (next).
 2011-12-27 17:59:58 +09:00
Bill Currie
db8573b774 Make the cross-hair data sharable between renderers. 2011-12-26 21:43:15 +09:00
Bill Currie
705d07fa39 Implement most of the 2d rendering functions. 
textbox, crosshair, tileclear, fill and fadescreen are the remaining
functions.

There's a problem with 2d icons being drawn over the text (instead of
under), but I'll leave that for later.
 2011-12-26 20:33:40 +09:00
Bill Currie
e2a8de33cc First real texture support function for glsl. 2011-12-26 18:34:51 +09:00
Bill Currie
42034acc03 Organize the text program data. 
Also, rename the charmap uniform in quake2d.frag as it's more generic than
that.
 2011-12-26 18:00:55 +09:00
Bill Currie
2ccfbb0c1c Move the shader program code into vid_common_glsl. 
Much more useful in the long run.
 2011-12-26 17:17:29 +09:00
Bill Currie
5bed38dcd9 Rename quaketxt.frag to quake2d.frag. 
It's actually fairly generic for 2d rendering (no lighting, palette lookup)
 2011-12-26 17:11:31 +09:00
Bill Currie
f78db6c570 Clean up the generated shader files. 2011-12-26 16:39:02 +09:00
Bill Currie
d743c6c55f Make a clean break heading for GLES compatibility. 
Add GLSL directory to QF and use it for all gsls based code (instead of
GL). defines.h, types.h and funcs.h are derived from gl2.h from khronos.

Text drawing now uses triangles instead of quads.
 2011-12-26 16:08:55 +09:00
Bill Currie
e6c6de3a2a Fix the palette uploading. 
Ooooops :P
 2011-12-26 10:41:16 +09:00
Bill Currie
7bd5ab882c Get text rendering working. 
It comes out as a funky green (that's not in the quake palette!!!), but
it's mostly readable.
 2011-12-26 10:16:16 +09:00
Bill Currie
9f5eacd1fb Try to get text rendering. 
Still a black screen :(
 2011-12-26 08:12:05 +09:00
Bill Currie
c161a91d4a Split out and partially implement the screen code. 2011-12-26 08:09:47 +09:00
Bill Currie
1268830082 Split out the particle code. 2011-12-26 08:02:18 +09:00
Bill Currie
7d653f3676 Start work on outputting text. 
The shaders now compile. No linking is done yet. Char quads are generated,
but not sent to the card.
 2011-12-25 19:42:39 +09:00
Bill Currie
91afdcf064 Don't call init_box when not doing a box trace. 
I took the opportunity to pass qf through callgrind. init_box was
surprisingly expensive, especially considering its results were never used.
 2011-12-25 17:11:48 +09:00
Bill Currie
55a0ed49cd Build qw-client-glslx too. 
I was asked about timedemo overkill (bigass1 currently gets 40kfps, haha),
so I had to add qw-client-glslx to the build.
 2011-12-25 16:41:14 +09:00
Bill Currie
9df7370bcd Create some shaders for quake text. 
Still nothing drawn, but this gets my shader scripts into C without me
having to look at ugly strings.
 2011-12-25 15:53:12 +09:00
Bill Currie
b7c90fa02d Load the quake palete as a texture. 
256x1 rgba.
 2011-12-25 13:53:52 +09:00
Bill Currie
99c490ce52 Get glsl running as a null renderer. 
This means that nq-glslx can get through demo1, demo2, demo3 and bigass1
without crashing. However, nothing is rendered, so unless you like black,
it's not very interesting.
 2011-12-25 13:02:26 +09:00
Bill Currie
2894689f71 Clean up mod_lightmap_bytes. 
Just how many definitions do we need?
 2011-12-25 13:02:26 +09:00
Bill Currie
dcf2b14188 Implement alias model skin loading for glsl. 2011-12-25 13:02:26 +09:00
Bill Currie
e62eb23f67 And do the real merge. 
That drastically simplifies the processes of alias model loading for glsl :)
 2011-12-25 11:04:03 +09:00
Bill Currie
c0d37ddc1e Pseudo merge gl and sw Mod_LoadAliasGroup. 
Interestingly, this didn't break gl alias model renderering (but then, it
does weird things to the data anyway).
 2011-12-25 10:53:53 +09:00
Bill Currie
1f8db5fe3a Pseudo merge gl and sw Mod_LoadAliasFrame. 2011-12-25 10:34:29 +09:00
Bill Currie
cc5140e3a1 Move min/max/bound and field_offset into better locations. 
min/max bound into mathlib.h (they /are/ math functions, after all) and
field_offset into qtypes.h.
 2011-12-24 10:04:33 +09:00
Bill Currie
59ef1eae9d Split out the floodfile code into its own file. 2011-12-23 19:01:31 +09:00
Bill Currie
6fe9557dae Put in the final pieces so nq-glslx can link. 
Everything is still stubs. Trying to run nq-glslx results in a segfault :)
 2011-12-23 12:52:55 +09:00
Bill Currie
53d89bf85a Clean up the mess around D_FlushCaches. 
Create an R_ClearState and call that from the clients. It calls any
necessary functions itself.
 2011-12-23 12:51:47 +09:00
Bill Currie
33c5320c0e Create stubs for most of the required render functions. 
nq-glslx almost links. Just some suspicious references in host.c I want to
check before doing anything more.
 2011-12-23 12:19:50 +09:00
Bill Currie
497461b4c2 Make a start on making a pure GLSL renderer. 
For now, only nq-glslx will be built, but as there is no actual code, it
doesn't link. However, this gets the glsl stuff into the build system.
 2011-12-23 12:19:13 +09:00
Bill Currie
858d95de58 Add a bunch more keys to the X11 clients. 
Now, QF does something reasonable for every key on my keyboar for which X
gives us a keycode.
 2011-12-19 16:37:48 +09:00
Bill Currie
87390f53b0 Z_Realloc() should zero-fill the expandded part of the mem 
Patch from Ozkan Sezer (sezero). Thank you.
 2011-12-19 09:45:46 +09:00
Bill Currie
52d9269867 Merge brush model with world model rendering. 
With this, non-mtex global fog now works properly :).
 2011-12-18 08:09:55 +09:00
Bill Currie
a8e354536a Implement the instance surface allocation/freeing. 
Not actually used yet, so it's harmless at this stage.
 2011-12-17 19:42:19 +09:00
Bill Currie
87b78e5533 Move the surface chain links out of the surfaces. 
The links are now in "instance surfaces". For non-instanced models (world,
doors, plats etc (ie, world and its sub-models)), there will be one
instance surface per model surface. However, for instanced models (ammo
boxes etc), there will be many, dynamically allocated (not yet
implemented). This commit gets the static instance surfaces working.
 2011-12-17 19:14:14 +09:00
Bill Currie
9f0bdf7794 Add some comments. 2011-12-17 09:39:57 +09:00
Bill Currie
933120d44f Fake vertex arrays for text and particles. 
Getting gl_vaelements_max -1 to work produced a rather nasty surprise :P
 2011-12-16 20:09:05 +09:00
Bill Currie
5cd1f6f5cf Fix a GL version check snafu. 
Thanks to MH (on inside3d.com) for pointing this out to me.
 2011-12-16 09:43:22 +09:00
Bill Currie
e67690a1a9 Restore the missing lightmaps in non-mtex mode. 
I forgot to blend in the lightmaps in the fogless non-mtex path.
 2011-12-16 09:21:39 +09:00
Bill Currie
b2aa5ce554 Register the textures of other brush models; 2011-12-15 17:09:02 +09:00
Bill Currie
962451e2fe Create a list of texture chains. 
This moves the texture chains out of the world model and into a separate
list, allowing other brush models to registter their textures.
 2011-12-15 17:09:02 +09:00
Bill Currie
d6a668d517 Split out chain_surface() from visit_node(). 2011-12-15 17:09:02 +09:00
Bill Currie
3eb859a88f Move the entity transform setup into the clients. 
This has several benifits:
  o The silly issue with alias model pitches being backwards is kept out
    of the renderer (it's a quakec thing: entites do their pitch
    backwards, but originally, only alias models were rotated. Hipnotic
    did brush entity rotations in the correct direction).
  o Angle to frame vector conversions are done only when the entity's
    angles vector changes, rather than every frame. This avoids a lot of
    unnecessary trig function calls.
  o Once transformed, an entity's frame vectors are always available.
    However, the vectors are left handed rather than right handed (ie,
    forward/left/up instead of forward/right/up): just a matter of
    watching the sign. This avoids even more trig calls (flag models in
    qw).
  o This paves the way for merging brush entity surface rendering with the
    world model surface rendering (the actual goal of this patch).
  o This also paves the way for using quaternions to represent entity
    orientation, as that would be a protocol change.
 2011-12-15 17:09:01 +09:00
Bill Currie
f6ebb78140 More GL_Init_Common() cleanup. 
Move the call to GL_Common_Init_Cvars() out of the block of check calls.
 2011-12-15 17:09:01 +09:00
Bill Currie
51aaee5c3b Put that OpenGL error message to rest. 
The error was quite valid: setting GL_TEXTURE_MAX_ANISOTROPY_EXT to 0 is
incorrect. The problem was caused by the call to glTexParameterf being
before the gl_anisotropy cvar was initialized. Thus, move all of the setup
code in GL_Init_Common() to after all the checks and, more importantly,
after the call to GL_Common_Init_Cvars().
 2011-12-15 17:09:01 +09:00
Bill Currie
da552e33e7 Remove execinfo checks. 
It seems we no longer need it (if we ever really did).
 2011-12-13 21:25:41 +09:00
Bill Currie
4b515a961b Back out the fitzquake lerp changes. 
That's not the direction I wish to take the renderer.
 2011-12-13 17:01:15 +09:00
Bill Currie
b05be59ea0 Fix alias models in non-mtex fog. 
It turns out that due to the way we do fullbrights, nothing special needs
to be done to get the fullbright texture blended with the model even when
fog is enabled.
 2011-12-12 17:08:22 +09:00
Bill Currie
8e531a58c2 Get global fog working for multi-pass rendering. 
For the world textures, anyway. Entity multi-pass rendering still needs to
be verified.
 2011-12-12 17:08:22 +09:00
Bill Currie
206199652a Fix a stray CFLAGS. 
Should be AM_CFLAGS.
 2011-12-10 20:45:33 +09:00
Bill Currie
c3d41326b3 Do key dest changing properly. 
key_demo wasn't so well thought out. This seems to be much better (and nq
is known to be working nicely).
 2011-12-10 16:14:25 +09:00
Bill Currie
16c8b2a18d Use the new demo imt. 
There are some problems with menus and the console messing up the key_dest
state (they assume console/menu or game, nothing else), but otherwise
things seem to work.
 2011-12-10 15:18:50 +09:00
Bill Currie
3ae17e4d37 Fix a silly omission. 
Must not check for IMT_MOD bindings when using IMT_CONSOLE etc.
 2011-12-10 14:49:56 +09:00
Bill Currie
81a16c925b Add IMT_DEMO for demo playback bindings. 
This will allow special key bindings for use during demo playback without
interfering with normal keys.
 2011-12-10 14:21:12 +09:00
Bill Currie
14d8e8669f Rework the legacy bind/unbind commands. 
in_bind_imt is now gone. I guess mercury was right in that it was a poor
design. However, it was (and still is necessary) to support "bind" and
"unbind". Now, instead, they work only with the IMT_MOD table. IMT_MOD sits
below IMT_0 in the imt hierarchy. If the key is not bound in IMT_0+, then
IMT_MOD will be checked. This way, "bind" and "unbind" can never mess with
a user's more sophisticated binding setup.
 2011-12-10 13:56:02 +09:00
Bill Currie
49451eea80 Use the new menu/console bingings. 
Now, the console toggle will always work (so long as the console is
toggleable in the first place).
 2011-12-10 13:24:32 +09:00
Bill Currie
d9d56760e1 Add cvars to control the keys for menus and console. 
The backquote is not always usable for toggling the console, and the new
bind system doesn't automatically bind a key to both game and console imts
(by design). Thus create a cvar that allows the "always works" console
toggle to be specified in eg $fs_globalcfg. While I'm at it, do one for the
menus, too.
 2011-12-10 13:24:32 +09:00
Jeff Teunissen
361255cf31 Ruamoko: New math constants, some new math functions 
Also, switch all of the math builtins functions we use from Rua to the
ones that accept and return floats, avoiding conversions to/from double.
 2011-12-09 22:36:41 -05:00
Bill Currie
2edac1a438 Nuke a sprintf. 2011-12-08 22:16:59 +09:00
Bill Currie
1c82956dd7 net_udp.c FIONREAD fix from Ozkan Sezer. 
net_udp.c: Fixed FIONREAD ioctl to take an int* argument instead of an
unsigned long*.
 2011-12-08 21:50:55 +09:00
Bill Currie
8aa5a8139c Split out the portal sanity tests. 
With this, the portal code can be tested separately, including the freeing
of the portal information.
 2011-12-08 14:59:35 +09:00
Bill Currie
f9877ce0e0 Add a function to free a hull's portal information. 2011-12-08 14:58:08 +09:00
Bill Currie
d3cf5c4b75 Beg for mmap access. 
If the default sound device does not support mmap access, retry with
plughw. However, assume the user knows best and do not retry if snd_device
has been set to anything, including "default".

QF alsa support now works out of the box with pulseaudio.
 2011-12-08 11:32:33 +09:00
Bill Currie
45288a1a7f Fix the ghastly sound quality. 
Due to quake's original sound engine using a push model, the actual place
to which the sound data should be written is not necessarily where the
"hardware" dma cursor is, but rather where the last write finished off.
Thus, the correct output location is indicated by snd_paintedtime rather
than snd_shm->framepos.
 2011-12-08 11:02:19 +09:00
Bill Currie
fceed07d0b Tidy up my diagrams. 2011-12-08 08:45:53 +09:00
Bill Currie
9f32004599 Add a fixme. 
I've had enough of this for the moment, but I'm pretty sure the test needs
some more consideration, and I'll probably forget about it if I don't mark
it.
 2011-12-07 17:27:13 +09:00
Bill Currie
2a27db146e Use a bit of epsilon in trace_contents(). 
All tests pass again.
 2011-12-07 15:35:19 +09:00
Bill Currie
66dffef936 Get trace_to_leaf working a little better. 
I think the recursion decision needs a little more work, but this gets the
current tests working (though there's still a failure due to fp math).
 2011-12-07 15:31:33 +09:00
Bill Currie
ccbc69a7f5 Carve out some more cave and add some more tests. 
One of them even breaks the code :)
 2011-12-07 13:31:21 +09:00
Bill Currie
4ed8b69e24 Check the cross product length before testing its direction. 
This fixes the bogus portal crossings.
 2011-12-07 12:20:04 +09:00
Bill Currie
5af88d33fe Trace to the current portal rather than the portal's plane. 2011-12-07 12:17:51 +09:00
Bill Currie
9d2914474c Fix the edge vectors when bounding the portal points. 2011-12-07 12:16:58 +09:00
Bill Currie
6a4021517b Move the box face info into trace_state and init only once. 
Then clean up the mess of excess function paramenters.
 2011-12-07 10:54:37 +09:00
Bill Currie
fc14826cd6 Reorganize the code a little. 2011-12-07 10:42:39 +09:00
Bill Currie
4f13d19b7e Optimize edges_intersect(). 
I found wolfram's line-line intersection page and noticed their equation
for the time of intersection was rather different to mine. After analyzing
the differences, it turns out they produce exactly the same results (when
the lines are coplanar), but their method allows me to eliminate one dot
product (4->3). Not only that, but it turns out that their method works
equally well for skew lines (ie, non-coplanar).

mine:
  CxA.CxA
  -------
  CxA.AxB

theirs:
  CxA.AxB
  -------
  AxB.AxB
 2011-12-07 10:35:58 +09:00
Bill Currie
ff693a956a Avoid missed portals in trace_to_leaf(). 2011-12-06 22:09:40 +09:00
Bill Currie
8c840a7003 Sanitize trace_hits_plane(). 
While unit normals aren't needed, they were too big for sane math. Now
epsilon can be used for the distance tests. One of the two new tests passes
now :).
 2011-12-06 22:06:25 +09:00
Bill Currie
2b65f81b72 Use a saner "infinity". 
8e6 is just too big for reasonable floating point.
This fixes the bogus portals.
 2011-12-06 20:50:09 +09:00
Bill Currie
632817fed5 Fail properly when the portals are bogus. 2011-12-06 20:48:31 +09:00
Bill Currie
f496f4d260 Whee, more tests that break things :) 2011-12-06 20:47:57 +09:00
Bill Currie
8fe703d747 Trace to adjoining leafs when necessary. 
When the trace stradles a plane in the current leaf, check the other side
of the portal, too, as it is possible that leaf will restrict the movement
of the trace.

All current tests pass! However, I can think of some situations (and I
already have a solution) where things will fail, but that's next.
 2011-12-06 17:27:05 +09:00
Bill Currie
4c17ca9583 Break out trace_hits_portal() from trace_enters_leaf(). 2011-12-06 08:46:04 +09:00
Bill Currie
9a9079a2b3 Correct the start-solid in a corner test. 
It turns out that the box trace CAN get out of the solid from that location
(though a similar point trace can not). This is because of my decision to
allow non-points to touch a plane from either side without crossing the
plane, whereas a point touching a plane is always considered to be on the
front side of the plane as there is no further information to disambiguate
on which side of the plane the point is.
 2011-12-05 22:11:58 +09:00
Bill Currie
4419d4c4ad Move the trace into the leaf before testing the contents. 
The trace is moved as far into the leaf as possible without leaving the
other side of the leaf. This ensures that trace_contents is started from a
good location. There is currently a problem with traces that stradle a
plane getting, but this has cleared up all the current contents related
tests.
 2011-12-05 22:11:58 +09:00
Bill Currie
c588d28b96 Clear contents flags before calling trace_contents. 2011-12-05 22:11:58 +09:00
Bill Currie
8307d9f233 Rename check_in_leaf to trace_enters_leaf. 2011-12-05 22:11:58 +09:00
Bill Currie
3bd029d599 Make the contents flags clear. 
I got tired of not being able to remember which flag was which in the
output.
 2011-12-05 22:11:47 +09:00
Bill Currie
8e512a087c More failing contents tests. 
However, I have a plan :)
 2011-12-05 09:03:04 +09:00
Bill Currie
b4a497baab Correctly restore the saved start point. 
This fixes the point test failures.
 2011-12-04 21:12:12 +09:00
Bill Currie
7da6df9dfb Use the "real" contents of the trace's location when visiting a leaf. 
When visiting a leaf in box mode, use trace_contents() to get the highest
priority contents of any leafs touched by the box in the current location.
I'm now down to one failing test case, and it's an "allsolid" issue that
might be an incorrect assumption in my test case.
 2011-12-04 19:14:35 +09:00
Bill Currie
053d801e92 Break out the leaf visit code into its own funciton. 2011-12-04 18:52:17 +09:00
Bill Currie
4e76aa3025 Don't split on a plane parallel to the motion. 
This seems to improve the start/all solid cases a little, and it should
speed things up a little by avoiding unnecessary polygon tests.
 2011-12-04 12:46:22 +09:00
Bill Currie
ed8e09608a Fix the negative fractions coming from edge_portal_dist(). 
I have a better fix in the works, but I wanted edge_portal_dist() to be
correct.
 2011-12-04 12:11:27 +09:00
Bill Currie
e5903a60ff Put the mistaken test case back in. 2011-12-04 11:00:38 +09:00
Bill Currie
eb5d2720e4 Avoid a segfault when there's no split plane. 2011-12-04 10:55:46 +09:00
Bill Currie
cdfc922bce Fix a silly test case error. 2011-12-04 10:47:52 +09:00
Bill Currie
487a6b20ab Test collisions with a ridge smaller than the box. 
Whee, found a failing test case :)
 2011-12-04 09:02:12 +09:00
Bill Currie
55eb88b52c Create some tests for MOD_HullContents. 2011-12-03 22:18:43 +09:00
Bill Currie
581972c905 More file splitting for code reuse. 2011-12-03 21:13:01 +09:00
Bill Currie
dadfb78992 Split out the hull data so it can be used in other tests. 2011-12-03 20:23:42 +09:00
Bill Currie
9ad298a716 Check whether the portal and box intersect. 
Now on to creating tests for MOD_HullContents :)
 2011-12-03 19:59:12 +09:00
Bill Currie
d9a641c600 Avoid a segfault when the hull hasn't been portalized. 
Serves me right for forgetting to test the main engine :P
 2011-12-03 09:06:57 +09:00
Bill Currie
27642a080a Avoid infinite recursion. 2011-12-01 12:57:06 +09:00
Bill Currie
f9d56f2941 Add MOD_HullContents(). 
If trace is null or point type, or the hull doesn't have portals, or the
first node is a leaf, MOD_HullContents operates in point mode (exactly the
same way as SV_HullPointContents()). However, in box mode, all leafs
touched by the trace are checked for their contents. The contents field of
trace (a bit field) will indicate the contents type of all touched leafs.
The returned contents value indicates the most important contents:

    solid > lava > slime > water > empty

The one's complement value of the contents type is the bit number of the
contents bit field. I'm not sure how useful this will be as getting the
amount of overlap is currently not supported.
 2011-12-01 12:26:33 +09:00
Bill Currie
7ee31dd475 Allow the trace start to be in multiple leafs. 
This fixes a couple of in-solid tests, but something better is needed.
 2011-11-28 20:56:21 +09:00
Bill Currie
13d37f4838 Add a bunch of in-solid tests. 
Tests where the box is only partially in a solid tend to fail (particularly
when the solid is on the back side of the split plane).
 2011-11-28 20:56:21 +09:00
Bill Currie
50b08c98fa Add some snug-fit tests and fix the uncovered bugs. 
The tests involve the box fitting into a hole with zero slop (this would be
impossible with point clipping).
 2011-11-28 20:56:21 +09:00
Bill Currie
985667ecba Fix plane touching box backsideness. 
Because a box has size, even when touching a plane, the side on which the
box is can be determined (unlike a point).
 2011-11-28 20:56:21 +09:00
Bill Currie
869cd19260 Box traces can now graze a corner. 2011-11-28 20:56:21 +09:00
Bill Currie
45d55d7e9a Test the simple wedge. 2011-11-28 20:56:21 +09:00
Bill Currie
2c9b07b257 Scale the box edge vectors. 
Now they represent the lengths of the edges as expected by the edge/polygon
code.
 2011-11-28 20:56:20 +09:00
Bill Currie
60dbc0e342 Fix the last few bugs breaking the distance code. 
The code itself seems to work now. There are still some problems: the box
faces are using unit vectors for the edges, or I should go back to unit
vectors for the portal edges; starting in a solid corner won't always work;
etc. However, that's just mopping up: the main algorithm seems to be
working.
 2011-11-28 20:56:20 +09:00
Bill Currie
996859c367 Correct the projection code. 
That needed to be the intersection of two coplanar lines.
 2011-11-28 20:56:20 +09:00
Bill Currie
ab2ec644d6 Clip the portals when running the test cases. 
When the portals are too big, floats break down and break the tests. This
might not be much of an issue in real maps, but my tests use "infinite"
planes.
 2011-11-28 20:56:20 +09:00
Bill Currie
2abff68089 Fix some more silly bugs. 
The target test now works, but some others have broken due to getting
negative fractions.
 2011-11-28 20:56:20 +09:00
Bill Currie
a1da8ecdd0 Fix some silly errors that broke most of the box tests. 
Uninitialized variables and crossed signs. Oops :/
 2011-11-28 20:56:20 +09:00
Bill Currie
8fc99566ab Add code to clip the motion of the box to the leaf's portals. 
Unfortunately, something is broken (all box tests fail due to 0 fraction).
 2011-11-28 20:56:20 +09:00
Bill Currie
5ee552ea5b Don't normalize the portal edge vectors. 
This simplifies the collision handling code.
 2011-11-28 20:56:20 +09:00
Bill Currie
174f381125 Add some more tests for the ramp. 
These tests pass, but show the basic polygon testing working (just not the
collision handling and thus fraction determination).
 2011-11-28 20:56:20 +09:00
Bill Currie
750b5ba0ed Be a little more lenient with float comparisons. 
Unfortunately, Pythagorus and binary don't play well together, so rounding
errors are inevetible when testing with a slope. However, 1e-6 seems to be
a good epsilon (printf's %g hides it nicely :).
 2011-11-28 20:56:20 +09:00
Bill Currie
73b93ffd74 Clean up the in_leaf test line. 2011-11-28 20:54:35 +09:00
Bill Currie
e3d8394b7a Use the split_plane for the in-leaf test. 
This seems to work better (all previously working tests pass again), but
the target test is still broken.
 2011-11-28 20:54:35 +09:00
Bill Currie
7b59eaf0cd Use the correct vector for the plane distance. 
Oops :)
 2011-11-28 20:54:35 +09:00
Bill Currie
cde0bbb807 For now, don't use box clipping for point traces. 
Until I figure out how I want to handle zero sized boxes, don't test them.
 2011-11-28 20:54:35 +09:00
Bill Currie
fd5aee1d5e Use the portals to check leaf validity. 
If the trace hits a portal on the plane that brought us to the leaf, then
we actually are in the leaf (otherwise, we shouldn't be here and thus
should ignore the leaf). At least, that's my thinking.

Many point tests fail (but they're really using box clipping with a zero
sized box) and two box tests fail.
 2011-11-28 20:54:35 +09:00
Bill Currie
297275e3de Create edge information for the portals. 2011-11-28 20:54:35 +09:00
Bill Currie
662c04dfdc Add a function to obtain the unit vectors of a winding's edges. 2011-11-28 20:54:35 +09:00
Bill Currie
e41da2f579 Store the start fraction and position in the right stack slot. 
Oops. Yay, valgrind.
 2011-11-28 20:54:35 +09:00
Bill Currie
d61cb25a44 Add code to rebuild the bsp brushes. 
Names and locations of declarations are still up in the air, but things
seem to be working assuming my test code is correct.
 2011-11-28 20:54:35 +09:00
Bill Currie
853bf13d9e Move the winding code into libQFmodels. 2011-11-28 20:54:35 +09:00
Bill Currie
91e65b6c80 Rename mplane_t to plane_t and clean up the mess. 
I got rather tired of there being multiple definitions of mostly compatible
plane types (and I need a common type anyway). dplane_t still exists for
now because I want to be careful when messing with the actual bsp format.
 2011-11-28 20:54:34 +09:00
Bill Currie
2f23cfa4d0 Add a new (failing) test case. 
This one demonstrates the need for more information in the bsp tree
(surface polygons). When the box collides with a corner where one side is
flat and the other angled, but there's a partition plane cutting the two,
the box can instead collide with the angled side before it hits the corner.
 2011-11-28 20:54:34 +09:00
Bill Currie
7a1faee460 Bail out when the trace advances past the nearest collision. 2011-11-28 20:54:34 +09:00
Bill Currie
a943cdf2c4 Handle dual collisions. 
When the trace collides with something on both sides of a plane, the nearer
collision is required. The code now correctly checks both sides and keeps
the nearer collision.
 2011-11-28 20:54:34 +09:00
Bill Currie
0cf5dec5bb Fix the covered step tests. 
However,  there is still a problem with moves where the box is always cut
by the plane: both sides need to be tested (done), but when the first side
checked allows longer motion than the second, but still collides, only the
first side is checked. The shorter motion is required.
 2011-11-28 20:54:34 +09:00
Bill Currie
8cc320b7ef Move the start point to the near side of the crossed plane. 
I'm not sure the end point needs to be moved at all, but I'll leave it
alone for now. I have a couple of failing test cases that seem to be caused
by not handling moves where the box is always cut by the plane.
 2011-11-28 20:54:34 +09:00
Bill Currie
fa6390a46a Correct the sign for the shift in frac. 
However, this is not entirely correct as the new start point when testing
the other side of the plane also needs to be calculated.
 2011-11-28 20:54:34 +09:00
Bill Currie
b82d9f5894 Another test, another bug. 
Fix an incorrect test using offset (forgot to negate).
 2011-11-28 20:54:34 +09:00
Bill Currie
9984a2e87a Fix some missing usages of offset. 
This fixes my one failing box clip test. Now I need to find more broken
cases. At least now, they should be real tests.
 2011-11-28 20:54:33 +09:00
Bill Currie
9d63298032 Tweak a fixme comment. 
The code is potentially slow, especially on big maps, but I haven't noticed
any issues yet.
 2011-11-28 20:54:33 +09:00
Bill Currie
03abb3b27d Add support for ellipsoids. 
Not that boxes work yet, but the fix is the same.
 2011-11-28 20:54:33 +09:00
Bill Currie
b4da9241f6 Make a fresh start on box clipping. 
I even have a failing test to fix :)
 2011-11-28 20:54:33 +09:00
Bill Currie
6d2b92125a Make nva a little more memory efficient. 2011-11-15 13:47:05 +09:00
Bill Currie
940476dce1 Do some renaming to make things a little clearer. 2011-10-02 15:07:36 +09:00
Bill Currie
a356ce6572 Assume the trace will be allsolid. 
Rather than setting allsolid when the trace fails to leave solid space,
clear it when the trace enters non-solid space. This is necessary because
the trace might visit only one node and thus the failure to leave solid
space will not be detected. This fixes the problem with hipnotic's bobbing
water.
 2011-09-27 17:14:42 +09:00
Bill Currie
9c6693d567 Correct hull3 and its tests. 
I'd gotten the solid/empty parts backwards.
 2011-09-27 17:11:57 +09:00
Bill Currie
3e74aa5303 Add trace-qf-bad.c to Makefile.am and testclip.c. 2011-09-27 17:09:04 +09:00
Bill Currie
e23ee07b6f Ensure id's trace is properly initialized. 2011-09-27 15:38:28 +09:00
Bill Currie
32ff639bf3 Add an old qf version of trace.c 
This version is broken (it's the one "fixed" by commit 981622f9), but it
does behave correctly for hipnotic's bobbing water. The question is, why?
 2011-09-27 13:00:19 +09:00
Bill Currie
9daa0b7bde Rename the empty and solid flags, and use them correctly. 
seen_empty and seen_solid much better reflect their meanings, and also use
them correctly (eg, visiting an empty node does not clear seen_solid).
Hipnotic's bobbing water is still broken, though.
 2011-09-27 12:33:50 +09:00
Bill Currie
a7482570b6 Document the geometry in the tests. 2011-09-27 12:30:21 +09:00
Bill Currie
aa6b7ef7e8 Add some water based tests. 
Unfortunatly, they haven't uncovered the bug.
 2011-09-26 21:02:54 +09:00
Bill Currie
800e8cb3da Make the id trace code more readily usable in the engine. 2011-09-26 19:56:00 +09:00
Bill Currie
ae0dc6f06b Disable the "shouldn't happen" code. 
It causes the tests to fail, and doesn't affect the problem I'm currently
facing.
 2011-09-26 19:56:00 +09:00
Bill Currie
baf9b7c181 Make the test nodes a little easier to read. 2011-09-26 19:56:00 +09:00
Bill Currie
683adf1850 Print the name and texture number for model skins. 
Use SYS_GLT (1024) for gl texture debugging.
 2011-09-26 13:03:53 +09:00
Bill Currie
d9ab3a1f54 Move the config file/command line parsing into qargs.c 
I don't like the COM prefix, but it will do for now.
 2011-09-11 14:57:05 +09:00
Bill Currie
a71acc9ae5 Move the essential init code into Sys_Init(). 2011-09-11 14:56:47 +09:00
Bill Currie
6fb73b5ae8 Nuke some mystery code. 
I have no idea why I did that, but it crept in with the var substitution
fix, so I guess it might have been an attempt to fix a bug, but it looks
like it was broken anyway.
 2011-09-11 13:10:14 +09:00
Bill Currie
e5add8b4f5 Use dstring_freeze() to cleanup some code. 2011-09-11 13:09:24 +09:00
Bill Currie
8bab548d16 Make the hud type configurable via dirconf. 
Currently only "id", "hipnotic" and "rogue" are supported (anything else is
treated as "id"). Has no effect in quakeworld (good thing too: changing
gamedirs is a little broken).
 2011-09-11 08:13:26 +09:00
Bill Currie
8e30d3098e Fix asm ilnking in mingw. 
It seems that recent binutils/libtool doesn't like exporting symbols that
don't begin with a _.
 2011-09-10 17:49:14 +09:00
Bill Currie
da7ddc35c0 Fix the segaults when trying to use snd_disk. 
It's output is still bogus (and it writes to the current directory!), but
at least the plugin can be used without any nasty issues.
 2011-09-10 12:07:18 +09:00
Bill Currie
bfd1680c15 Fix a 32/64 bit portability issue. 2011-09-09 19:56:16 +09:00
Bill Currie
999912e49a I thought I'd tested those changes :( 2011-09-09 19:55:54 +09:00
Bill Currie
a426dacc8a Add a missing \n 2011-09-09 17:43:48 +09:00
Bill Currie
d043e2bf17 Rewrite QFS_FileBase(). 
It now uses QFS_SkipPath() and QFS_FileExtention() to
find the file's base name.
 2011-09-09 17:39:00 +09:00
Bill Currie
d92488ce9f Rewrite QFS_DefaultExtension() and QFS_SetExtension(). 
They now use QFS_FileExtension() to find the correct
place for the extension.
 2011-09-09 17:37:45 +09:00
Bill Currie
225f1cd06c Rewrite QFS_StripExtension() to use QFS_FileExtension(). 2011-09-09 17:35:12 +09:00
Bill Currie
96ef0ffaea Rewrite QFS_FileExtension() to be more correct. 2011-09-09 17:33:29 +09:00
Bill Currie
08fa6be9f4 Fix a potential buffer underflow. 2011-09-09 17:30:07 +09:00
Bill Currie
20d056e6c5 Fix my broken warnings fixes. 
That's what you get for blinding working on code you don't grok :P
 2011-09-08 21:05:33 +09:00
Bill Currie
881d4babce Fix some undefined symbols in snd_alsa.c. 
Serves me right for testing with only my debug build :P
 2011-09-08 18:10:09 +09:00
Bill Currie
6da725d510 Simplify and slightly improve Cmd_StuffCmds(). 
Make use of dstring to manage the built command mini-script.
Ensure + and - that do not come after whitespace do not start a new
command.
 2011-09-08 12:37:52 +09:00
Bill Currie
e8e8dad535 Fix a potential crash with the cvar reset command. 2011-09-07 21:07:52 +09:00
Bill Currie
2ae33a753a Support non-interleaved mmap sound. 
Unfortuanately, I can't test this properly as I don't have any such
hardware, but as the code is mosly an edited copy of the interleaved code,
any errors should be easy to fix.
 2011-09-07 17:00:57 +09:00
Bill Currie
a8ea3aaad9 Allow dma sound targets to specify an xfer function. 2011-09-07 17:00:18 +09:00
Bill Currie
9ffa1f410a Detect the silent death of the jack client thread. 
When jackd gets an unhandled xrun, it stops all processing but neglects to
tell the client about it. Thus, add a bit of a watchdog function to
s_update() and assume the client thread is dead if there's no sign of life
after one second. No more hanging on exit.
 2011-09-07 15:16:27 +09:00
Bill Currie
581539f7af Make debug printing a little smarter. 
When a field or global name is used, the printed value reflects the type
of that variable.
 2011-09-07 09:41:06 +09:00
Bill Currie
91f6b7f555 Better use of Sys_Printf. 2011-09-07 09:41:06 +09:00
Bill Currie
39190c5e2c Remove an unnecessary include. 
Don't need that :P
 2011-09-07 09:41:05 +09:00
Bill Currie
deddb5cb6a Partially document the message api. 2011-09-04 09:58:12 +09:00
Bill Currie
9afb691dd9 Change MSG_ReadShort to return an unsigned short. 
Avoiding the sign extension by default seems to be more useful.
 2011-09-04 09:58:12 +09:00
Bill Currie
12e238f806 Add a function to convert quake angles to a quaternion. 
The test works by comparing the result of AngleVectors with forward,
right, and up vectors rotated by the quaternion resulting from AngleQuat.
 2011-09-04 09:58:12 +09:00
Bill Currie
1c47f9e16d Kill some magic numbers. 2011-09-04 09:58:12 +09:00
Bill Currie
fe3cdbcf5a fix a snafu in quattomat 2011-09-04 09:58:12 +09:00
Bill Currie
eb205d73fd Add a function to convert a quaternion to a rotation matrix. 2011-09-04 09:58:12 +09:00
Bill Currie
5c9ab2832f Fix win32 cross-building. 
No idea if the code actually works :(
 2011-09-04 09:48:16 +09:00
Bill Currie
e50f0e18ba Make netmain use netadr_t, same as netchan. 
Having sockaddr and friends in a header file was bad news for portability
(especially windows).
 2011-09-04 09:45:19 +09:00
Bill Currie
5ee01879ec Missed a spot for net_family. 2011-09-03 16:28:00 +09:00
Bill Currie
80b2b82092 Add a cvar to control the address family. 
OpenBSD doesn't allow mixed binding of ipv4 and ipv6, but being able to use
ipv6 enabled qf with ipv4 addresses would be nice...
 2011-09-03 13:04:47 +09:00
Bill Currie
29a52a8cc8 FIx it for IPv4, too. 
Oops, I forgot about that :P
 2011-08-31 18:32:47 +09:00
Bill Currie
bfcdc5ed17 Fix qw networking on OpenBSD. 
OpenBSD is very picky about the address size, but does provide sa_len and
friends to make life easier. Use them as appropriate :)
 2011-08-31 18:07:41 +09:00
Bill Currie
f75b0a611b Some compile fixes for OpenBSD 2011-08-25 22:35:20 +09:00
Bill Currie
0d5bebabe2 Replace qsockaddr with AF_address_t. 
It seems qsockaddr's assumptions aren't necessarily portable, as OpenBSD
seems to be doing weird things with qsa_family. Even if that's not the
case, this is cleaner.
 2011-08-24 09:14:02 +09:00
Jeff Teunissen
1cc2b1b178 whitespace 2011-08-23 01:39:40 -04:00
Jeff Teunissen
d2fa1e2479 QW IPv6: lose a pointless assign 
We already assign a->family earlier, no need to do it again.
 2011-08-23 01:39:40 -04:00
Bill Currie
87ad73f146 Add even more info to the address comparison failure. 
It turns out the family check is failing. Why?
 2011-08-22 18:34:52 +09:00
Bill Currie
ce07000054 Make the address comparison a little more informative. 
Still hunting the openbsd connection issues. It seems the address
comparision isn't working.
 2011-08-22 10:30:35 +09:00
Bill Currie
1402feafd2 Kill some magic numbers and clean up some whitespace. 2011-08-20 16:30:43 +09:00
Bill Currie
cf2845a387 Ensure Sys_Error can not form an infinite loop. 
I don't remember what propted this change, but it seems like a good idea
anyway, so get it into the repository and clean out my stash :)
 2011-08-20 13:13:43 +09:00
Bill Currie
bb065bd233 Be a little leniant with vector param stores. 
qcc always used vector stores to load values into the function parameters,
but if the location of the value is too close to the end of the global data
block (the vector spans the end of the block), it would trigger the bounds
check code. Thus, allow such instructions without a murmer, so long as it
actually is a parameter write.
 2011-08-16 12:10:05 +09:00
Bill Currie
53049e33eb Make the interface code more portable. 
It turns out SIOCGIFINDEX isn't (readily?) available in BSD, but
if_nametoindex() is defined by posix, so use that instead.
 2011-08-16 10:03:43 +09:00
Bill Currie
4cec4b9f96 Rewrite the interface detection code. 
Turns out SIOCGIFCONF is rather painful to get working cross-platform. This
should work better, and can be used even with ipv6 :)
 2011-08-11 18:32:39 +09:00
Bill Currie
c1a60551ae Clean up default rate setting and add explicit support for 48kHz. 2011-08-11 17:22:14 +09:00
Bill Currie
5feb0454ca Add and use SYS_SND for both sound and cd debug prints. 2011-08-11 17:20:33 +09:00
Bill Currie
290ac30efc Fix x11 gamma control. 
Seems we lost a header include at one stage.
 2011-08-11 16:08:20 +09:00
Bill Currie
d3c2afc5d7 Handle old global vector compontents. 
In the original save gave format, global vectors were saved as individual
components rather than as a single vector, using the _x/_y/_z tags on the
vector name. However, recent qfcc completely dumped vector components as
separate defs, so old save games would have trouble loading with progs
built with a recent qfcc. Thus, do the component translation if necessary.
 2011-08-11 15:36:51 +09:00
Bill Currie
ff857a9c71 Permit control of single character tokens. 2011-08-11 14:22:27 +09:00
Bill Currie
805256ff65 Use the last used interface address for the socket address. 
This allows the correct address to be put in the server info packet
allowing nq to work on multi-homed hosts. More testing needs to be done to
ensure nothing is broken, or better yet, a rewrite of the networking code
to properly associate the information with the packets.
 2011-08-06 21:47:57 +09:00
Bill Currie
ae9404cc27 Obtain the interface on which the packet arrived. 
Once I sort out just how to get the information to the right place, this
should fix a lot of the problems with nq on multi-homed nodes.
 2011-08-06 20:33:20 +09:00
Bill Currie
3088566502 Replace get_address() with get_iface_list(). 2011-08-06 18:57:53 +09:00
Bill Currie
6f0ab844ea Some more nq networking debug prints. 2011-08-06 16:54:01 +09:00
Bill Currie
eba66b1dde Doc tweaks and some whitespace. 2011-08-02 17:32:36 +09:00
Bill Currie
76f894a29f Add some debug prints for nq networking. 2011-08-02 15:22:57 +09:00
Bill Currie
e5876752f3 Document the datagram net driver interface. 2011-08-02 15:22:33 +09:00
Bill Currie
e89532cb9f Fix a couple of missed view.h->clview.h changes. 2011-08-02 11:29:20 +09:00
Bill Currie
8e140bc97e Use SYS_NET instead of SYS_DEV for networking debug prints. 2011-07-30 17:44:03 +09:00
Bill Currie
28610c08e3 Do not try to build testsound when not building sound libs. 2011-07-30 15:03:19 +09:00
Bill Currie
bf58ad9d80 And silence a "set but not used" warning. 2011-07-29 17:21:33 +09:00
Bill Currie
77dcd07b37 Remove a dead function. 2011-07-29 14:30:54 +09:00
Bill Currie
50341d0972 Whitespace. 2011-07-29 13:51:58 +09:00
Bill Currie
07d5b114bc Clean out some dead code and variables. 
We haven't had serial or ipx support for a long time.
 2011-07-29 10:11:14 +09:00
Bill Currie
1d57477101 Document the "public" functions of NQ's networking code. 2011-07-26 14:15:41 +09:00
Bill Currie
64881d2eca Finish the docs for netchan. 
Also clean out some unnecessary declarations.
 2011-07-26 11:30:02 +09:00
Bill Currie
688e5c7e24 Use ncqport_e on the right field. 
Well, now, that was incredibly silly, wasn't it? :P
 2011-07-23 21:39:13 +09:00
Bill Currie
9ccd570105 Fix a problem with linking FLAC libs. 2011-07-23 21:37:34 +09:00
Bill Currie
3678b610eb Make a start on documenting netchan. 2011-07-23 17:53:06 +09:00
Bill Currie
2035e65bad Make the qport flags a little more doc friendly. 2011-07-23 17:51:07 +09:00
Bill Currie
e15771f4a4 Nuke a dead function. 2011-07-23 15:58:45 +09:00
Bill Currie
efa0105748 Rename some headers to fix doxygen warnings. 2011-07-23 15:58:45 +09:00
Bill Currie
b17e37f802 Remove uneccessary differences between ip4 and ip6 code 2011-07-23 15:58:45 +09:00
Bill Currie
8ac5079ada Get inputlines mostly working. 
It should be only behind-the-scenes updates that are still a problem.
 2011-07-09 21:16:38 +09:00
Bill Currie
652b434e7b Rework the inputline wrapper. 
Use the resource map code for handle management (much safer).
Add support for the enter callback (function or method).

Unfortunately, it still doesn't work due to poor design of the inputline
user data.
 2011-07-09 09:44:37 +09:00
Bill Currie
3dd31b7de9 Fix some bugs found while hacking inputlines. 2011-07-09 09:42:11 +09:00
Antti Harri
358a844a42 Implement --version-info configure switch to override QuakeForge 
library versioning. From Lasse Collin, thanks!
 2011-07-09 01:23:36 +03:00
Bill Currie
4e66a5b327 Add rua rappers for the cvar alias functions. 2011-07-06 19:17:28 +09:00
Bill Currie
6114156b49 Add Cvar_RemoveAlias. 
Now aliases can be deleted (needed for menus).
 2011-07-05 21:59:47 +09:00
Bill Currie
a7291943f7 Fix up Cvar_MakeAlias's error checking. 2011-07-05 21:51:38 +09:00
Bill Currie
d2894a6f68 Rename Cvar_AliasGet to Cvar_MakeAliase. 2011-07-05 20:28:57 +09:00
Bill Currie
a8245e598e Fix a memory leak. 
The command hash table is shared between all progs engine instances, but it
was being allocated for every instance. Ensure only one is allocated.
 2011-07-05 19:05:24 +09:00
Bill Currie
6484dd16c7 Finish cvar alias support. 
Several functions that manipulate cvars were not checking for aliases.
 2011-07-04 21:05:42 +09:00
Bill Currie
0f7390dd60 Clean up all the "set but not used" warnings. 
gcc on my system is failing to treat this specific warning as an error :/
 2011-06-19 10:48:02 +09:00
Jeff Teunissen
85617586af PCX: display some information on bad PCX files 
also, minor whitespace on <QF/image.h>
 2011-06-14 13:31:30 -04:00
Bill Currie
42ab0a7dbb Ensure consize is correct in the software renderers. 
The software renderers force the console size to be the same as the window
size (no scaling), but they weren't telling the console of the resize.
oops. Fixes the crash when running the software renderers with default
sizes.
 2011-06-14 17:54:53 +09:00
Bill Currie
c57d252dd4 More "set but not used". 
Why is finding them so unreliable for me?
 2011-06-14 06:26:10 +09:00
Bill Currie
607a4be2e2 Fix a "set but not used" warning/error. 
I'm not sure what I had planned with "list", so I just commented it out
with FIXMEs.
 2011-06-13 16:44:30 +09:00
Bill Currie
b18ff4ed3e Move test-qfs.c into a test directory. 
Same as before: avoiding -prefic-pic issues.

Also, catch some minor snafus found in the previous commit. With this, make
distcheck passes again :)
 2011-06-12 16:34:15 +09:00
Bill Currie
c522726021 Move the testclip program into its own directory. 
Same as with the audio test program, this is to avoid issues with
-prefer-pic.
 2011-06-12 16:12:52 +09:00
Bill Currie
47201137d5 Make the default cd plugin configurable. 
The default default is file, but now distribution maintainers can change it
if necessary.
 2011-06-04 17:19:18 +09:00
Antti Harri
8d1bd58ade snd_dma.c fixes for non-power-of-two values. From Jacob Meuser. 2011-06-04 09:47:15 +03:00
Antti Harri
67c7796c0b Change default music backend from OGG to CD. 2011-05-31 00:05:35 +03:00
Antti Harri
65789d22d9 Fix PNG build and use AM_CPPFLAGS instead of INCLUDES that is obsolete. 2011-05-28 10:47:11 +03:00
Bill Currie
74a7e07dfc Use AM_CFLAGS instead of CFLAGS. 
CFLAGS is meant to be reserved for the user.
 2011-05-10 12:44:44 +09:00
Bill Currie
f17b1275ea Undo an accidental commit. 2011-05-10 11:48:38 +09:00
Bill Currie
77ccf8a824 Build the audio libs before the test dir. 2011-05-10 11:32:38 +09:00
Bill Currie
f7a95ec2f4 Move the test program into its own directory. 
This is to avoid issues with -prefer-pic (really need to clean things up
properly).
 2011-05-10 11:25:12 +09:00
Bill Currie
d3771dfeba Resolve some inlining issues in recent gcc. 2011-05-04 09:31:18 +09:00
Bill Currie
bc2174d92b Remove some dead variables reported by Spirit. 2011-05-04 09:30:38 +09:00
Bill Currie
2a2a431431 Register a complaint when the map has too many entities. 
I was wondering why that parrot was dead.

Not realizing that negke's coag3 map had too many entities really ruined
the pleasure of playing it, so it's best to treat such situations as an
error (max_edicts can be bumped up to 32000 if need be, but 2048 is plenty
for his map).
 2011-04-17 20:06:20 +09:00
Bill Currie
47e55fe1c6 Properly terminate each fisheye quad strip. 
The horizontal quad strips need to be rendered individually rather than as
one single strip. The latter results in ugly triangles crossing the screen.
 2011-04-17 13:03:22 +09:00
Bill Currie
55cc0f9206 Bring back the unsigned type (PROGS version bump) 
This is only low-level support (the unsigned keyword still does not work),
but sufficient to make switch statements using jump tables work.
 2011-04-09 10:07:47 +09:00
Bill Currie
2bacfdabf2 Interpret func fields as selectors for entities with objects. 2011-03-30 20:19:31 +09:00
Bill Currie
c8e1d7b45a Fix the API for inputline->enter(). 
Pass the inputline object rather than the input text, allowing access to
both user_data and the input text.
 2011-03-27 08:03:39 +09:00
Bill Currie
84afc458fa Allow the menus to overide the Escape key. 2011-03-25 18:02:59 +09:00
Bill Currie
2be07fd652 Keep the the temp string out of progs for sprintf. 
There's no need for the string to be in progs memory when printing as the
end result will be moved into progs memory regardless.
 2011-03-24 11:45:58 +09:00
Bill Currie
b0d1e782ee Treat allocating less than 1 byte as an error. 2011-03-24 11:10:08 +09:00
Bill Currie
1822290b1a Fix the double offset of inputline text. 2011-03-24 08:50:32 +09:00
Bill Currie
bc0cffc9c6 Fix handling of autorelease pools in the menu code. 
Create a "menu_pre" function that creates the autorelease pool, change
menu_post() to release the pool correctly, and make the menu internal code
require and call menu_pre.
 2011-03-21 13:14:14 +09:00
Bill Currie
7c113a12db Make zone errors a little more useful. 2011-03-20 15:50:09 +09:00
Bill Currie
025c39cc02 Ensure stdout is flushed in the progs signal_hook() 2011-03-20 13:35:59 +09:00
Bill Currie
104c29e4da Avoid a segfault when the called function is invalid. 
This is most likely to occur when dumping code from qfo files with external
functions.
 2011-03-20 13:35:12 +09:00
Bill Currie
f20424afe5 Make "bad type" output more useful. 
Print the four (assumes non-v6) values in hex rather than "bad type".
 2011-03-17 20:35:14 +09:00
Bill Currie
ebfbd7c358 Disable the unsigned comparison instructions. 
They need unsigned support, or special treatment, so they have to wait.
 2011-03-17 20:33:38 +09:00
Bill Currie
bce3935ea6 Add a void address instruction. 2011-03-10 19:28:03 +09:00
Bill Currie
90de6b0499 Add a movepi instruction to support indirect moves of fixed size. 2011-03-09 10:29:24 +09:00
Bill Currie
18005cc80d Rename move to movei. 2011-03-09 10:28:40 +09:00
Bill Currie
6c4563b21d Change movep's name from <MOVE> to <MOVEP>. 2011-03-09 10:25:20 +09:00
Bill Currie
4432bc0bef Make the offset in zone dumps more useful. 2011-03-08 22:44:56 +09:00
Bill Currie
5b8345eecb Do not try to print values from null entities. 2011-03-07 08:28:20 +09:00
Bill Currie
3b8a3f8302 Remove the vector component skip code from param searches. 
Local defs no longer contain the vector comonents.
 2011-03-06 21:02:29 +09:00
Bill Currie
4794d66f42 Change jumpb's opa type to integer. 
I'm not 100% certain this is correct...
 2011-03-03 19:06:17 +09:00
Bill Currie
57f735c99c Avoid another segfault when debugging. 2011-02-15 15:33:18 +09:00
Bill Currie
52010b8f7b Do not segfault with bogus debug info. 2011-02-14 23:10:45 +09:00
Bill Currie
55b7f6eee4 Avoid another segfault when debugging. 2011-02-09 10:13:08 +09:00
Bill Currie
de33cd6017 Ensure auxfunction_map is properly initialized. 2011-02-09 08:28:20 +09:00
Bill Currie
f72d6d6a27 Fix a typo in the opname for integer modulo. 2011-01-27 21:03:11 +09:00
Bill Currie
33db650161 Add QuatInverse to calculate 1/q. 
There's still no direct quaternion division because I don't know if the
definition of q1/q2 is (1/q2)*q1 or q1*(1/q2) (it does make a difference).
 2011-01-18 22:22:18 +09:00
Bill Currie
3c9991364b Add a "void return" instruction. 
I got fed up with always having to explicty return something.
 2011-01-13 00:29:56 +09:00
Bill Currie
13503198e5 Add quat_origin convenience constant. 
Same as vec3_origin in that all elements are zero.
 2011-01-11 08:41:40 +09:00
Bill Currie
cb0bc7229a Resurect the debugging messages in rua_obj.c 
Yet another debug flag: SYS_RUA_OBJ
 2011-01-10 12:26:10 +09:00
Bill Currie
6650b35201 Make PR_Get_Param_Def aware of @args. 2011-01-10 12:25:31 +09:00
Bill Currie
75ec6bf244 Clean out some unnecessary types from the progs engine and clean up the mess. 
This is a nasty commit, sorry, but 99% of the commit is interdependent.
 2011-01-10 12:25:31 +09:00
Jeff Teunissen
d764ef80d0 write "color" PCX files (stupid bug) 2011-01-09 04:34:35 -05:00
Jeff Teunissen
68b5db87b2 Document PCX read/write functions & struct 2011-01-09 04:06:50 -05:00
Jeff Teunissen
4090674fa5 LoadPCX(): Turn convert argument into a qboolean. 2011-01-09 04:05:57 -05:00
Jeff Teunissen
af8c1e4cc2 Enable RLE coding for PCX output 
Pulled from DarkPlaces's lmp2pcx tool, which I have just been made aware
of.
 2011-01-09 03:06:25 -05:00
Jeff Teunissen
e819ea3b7f QFimage: Don't use qfs_filesize when loading images 
Use Qfilesize() to get the size of a read file, don't count on quakefs's
global qfs_filesize variable pointing at the right file.
 2011-01-09 01:36:40 -05:00
Bill Currie
a85c0713aa Nuke libQFbuiltins. 
The gib and "common" builtins are now part of libQFruamoko.
 2011-01-04 21:21:19 +09:00
Jeff Teunissen
999252c07a Fix the same (ancient!) bug in ipv4 code... 
Don't read the address of the peer until we know we've actually read
a packet.
 2010-12-30 07:15:22 -05:00
Jeff Teunissen
1b23c470cb Fix unknown family msgs 
Found the source of all the bogus "unknown address family" messages --
reading the returned address of an errored read. D'oh!
 2010-12-30 06:38:20 -05:00
Jeff Teunissen
9e0575313e Net debugging 
Add a SYS_NET developer mask for debugging network, and use it.
 2010-12-30 05:01:58 -05:00
Jeff Teunissen
e96cbbdbd9 Captain Whitespace(tm) is back. 
Don't judge me... :)
 2010-12-30 04:58:49 -05:00
Jeff Teunissen
5cfce584c9 ipv4 formatting changes 
IPv4 addresses should be formatted identically to how we're used to seeing
them, without the brackets that denote an IPv6 address and separate it from
the port specification.
 2010-12-30 04:46:44 -05:00
Jeff Teunissen
e7462d025f Call freeaddrinfo() when done with the address info. 2010-12-30 04:34:15 -05:00
Jeff Teunissen
e89fb3a868 Nuke a structure I didn't need. 2010-12-30 04:30:16 -05:00
Jeff Teunissen
0a21f6a6df Move a comment where it belongs 2010-12-30 03:43:46 -05:00
Jeff Teunissen
87dd61a6f8 Fix IPv4 interaction 
Can now talk to IPv4 hosts again.
 2010-12-30 03:42:22 -05:00
Jeff Teunissen
878a9cfb6a ipv6: builds and works now, still can't interact with ipv4 clients/servers 2010-12-29 07:47:15 -05:00
Jeff Teunissen
fdb4d885ae ipv6: start cleaning up strict-aliasing problems. 2010-12-29 06:58:14 -05:00
Jeff Teunissen
cdf5ef2565 ipv6: Fix glibc defines 2010-12-29 06:36:43 -05:00
Bill Currie
3090a64faa Use the correct param for the full_new path. 
This fixes the broken downloads.

*taniwha dons a brown paper bag.
 2010-12-28 14:44:26 -05:00
Bill Currie
6e18c3df85 Make qfs developer prints a little more controllable. 2010-12-28 09:08:51 +09:00
Bill Currie
1f0851cc61 Fix QFS_FilelistFill for pak files. 
Forgot to ensure the path separator was included in the fnmatch param. This
fixes the broken *list commands.
 2010-12-27 10:31:54 +09:00
Bill Currie
70783e4bd5 Disable all sound calls if jack could not be contacted. 
This fixes the file handle leak when jack is unavailable.
 2010-12-25 20:31:14 +09:00
Bill Currie
14480fd1b4 Move the call to R_ClearEnts to the renderer. 
This fixes the hang on certain maps in qw-client.
 2010-12-25 19:59:34 +09:00
Bill Currie
e65d1a7ccf Remove a redundant assignment. 2010-12-25 19:59:34 +09:00
Jeff Teunissen
9defba8d92 Get rid of plugin versioning (again). 
automake needs -avoid-version to be in Makefile.am, otherwise it doesn't
make libtool do the right thing...or something. My head hurts. ;)
 2010-12-25 04:45:39 -05:00
Jeff Teunissen
bbc8154ec7 joystick fixes 
Make /dev/input/js0 the default joy_device, and temporarily bump max
buttons to 18 (until I kill the maximums entirely)
 2010-12-24 05:03:32 -05:00
Bill Currie
ce64227a71 Fix for debian wildmidi. 
This might break lenny :/
 2010-12-24 17:33:09 +09:00
Bill Currie
de04e1b602 Lots of win32 (mingw cross) build fixes. 
HTTP (curl) support is missing, but everything else builds.
 2010-12-23 11:40:16 +09:00
Bill Currie
889bbd364e Explicitly link testsound against libQFutil. 2010-12-18 22:21:55 +09:00
Bill Currie
23d3407622 Change a few defaults as suggested by bigfoot. 
in_dga -> 0 (until X is fixed)
gl_multitexture -> 1 (why was this 0? not enough support back then?)
cl_usleep -> 1 (seems to be ok)
host_mem_size -> 40 (even 32 isn't enough these days)
rate -> 10000 (we're not in the modem era any more)
cl_mem_size -> 32 (16 is not enough, 32 sounds better than 24)
 2010-12-16 11:34:39 +09:00
Bill Currie
765807def0 Make sdl's sound parameters easy to tweak. 2010-12-15 18:48:25 +09:00
Bill Currie
d265bbf011 Support any sample rate. 2010-12-15 18:48:25 +09:00
Bill Currie
df65679028 Remove support for alsa 0.9. 
It's way obsolete and I doubt we'll ever need it again. I do wonder what to
do abut sun, sgi etc.
 2010-12-15 18:48:25 +09:00
Bill Currie
9b9a60aa89 Make the -mem suggestion a little more realistic. 
16M hasn't been enough for a long time.
 2010-12-13 19:11:48 +09:00
Bill Currie
774f049646 Fix garbage at edges of conchar characters. 
Move the texture coordinates in 1/4 of a pixel. To avoid unnecessary
calculations, pre-caclulate the character cell texture coordinates and
blast them into the the texture coordinate array.
 2010-12-11 12:09:30 +09:00
Bill Currie
8919aec663 Get global fog working in mtex mode. 2010-12-10 21:40:36 +09:00
Bill Currie
ce96e6b055 The beginnings of fog support. 
gl_fog.c is taken from fitzquake with only minor modifications to get it
into QF. Other than worldspawn/network parsing, it's not used yet.
 2010-12-10 17:17:30 +09:00
Bill Currie
6114495870 Don't try to load skys named "". 
This makes 'loadsky ""' and 'loadsky none' equivalent.
 2010-12-10 17:17:30 +09:00
Bill Currie
c4f71c0cda Move r_skyname handling from R_NewMap to R_LoadSkys. 
r_skyname now acts as the default sky to use when no sky name is specified
by other means ("none" is still no sky). 'loadsky foo' will load the
"foo*" sky textures, 'loadsky none' gives the default sky, and 'loadsky
""' causes uses r_skyname.
 2010-12-10 17:17:30 +09:00
Bill Currie
8e557e81b6 Break out the guts of Ed_LoadFromFile into ED_Parse. 
ED_Parse does not support progs privided parsing (at this stage, anyway),
but this will allow clients to easily get at the entities in a map.
 2010-12-10 17:17:29 +09:00
Ragnvald Maartmann-Moe IV
843823de84 testsound depends on libQFutil 2010-12-10 17:07:06 +09:00
Bill Currie
981622f969 Make MOD_TraceLine behave "correctly". 
MOD_TraceLine now behaves the same as id's SV_RecursiveHullCheck (from
WinQuake). This means that even if the trace would escape from solid space
into non-solid space, the trace is treated as allsolid if it crosses from
one solid space to another before hitting the empty space.

trace-id.c is used only for establishing the behaviour of id's code.
 2010-12-06 15:30:56 +09:00
Bill Currie
c2af7896bd Revert "make droptofloor continue the trace if it starts solid" 
This reverts commit 10232acdfe.

The problem was really in the trace code, but it got fixed by "accident"
when I had similar problems in hipnotic a couple of years later. Now to
figure out just what the trace could really should be doing.
 2010-12-05 14:56:32 +09:00
Bill Currie
31640dd1b9 Clean out the last traces of my boxclip code. 
I've been experiencing funny trace issues while playing Soul of Evil. While
I think the boxclip dregs shouldn't be causing problems, it's probably best
to clean them out properly before trying to fix anything.
 2010-12-05 14:52:20 +09:00
Bill Currie
b1b1a02c6c Get entity allocation and freeing working correctly. 
This fixes the missing static entities.
 2010-12-04 23:37:58 +09:00
Bill Currie
a4b97e9e2e Dynamic entity allocation. Unlimited static entities. 
Entities can now be allocated dynamically. They are freed whenever a new
map is loaded.

Use the dynamic entities for static entities.
 2010-12-03 21:01:52 +09:00
Bill Currie
a6941e27ef Eliminate MAX_VISEDICTS. Unlimited visible entities. 
The renderer can now render as many entities as can be crammed into the
currently visible set of nodes.
 2010-12-03 14:59:02 +09:00
Bill Currie
f98b002f9e Make R_StoreEfrags const-correct. 
R_StoreEfrags does not need to modify its parameter or anything to which
it directly refers, so make the pointer single-level and constant.
 2010-12-03 13:30:49 +09:00
Bill Currie
085b0f4448 Remove R_SplitEntityOnNode2 
When R_AddEfrags is used (as is the case in nq), this function is
redundant. Brush models in qw are currently broken (invisible), but that's
just a matter of getting qw to use R_AddEfrags instead of R_NewEntity.

This removal should speed up the software renderers a little bit.
 2010-12-02 08:31:48 +09:00
Bill Currie
8831a109a4 Create and use mclipnode_t. 
I didn't realize this was a critical part of fitzquake's large map
support. This should fix the non-solid brush entities in Conflagrant
Rodent.
 2010-11-29 09:36:21 +09:00
Jeff Teunissen
b0217bf0cf Merge branch 'master' into forge 2010-11-28 03:05:30 -05:00
Bill Currie
98a5d591d5 Don't read past the end of a sub-file. 
This fixes a libvobis streaming problem with vorbis files within pak files.
 2010-11-28 11:28:44 +09:00
Bill Currie
341726afb9 Reimplement Qgets using Qgetc. 2010-11-28 11:18:07 +09:00
Bill Currie
185e21e4e4 Tweak some developer cvar usage. 2010-11-27 16:53:17 +09:00
Bill Currie
9900aa3d02 Fix vid_fullscreen for modern X window managers. 
We are now compliant with wm-spec 1.4, so fullscreen toggling should always
work.
 2010-11-27 16:19:04 +09:00
Bill Currie
e53ff2a36d A bit of house keeping. 2010-11-27 15:10:34 +09:00
Bill Currie
dd87274027 DGA mouse tweaks. 
o  Check the return value of XF86DGADirectVideo.
 o  Use input_grabbed instead of in_grab for checking whether to enable dga
    mouse and other grabbed actions.
 2010-11-27 09:25:29 +09:00
Bill Currie
f31595781c Add and used SYS_VID for video/targets masked prints. 2010-11-27 08:48:00 +09:00
Bill Currie
cacd2fb895 FiztQuake's lerping system. 
Seems to be mostly working. I get some funny results for zombies, but that
might be moving and turning at the same time causing issues.
 2010-11-26 16:20:05 +09:00
Bill Currie
31c13d92a2 Protocol 666/large map support from FitzQuake. 
Alpha and lerping aren't implemented yet, but things seem to be working. I
can load and play oms2.bsp (Conflagrant Rodent).
 2010-11-26 16:20:05 +09:00
Bill Currie
8c4fe2f844 Rename Sys_DPrintf to Sys_MaskPrintf. 
We now have finer runtime control over what gets printed. Need to do a
SYS_DEV audit, creating new masks as apropriate.
 2010-11-26 16:19:26 +09:00
Bill Currie
92f84e97a4 Unlimited loaded models. 2010-11-26 16:19:25 +09:00
Bill Currie
abc17c1d91 New cvar commands from fitzquake. 2010-11-26 16:19:25 +09:00
Bill Currie
d6ceaef7d2 Whee, 64bit cpus and sizeof. 2010-11-24 20:42:07 +09:00
Bill Currie
addbcaa09c Add PL_GetFromFile builtin. 
This is an extension "wrapper" (no such C function). This allows ruamoko
programs to read property lists without worrying about the memory required
to store the string for the property list being read.
 2010-11-24 17:01:19 +09:00
Bill Currie
defc2a264b Add QFile_GetHandle() 
This allows other rua builtins to make use of ruamoko files.
 2010-11-24 17:01:19 +09:00
Bill Currie
fc2a6e0fb7 Don't be so spammy with file errors. 
Record a file even if it could not be found. This way, the error message
gets printed once per file rather than every time.
 2010-11-24 17:01:18 +09:00
Bill Currie
3878b76cc5 Start using autorelease. 
Much more testing is required (oh, but for qc-valgrind), but there is now
a ~945kB block of free data in the menu progs heap :).

Also, correct the printed size of the memory block to not include the
block header size.
 2010-11-24 17:01:18 +09:00
Bill Currie
4518e6af91 First stab at implementing autorelease. 
It's probably nowhere near right, but probably ok for now (I need to study
the GNUStep code). I'm unhappy with the menu code hook, but it will have
to do for now.
 2010-11-24 17:01:18 +09:00
Bill Currie
5fc4ef63f6 Rewrite ruamoko plist support to use handles. 
The plist code was written long before I thought of resource handles, and
then it was forgotten. This is much nicer and safer than storing C
pointers in progs memory space (*shudder*).
 2010-11-24 17:01:18 +09:00
Bill Currie
763cec3838 Some spelling/grammar corrections. 2010-11-24 17:01:18 +09:00
Bill Currie
d4ae231f34 sezero's NET_SendToAll fix 
Here's a patch to NET_SendToAll() which was always
broken: it never skipped non-connected clients.
Depending on the compiler, it would wait the whole
5 seconds of its blocktime before it gave up.
While there, changed its blocktime argument to
double (the comparison is against a double.)
 2010-11-21 14:27:43 +09:00
Bill Currie
1dfb914c46 fix an oopsie (rebase!!) 2010-11-21 14:25:32 +09:00
Bill Currie
4cec187465 zixthree's wav file patch 
Wav file were not read correctly when encoutering most chunk type beside the ones used by QuakeForge.

This patch will fix the riff loader code so that unused but defined chunk are skipped. Most wav files should now be loaded correctly fixing some silent sound effect.

Also fixed a typo in wav loader and reordered wav validity check so that format is checked first. The data chunk could be inexistant on some weird format and so an invalid format is a more helpful error text.

! Fix: Skip unsupported chunk in riff loader instead of rejecting riff file.
! Fix: typo in Microsoft name.
! Fix: ordering of wav validity to enable more helpful error text.
 2010-11-21 14:18:15 +09:00
Bill Currie
99e87b092b zixthree's stereo swap patch. 
Modified slightly for formatting and cleaner swapping.
 2010-11-21 14:09:23 +09:00
Bill Currie
6771e7b8b5 sezero's win32 Sys_ConsoleInput patch. 2010-11-21 13:55:03 +09:00
Bill Currie
204c509a43 sezero's "Bad old_size value in Z_Realloc()" patch. 2010-11-21 10:06:56 +09:00
Bill Currie
15b423cbe7 Track 0 is used to stop the BGM 2010-11-20 14:32:27 +09:00
Bill Currie
3309f483b6 Don't require pr_boundscheck for quoth. 
I don't know about other FTEqcc compiled progs, but quoth doesn't try to do
anything clever (all its denormals are either vars of the wrong type, or
-0.0).
 2010-11-20 14:12:40 +09:00
Bill Currie
9d6fd32206 Ensure the the progs data is aligned. 
Some QuakeC compilers (eg, FTE) insert a data chunk between the progs
header and the rest of the progs data. Unfortunately, FTE does not maintain
the assumed 32-bit alignment.
 2010-11-20 09:02:56 +09:00
Bill Currie
2f504709dd Print data being loaded from an entity. 2010-11-20 00:31:34 +09:00
Bill Currie
232d2f7e18 Fix an undefined operation thanks to spirit of the domain quaddicted.com. 2010-11-16 17:13:22 +09:00
Bill Currie
6260130ae5 Fix borked autoconf of dga/vidmode headers. 2010-11-16 00:58:19 +09:00
Bill Currie
37fb8d22da Don't open a streamed sfx when there's no sound driver. 
This happens when qf fails to connect to jackd (possibly other times).
There is probably a better solution to the problem, but not opening a
stream when the sample rate is reported as 0 definitely fixes the inifinite
recursion in read_samples().
 2010-11-14 20:46:29 +09:00
Bill Currie
824e33c82b Fix a sizeof braino. 
Somebody (probably me) got a little over-happy with sizeof.
 2010-11-14 19:22:47 +09:00
Bill Currie
f63e505c92 Don't realloc the string pointer table. 
This causes a bit of memory waste, but avoids breaking the pointers in the
string hash table.
 2010-11-14 19:21:16 +09:00
Bill Currie
e6b783a616 Don't touch the watchpoint conditional when printing. 2010-11-13 14:36:33 +09:00
Bill Currie
ff49239500 Fix shared config files. 
We've allowed a single level of parent directy access in quake path names
for a long time, but this got broken by qfs_expand_path. Thus, make
qfs_expand_path allow a certain number of parent directory levels (usually
0 or 1).
 2010-10-16 14:17:09 +09:00
Bill Currie
ef7958d680 Lots of const correctness. 2010-10-13 20:52:08 +09:00
Bill Currie
9a30968c87 type size correctness 2010-10-13 20:52:06 +09:00
Bill Currie
cd159e1cc1 Use LoadBSPMem to load brush models. 
Now that Mod_LoadBrushModel uses bspfile.[ch], the engine uses the same
code as the tools to work with bsp files.
 2010-10-13 20:52:05 +09:00
Bill Currie
db898655d1 make LoadBSPFile own the memory for the bsp data 2010-10-13 20:52:05 +09:00
Bill Currie
719ca15516 make LoadBSPMem work in-place 
LoadBSPMem now modifies the passed in buffer rathern than allocating new
memory. One step closer to cleaning up brush model loading.
 2010-10-13 20:52:05 +09:00
Bill Currie
56fb4d9a22 allow safe bsp freeing 
any memory the bsp thinks it does not own will not be freed
 2010-10-13 20:52:05 +09:00
Bill Currie
1d86e71404 make WriteBSPFile take a const bsp_t * 
This means that the supplied bsp can now be reused, as it should be.
 2010-10-13 20:52:05 +09:00
Bill Currie
f4042c5b91 Make the bsp disk data structures type size independent. 
However, this assumes float is always 32 bits.

Also use size_t for the *size fields in bsp_t and clean up the mess.
 2010-10-13 20:52:05 +09:00
Bill Currie
3f08268038 Make sure unterminated lump names don't cause propblems when comparing. 2010-10-10 18:31:14 +09:00
Bill Currie
1902ca6159 Ensure the string to be hashed is terminated. 2010-10-10 18:21:30 +09:00
Bill Currie
7dc1ccdbea Add a function for retreiving the parsed token. 
Saves having to reach into the token's dstring (script->token->str was
getting annoying).
 2010-09-26 13:50:17 +09:00
Bill Currie
827d0d0ad6 Scripts now treat {}()': as single character tokens. 2010-09-26 13:50:17 +09:00
Bill Currie
f666f8d27a Get the lib dependency for testsound right. 
No need for $(top_builddir) when the lib is in the same directory. Fixes
parallel builds.
 2010-09-25 23:07:06 +09:00
Bill Currie
42faad9015 Move expand_squiggle() from quakefs to sys, and rename to Sys_ExpandSquiggle. 
Hopefully the final resting place of this function.
 2010-08-25 14:00:04 +09:00
Bill Currie
e9bd9a4baa Move QFS_CreatePath() to Sys_CreatePath(). 2010-08-25 13:52:24 +09:00
Bill Currie
4f620655be Document quakefs.h 2010-08-25 13:40:22 +09:00
Bill Currie
f1943ebaab Fix some path compression bugs. 2010-08-25 13:38:45 +09:00
Bill Currie
550b094b93 Unit testing for QFS_CompressPath 2010-08-25 13:38:30 +09:00
Bill Currie
05c57f219d Nuke a comment. 2010-08-25 13:38:24 +09:00
Bill Currie
c6be3c469a Make the names of static functions canonical. 2010-08-25 13:38:24 +09:00
Bill Currie
bbf2ac0204 Avoid creating // in path names. 2010-08-25 13:38:18 +09:00
Bill Currie
ba8ca132a9 Change QFS_Gamedir()'s parameter from dir to gamedir. 2010-08-25 13:31:24 +09:00
Bill Currie
745bdfafdf Eliminate QFS_LoadHunkFile(). 
It is unused, and part of the group of functions I wish to remove from QF.
 2010-08-25 13:31:23 +09:00
Bill Currie
cbee789fe1 Change ProgPath to ModelPath and dir.progs to dir.models. 
The default is still $path/progs, as that is what is expected by the
game-code.
 2010-08-25 13:31:13 +09:00
Bill Currie
cf40f5073d Nuke QFS_WriteBuffers. 
This function is too dangerous for my liking, and it's now unnecessary
since qfs has been locked down.
 2010-08-25 13:31:13 +09:00
Bill Currie
031055a91f Move the qfs_* cvars out of quakefs.h 
The qfs cvars are all private.
 2010-08-25 13:31:13 +09:00
Bill Currie
0cc4bc8c69 Move searchpath out of quakefs.h. 
It's not needed, nor should it be used, anywhere else.
 2010-08-25 13:31:13 +09:00
Bill Currie
478394ef81 Nuke MAX_GAMEDIR_CALLBACKS 
The number of gamedir callbacks is now unlimited.
 2010-08-25 13:31:08 +09:00
Bill Currie
a51e888a1b Nuke MAX_OSPATH and clean up the mess. 2010-08-25 13:31:08 +09:00
Bill Currie
baede61f4f New function: dstring_strdup 
I got tired of always doing dstring_newstr/dstring_copy, so I thought it
was time to wrap it. dstring_strdup is the dstring equivalent of strdup.
 2010-08-25 13:31:00 +09:00
Bill Currie
5a6e66b23e hopefully, correct plugin linking options 
how we got away with this for so long is beyond me, but it seems libtool
really wants -rpath even for plugins (otherwise it refuses to install them)
 2010-08-21 13:01:35 +09:00
Bill Currie
2185a3dcd0 Remove almost all of my boxclip developement. 
This is to prevent others accidently getting headaches from my code.
 2010-08-20 14:13:23 +09:00