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

9359 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
279ea340e5 Add the GLSL files to the headers list. 2011-12-26 16:33:15 +09:00
Bill Currie
067d3b3c2c Revert all the commits adding stuff to QF/GL. 
With the new QF/GLSL directory, I don't need (or want) them any more.
 2011-12-26 16:16:39 +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
4131a5998c Yet more functions. 
I really need to go through this properly.
 2011-12-26 10:12:30 +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
34d26a72cc More gl functions. 2011-12-26 07:48:27 +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
70abd33a25 Add GL 2.0 stuff. 2011-12-25 19:40:04 +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
59c621e0cf Move qfprogs from tools to qfcc (packaging). 2011-12-25 16:23:02 +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
a7ad6c03f5 Add some defines and functions I need for glsl. 
There will be more coming as I need them.
 2011-12-25 11:24:57 +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
ce8c2e717a Add some more vector/quat component macros. 2011-12-24 20:10:37 +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
890963423b Big cleanup of Host_Init. 
Eventually, all init functions will chain to their dependencies.
 2011-12-22 16:54:22 +09:00
Bill Currie
0086fee233 Rename host_skin.c to cl_skin.c. 
I don't know why I thost host was a good idea.
 2011-12-22 16:54:22 +09:00
Bill Currie
29306f7799 Merge nq and qw sv_phys.c 
sv_move and world are now identical between the two directories.
 2011-12-22 16:54:22 +09:00
Bill Currie
2bec1ae1d9 Make qw's push/block handing the same as nq's. 
NQ's handling seems to be more correct. The only likely problems are if
something is pushed into (eg) a button, and things will be a little slower.
 2011-12-22 16:54:22 +09:00
Bill Currie
3eb788b3f6 Make qw's SV_Push remove ONGROUND for non-players. 
This seems to have been an optimization for QW since standard qw removed
monsters. However, since there are QW mods that brought back monsters,
this should be an improvement.
 2011-12-22 16:54:22 +09:00
Bill Currie
d1be716031 Tidy up the corpse related code in SV_Push. 2011-12-22 16:54:22 +09:00
Bill Currie
4ade879674 Make SV_PushEntity easier to read. 2011-12-22 16:54:22 +09:00
Bill Currie
b54f0587d1 Bring qw's entity-in-solid check into nq's SV_Push. 2011-12-22 16:54:22 +09:00
Bill Currie
7243de0d90 Remove entorg from nq's SV_Push (). 
It's been redundant since the moved_* arrays came in.
 2011-12-22 16:54:22 +09:00
Bill Currie
64115d3331 Clean up sv_phys.c a little before merging. 
Add some comments and make the code a little more readable so I know
what's going on.
 2011-12-22 16:54:22 +09:00
Bill Currie
8b78aeb666 Add component-wise vector and quaternion comparison macros. 
Also, re-implement VectorCompare and QuatCompare using the new macros.

VectorCompCompare and QuatCompCompare take a parameter specifying the
comparison operator to use. All component-wise comparisons must be true
for the whole comparison to be true.
 2011-12-22 16:54:21 +09:00
Bill Currie
d441dc9027 Sort the cvar declarations. 
The diff is still messy, but now it includes only new/old cvars, not moved
cvars.
 2011-12-22 16:54:21 +09:00