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

3108 commits

Author SHA1 Message Date
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
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
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