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

1425 commits

Author SHA1 Message Date
Bill Currie
8184c546db [vulkan] Fix dereference for non-pointer aliases 
Fixes breakage for uint32_t for array/single handling.
 2020-07-17 00:24:41 +09:00
Bill Currie
79177e96e8 [vulkan] Start work on scripted pipeline 
Nothing is actually done yet other than parsing the built-in property
list to property list items (the actual parser is just a skeleton), but
everything compiles
 2020-07-16 22:14:19 +09:00
Bill Currie
0945f30731 [vulkan] Use a property list to drive code gen 
The property list specifies the base structures for which parser code
will be generated (along with any structures and enums upon which those
structures depend). It also defines option specialized parsers for
better control.
 2020-07-05 16:53:35 +09:00
Bill Currie
e4ee5c70e0 [vulkan] Rework vkgen alias handling 
This is much cleaner and now that all the types are there properly,
doing a parser generator should be easier.
 2020-07-05 16:53:35 +09:00
Bill Currie
2ca9f80d56 [vulkan] Split up vkgen 
It worked as a proof of concept, but as the code itself needs to be a
bit smarter, it would be a lot smarter to break up that code to make it
easier to work on the individual parts.
 2020-07-05 16:53:35 +09:00
Bill Currie
cf3262991d [vulkan] Add a tool for making vulkan enum tables 
The tables are generated from the enums pulled out of the vulkan headers
using a ruamoko program (thanks to its reflection capabilities). They
will be used for parsing property lists used to create render passes and
pipelines.
 2020-06-28 19:08:18 +09:00
Bill Currie
19c75f5e49 [vulkan] Clean up QFV_CreateFramebuffer's prototype 
It now takes qfv_imageviewset_t instead of separate count and
VkImageView array.
 2020-06-28 13:53:11 +09:00
Bill Currie
c1ffb05b87 Remove dead Makefile.am 
Forgot this in the merge.
 2020-06-25 16:14:39 +09:00
Bill Currie
86b5b30b45 Merge branch 'master' into vulkan 2020-06-25 14:03:52 +09:00
Bill Currie
6d5ffa9f8e [build] Move to non-recursive make 
There's still some cleanup to do, but everything seems to be working
nicely: `make -j` works, `make distcheck` passes. There is probably
plenty of bitrot in the package directories (RPM, debian), though.

The vc project files have been removed since those versions are way out
of date and quakeforge is pretty much dependent on gcc now anyway.

Most of the old Makefile.am files  are now Makemodule.am.  This should
allow for new Makefile.am files that allow local building (to be added
on an as-needed bases).  The current remaining Makefile.am files are for
standalone sub-projects.a

The installable bins are currently built in the top-level build
directory. This may change if the clutter gets to be too much.

While this does make a noticeable difference in build times, the main
reason for the switch was to take care of the growing dependency issues:
now it's possible to build tools for code generation (eg, using qfcc and
ruamoko programs for code-gen).
 2020-06-25 11:35:37 +09:00
Bill Currie
4cef9792f4 [util] Make hash-tables semi-thread-safe 
They take a pointer to a free-list used for hashlinks so the hashlink
pools can be per-thread. However, hash tables that are not updated are
always thread-safe, so this affects only updates. progs_t has been set
up such that it is easy for multiple progs within one thread can share
hashlinks.
 2020-03-25 15:43:16 +09:00
Bill Currie
ad175d054b Sanitize pipelines 
wow, talk about doing things the wrong way. I guess that's the problem
with following a book targeted for C++: you get all that safety-goat
nonsense.
 2020-02-18 22:38:01 +09:00
Bill Currie
264c4ccdac Sanitize descriptors 
I'm sure it will end soon, I think pipelines is the end of it.
 2020-02-18 21:18:03 +09:00
Bill Currie
c740dea212 Use the correct constant for "infinity" 2020-02-18 19:44:40 +09:00
Bill Currie
0a0035e5e5 Use the render pass to clear the window 
Very satisfying to get to this point.
 2020-02-18 17:48:22 +09:00
Bill Currie
ba654b09f7 Create and destroy render pass and frame buffers 2020-02-18 17:18:37 +09:00
Bill Currie
1f4c019abc Create and destroy color/depth resources 2020-02-18 14:28:28 +09:00
Bill Currie
89d48b5650 Output first pixels 
Just clearing the screen to 0xbada55, but the validation layer is quiet.
 2020-02-18 01:03:36 +09:00
Bill Currie
73fde40cad Sanitize some more structs 2020-02-17 23:30:25 +09:00
Bill Currie
94565c2382 Rework much of the Vulkan array handling 
So much for all those little wrappers hiding the device. Some survived,
but mostly just the bigger things like device, swapchain, etc.
 2020-02-17 20:29:35 +09:00
Bill Currie
916e57de37 Get the swapchain image switching sort of working 
The render pass isn't set up yet, so the validation layer is having a
fit, but cycling through the swapchain images does seem to be working.
 2020-02-17 00:50:39 +09:00
Bill Currie
ce72135e70 Fix incorrect init of command buffer set 2020-02-17 00:10:59 +09:00
Bill Currie
4b152a4492 Rework semaphore sets 2020-02-17 00:10:32 +09:00
Bill Currie
559bd2e636 Create command pool and frame timing fences 
Nothing is actually done yet, so the reported fps is around 172k (yes,
k), but startup and shutdown seems to be clean (yay validation layers).
 2020-02-16 22:45:27 +09:00
Bill Currie
b947cc1791 Rework command buffer and fence-set management 
I found command buffer handling to be totally redundant and fence-set
management to be a bit awkward.
 2020-02-16 22:43:57 +09:00
Bill Currie
d56f88f779 Implement swapchain image acquisition 2020-02-15 17:56:02 +09:00
Bill Currie
53b46f0541 Implement pipeline stuff 2020-02-13 04:21:35 +09:00
Bill Currie
69c110193a Fix a thinko 
Wrong var for computing number of slots used.
 2020-02-13 04:20:54 +09:00
Bill Currie
61036378e2 Implement render pass stuff 2020-02-12 18:55:51 +09:00
Bill Currie
44f5b134e6 Free custom descriptor structs 
Forgot this earlier
 2020-02-12 18:55:22 +09:00
Bill Currie
85a2f9f621 Implement descriptor stuff 2020-02-12 16:36:01 +09:00
Bill Currie
6e96b91aa1 Fix a couple more optimization warnings 2020-02-11 15:59:12 +09:00
Bill Currie
3144443a82 Allow vulkan_draw to compile when optimizing 
Even though it's nowhere near done
 2020-02-11 12:19:16 +09:00
Bill Currie
29b1d6baf8 Finish up memory stuff 
For now, of course.
 2020-02-11 09:37:04 +09:00
Bill Currie
1baee0cbba Implement mem mapping and buffer/image copying 2020-02-10 20:42:19 +09:00
Bill Currie
43e37aa31e Separate out the generic memory stuff 2020-02-10 18:33:29 +09:00
Bill Currie
9fdc15c439 Implement image stuff up to view creation 2020-02-10 18:18:37 +09:00
Bill Currie
f4c0d0ebcf Implement buffer view creation 
And rename memory allocation as it's buffer-specific.
 2020-02-10 18:17:58 +09:00
Bill Currie
2f9ad73f78 Implement buffer memory up to barriers 
Still lots to go (views, destruction, transfer...) and I'm uncertain
about the location of the pipeline barrier function.
 2020-02-10 15:07:35 +09:00
Bill Currie
8148f256f5 Rework object device caching 
It turned out I needed access to the physical device from a buffer
object, so rather than storing the vulkan logical device directly in
buffer (and other) objects, store the qfv logical device.
 2020-02-07 11:45:05 +09:00
Bill Currie
d3b4e4653e Cache physical devices in the instance 2020-02-06 19:04:28 +09:00
Bill Currie
8819d26c95 Fix a compile error 
not sure how that one got through
 2019-10-16 20:57:39 +09:00
Bill Currie
4957c4f31a Implement the rest of the command stuff 2019-07-23 13:05:32 +09:00
Bill Currie
a165d67dfa Add a queue type 2019-07-23 12:37:47 +09:00
Bill Currie
411b897f09 Implement most of the stuff for command submission 2019-07-23 12:28:57 +09:00
Bill Currie
1f24a1408a Destroy the surface 2019-07-13 01:20:02 +09:00
Bill Currie
dd1c2db249 Clean up the swapchain 
And be a little safer about it
 2019-07-13 01:14:21 +09:00
Bill Currie
b4dc746a66 Clean up the debug callback 2019-07-13 01:11:34 +09:00
Bill Currie
1eafc33052 Ensure vulkan gets shut down 2019-07-13 00:36:21 +09:00
Bill Currie
b2e12d701b Fix up swapchain creation 
Things are working again.
 2019-07-12 14:09:42 +09:00
Bill Currie
66e7336b62 Initialize device extension checks early 
They need to be initialized before attempting to load the function
pointers.
 2019-07-12 13:37:30 +09:00
Bill Currie
75f19f7243 Completely rework the vulkan related api 
Things don't work yet, but this feels much cleaner.
 2019-07-12 13:34:31 +09:00
Bill Currie
b5828bc2ce Output validation message severity 
It's nice knowing if something is an error or otherwise.
 2019-07-11 00:58:37 +09:00
Bill Currie
c0bc5cfad6 Implement swapchain creation 2019-07-11 00:58:14 +09:00
Bill Currie
2771e9c573 Correct extension handling 
I had missed a critical bit from the cookbook.
 2019-07-10 13:16:46 +09:00
Bill Currie
ed3c5cb9ec Add a strset "class" 
It's just a wrapper around hashtab, but it makes checking if a string is
in a set easy. Way overkill when only a few extensions are enabled, but
more might come later.
 2019-07-10 13:09:16 +09:00
Bill Currie
3191604641 Uncomment already implemented functions 2019-07-09 21:07:59 +09:00
Bill Currie
8a3cd224a3 Add vulkan developer flag 2019-07-09 20:14:30 +09:00
Bill Currie
68449d0f6f Create a window and a surface for vulkan 
Yay, segfaults in R_Init :)
 2019-07-09 16:33:44 +09:00
Bill Currie
0f511e8342 Move the string list funcs to their own file 
They're not (at this stage, at least) worthy of being promoted out to
the utils lib.
 2019-07-09 14:24:55 +09:00
Bill Currie
b3d982bfc3 Remove global vulkan_ctx 
While I can't say that I'm happy with the details of vulkan_ctx_t, I am
pretty sure I don't want to be limited to having only one.
 2019-07-09 11:54:23 +09:00
Bill Currie
707bdfc5f2 Get vulkan back to where it was 2019-07-09 09:06:35 +09:00
Bill Currie
8ee06d75a9 Separate render and presentation initialization 
This paves the way for clean initialization of the Vulkan renderer, and
very much cleans up the older renderer initialization code as gl and sw
are no longer intertwined.
 2019-07-09 01:00:47 +09:00
Bill Currie
cb10175824 Pass vid_internal to R_LoadModule 
This fixes the segfault and pushes things very much in the desired
direction of proper system independence for rendering and presentation
separation (though things were headed in the right direction before).
 2019-07-08 14:04:03 +09:00
Bill Currie
6ee2df8445 Move vid callbacks into vid_internal 
Currently segfaults because viddef is an alias for *r_data->vid, which
has not yet been initialized (chicken and egg).
 2019-07-08 13:40:29 +09:00
Bill Currie
6137795682 Use deep binding for the vulkan loader 
This fixes the problem with using vkGetInstanceProcAddr to find global
vulkan functions.
 2019-07-07 16:48:53 +09:00
Bill Currie
7137d61c36 Add some extensions needed for presentation 2019-07-07 16:27:55 +09:00
Bill Currie
a755e50c84 Clean up vid access a little 
Things are still a mess, but a proper cleanup will be a lot of work and
will, really, involve properly splitting quake-specific code* out from
the rest of the renderer.

* data loading and format specific stuff
 2019-07-07 15:38:29 +09:00
Bill Currie
d95e9f9af3 Correct vulkan plugin strings 2019-07-07 14:59:20 +09:00
Bill Currie
77afc30486 Fix vid renderer plugin types 
I guess that plugin type is currently not checked, otherwise I doubt the
mistake would have gone unnoticed.
 2019-07-07 14:57:56 +09:00
Bill Currie
940ef833ae Shutdown Vulkan properly 
Well, as properly as can be considering how little is started up :P
 2019-07-07 14:34:02 +09:00
Bill Currie
ab08e4f207 Create a logical device with a single queue 
A single graphics-capable queue should be enough for now. However, I'm
not sure I'm happy with a lot of the code: it's a bit difficult to write
flexibly configured code for Vulkan (or seems to be at this stage),
especially in C.
 2019-07-07 01:28:05 +09:00
Bill Currie
2bc78e7f0a Start work on a Vulkan-based renderer 
Doesn't do much other than create an instance and enumerate some stuff,
but the build system is working.
 2019-07-06 14:56:15 +09:00
Bill Currie
f58c2fef5a Switch QF's quaterions from wxyz to xyzw. 
After messing with SIMD stuff for a little, I think I now understand why
the industry went with xyzw instead of the mathematical wxyz. Anyway, this
will make for less pain in the future (assuming I got everything).
 2018-10-12 14:33:55 +09:00
Bill Currie
34bcf7faab Do a pure/const/noreturn/format attribute pass. 
I always wanted these, but as gcc now provides warnings for functions that
could do with such attributes, finding all the functions is much easier.
 2018-10-09 12:42:21 +09:00
Bill Currie
db3df6f8a7 Fix a bunch of dead increments. 2018-09-09 11:12:04 +09:00
Bill Currie
3f638d95ba Remove a possibly spurious break. 
I'm not certain despair actually meant for the break to be there. It
certainly would have sped up the game a bit but at the expense of proper
blood trails in the software renderers.
 2018-09-09 10:54:38 +09:00
Bill Currie
62793b2dc2 Fix some potentially garbage assignments. 
These are the ones where I could easily make scan-build happy. They do seem
to be potential holes where invalid data in one place could result in use
of uninitialized values.
 2018-09-09 09:54:16 +09:00
Bill Currie
59e85b7d5e Fix a pile of dead assignments. 
Some were actual bugs!
 2018-09-08 22:23:57 +09:00
Bill Currie
8fd5be0ee0 Fix a pile of sizeof goofs. 
While scan-build wasn't what I was looking for, it has proven useful
anyway: many of the sizeof errors were just noise, but a few were actual
bugs (allocating too much or too little memory).
 2018-09-07 20:00:57 +09:00
Bill Currie
4f58429137 Fix an unhealthy pile of gcc 8 warnings. 
While some of the warnings were merely annoying, some where actual bugs or
unearthed bugs in related code.
 2018-08-20 00:05:00 +09:00
Bill Currie
bd52e46adf Merge branch 'master' into win 2016-01-22 01:10:49 +09:00
Johnny
d1a8c1b277 Color swizzle & software lighting fix 2014-02-03 16:20:54 +09:00
Bill Currie
d80342e0a8 Fix some compile errors from Johnny's patch. 
Turns out he has to compile without -Werror.
 2014-02-02 16:42:08 +09:00
Johnny
850382eed4 Fixes crashes when sw32_r_pixbytes is set to 2 or 4 2014-02-02 16:22:53 +09:00
Bill Currie
9d71d9bb7a Remove maxwarpwidth and maxwarpheight. 
Only the sw32 renderer even tried to use them, and they didn't get set
properly. This fixes JohnnyonFlame's waterwarp issue.
 2014-02-02 14:41:58 +09:00
Bill Currie
99678a571b Remove *.slc on make clean. 2014-01-28 16:26:24 +09:00
Bill Currie
3efb0c538f Separate file search from loading. 
QFS_LoadFile (and its wrappers) now  take a file handle rather than a
path. This will make vpath usage a little cleaner to implement.
 2014-01-28 16:22:05 +09:00
Bill Currie
4d59282641 Find the remaining vertex attribute order issues. 
I hope. I do need to figure out why I made sprite blend an attribute
rather than a uniform.
 2014-01-28 16:22:04 +09:00
Bill Currie
a5db0b1a65 Remove the now unnecessary GLSL_CompileShaderS(). 
Now that the transition to using shader effects is comlete, there's no
need for the wrapper.
 2014-01-28 16:22:04 +09:00
Bill Currie
57d2198140 Use the new shader system for iqm models. 2014-01-28 16:22:04 +09:00
Bill Currie
385175ca65 Use the new shader system for 2d drawing. 2014-01-28 16:22:04 +09:00
Bill Currie
c89e612cd4 Remove redundant fog and palette shader code. 2014-01-28 16:22:04 +09:00
Bill Currie
50bb40be29 Use the new shader system for sprites. 2014-01-28 16:22:04 +09:00
Bill Currie
68bd7e643d Remove the long dead text vertex shader. 2014-01-28 16:22:04 +09:00
Bill Currie
1d67f8f0c3 Use the new shader system for textured particles. 2014-01-28 16:22:04 +09:00
Bill Currie
1a7b532927 Use the new shader system for point particles. 2014-01-28 16:22:04 +09:00
Bill Currie
3af6a640fe Missed the old turb frag shader. 2014-01-28 16:22:04 +09:00
Bill Currie
a419fb2c92 Ensure the vertex coord attribute is attribute 0. 
It seems mesa still has the bug where non-array attributes don't work
when set as attribute 0, and that the allocation order changed sometime
since I last tested with mesa. This fixes the black world and flickering
alias models on my eeepc.
 2014-01-28 16:22:04 +09:00
Bill Currie
042d6e5728 Remove a couple of stale files. 
Missed these in the bsp related commit.
 2014-01-28 16:22:04 +09:00
Bill Currie
26fc0b74e6 Fix bsp water surfaces. 
Everything seems to be working for the bsp renderer.
 2014-01-28 16:22:04 +09:00
Bill Currie
f43592589d Use the new shader system in the bsp renderer. 
It mostly works. Skybox is untested, and water surfaces are broken.
 2014-01-28 16:22:04 +09:00
Bill Currie
b269338947 Start using the new shader system. 
So far, alias model rendering is the only victim, but things are working,
even if only color map lookup and fog blending are broken out at this
stage.

I expect the effect naming scheme will go through some changes until I'm
happy with it.
 2014-01-28 16:22:04 +09:00
Bill Currie
323fbe1927 Fix an allocation oopsie. 
I must have been tired when I wrote that line.
 2014-01-28 16:22:04 +09:00
Bill Currie
550f1ae788 Fix some bitrot. 
Just updating for the changes to the ALLOC/FREE macros.
 2014-01-28 16:22:03 +09:00
Bill Currie
96c40cb9a1 Add basic support for shader "effects". 
Again, based on The OpenGL Shader Wrangler. The wrangling part is not used
yet, but the shader compiler has been modified to take the built up shader.
Just to keep things compiling, a wrapper has been temporarily created.
 2014-01-28 16:22:03 +09:00
Bill Currie
f5501fbf24 Fix a pile of automake deprecation warnings. 
s/INCLUDES/AM_CPPFLAGS/g

I <3 sed :)
 2013-11-24 13:11:50 +09:00
Bill Currie
6288684fa2 Fix more gcc 4.8 errors. 
More actual bugs found, too.
 2013-09-27 23:09:37 +09:00
Bill Currie
88692f92d9 Fix the calls for Draw_Init in the gl renderers. 
While namehack.h took care of the symbol mangling, I do prefer the calls to
be correct as it reduces confusion.
 2013-05-09 17:58:33 +09:00
Bill Currie
6d7f747577 Add timerefresh to the glsl renderer. 
Also, tweak the formatting of the output for the other renderers (%g
instead of %f) and make gl's timerefresh output unconditional.
 2013-02-18 13:57:45 +09:00
Bill Currie
bc12567572 Clean out a leftover from the 128 dlight change. 
I'd missed a set of bit->lightnum conversions that resulting in lightnum
becoming much greater than 128 and thus trashing memory when the surface
was marked.
 2013-01-31 22:39:23 +09:00
Bill Currie
1740e14d2a Do a const-correctness run on palettes. 2013-01-27 19:57:40 +09:00
Bill Currie
40af4bb986 Make vid.width/height unsigned and clean up the mess. 2013-01-24 12:36:14 +09:00
Bill Currie
e27d7cbd2d Handle alloca "correctly". 
Use AC_FUNC_ALLOCA and the #ifdef mess suggested by the autoconf docs
(hidden in qfalloca.h).
 2013-01-22 21:02:50 +09:00
Bill Currie
f1aefc969d Fix some 64-bit mingw compile issues. 
Just one more issue to fix (alloca), but with a hack, QF compiles (no clue
yet if it works: wine doesn't seem to be an option at this stage)
 2013-01-22 21:02:49 +09:00
Bill Currie
cb45d248c4 Use the Mersenne Twister for particles. 
The seed is currently 0xdeadbeef, but I intend on fixing that soon. Now the
particle velocities and origins use fully independent bits (though a big
chunk is wasted right now).
 2013-01-21 20:06:54 +09:00
Bill Currie
3de67589a3 Fix random particle origin/velocity z component. 
This is a quick fix until I get a random number generator into QF.

Mingw's RAND_MAX is only 0x7fff and so the (((rnd >> 10) & 63) - 31.5) / 63.0
used for the z component of origin and velocity would never go positive.
For now, change the 10 to 9 (reusing another bit from Y). I plan on
implementing a full 32-bit PRNG in QF so we always have a reliable
generator.
 2013-01-21 14:53:13 +09:00
Bill Currie
3cb0f3e183 Remove viddef in favor of vid in the renderers. 
This fixes the status bar refresh issues in sw. The problem was that with
two viddef's hanging around, things got a little confused and recalc_refdef
wasn't getting into the renderer.
 2013-01-16 11:23:47 +09:00
Bill Currie
a05e7253e4 Force a full update when the fade screen is drawn. 2013-01-13 20:34:39 +09:00
Bill Currie
0c81364da8 Fix scr_copyeverything in gl and glsl. 
Now the gl renderers unconditionally set it to 1. This is required because
the screen is cleared every frame.
 2013-01-13 17:23:00 +09:00
Bill Currie
4a95f89760 Correct the handling of r_viewsize and lineadj. 
r_viewsize is meant to be clamped to 100, but not limit linadj.
 2013-01-13 16:53:22 +09:00
Bill Currie
86b95629cf Complete the move of some vars into vid_render_data. 
scr_fullupdate and scr_copyeverything were missed. Possibly others too, but
this is enough for the moment.
 2013-01-13 16:46:41 +09:00
Bill Currie
9c812f39ce Apply some wart remover. 
hungarian notation... *twitch*
 2013-01-13 16:07:11 +09:00
Bill Currie
82a6861233 Move the call to VID_Update out of the if blocks. 
This makes it obvious that VID_Update is unconditionally called when
SCR_UpdateScreen is called.
 2013-01-13 14:43:19 +09:00
Bill Currie
5bbb76194f Use stdlib.h instead of alloca.h. 
While the manpage does say alloca.h, that's not very portable, it seems.
stdlib.h seems to be better (at least for mingw, anyway)
 2013-01-10 21:54:37 +09:00
Bill Currie
751417ffb2 Rename R_RecursiveWorldNode to R_VisitWorldNodes. 
Finally, the name reflects its actual purpose.
 2013-01-07 19:59:49 +09:00
Bill Currie
a852eeb711 Remove the recursive versions of R_RecursiveWorldNode. 
They seem to not be needed any more.
 2013-01-07 19:57:21 +09:00
Bill Currie
9758302023 Fix sw and sw32's R_RecursiveWorldNode node stack. 
I guess I had forgotten to make the node stack dynamically allocated for
these renderers. Now ITS works in all four renderers.
 2013-01-07 19:51:36 +09:00
Bill Currie
43702580f5 Clear the texture element chain after drawing. 
It was properly cleared after drawing water chains and sky chains, but I
had missed normal surfaces. It took the use of the same texture for both
normal surfaces and water surfaces to trigger the bug. Thanks go to Simon
'Sock' O'Callaghan and his In The Shadows mod.
 2013-01-06 20:05:59 +09:00
Bill Currie
6eb6b6c0ba Change pointer_t to unsigned and clean up the mess. 
It doesn't make sense to have negative pointers. The size of the commit is
from enabling gcc's -Wtype-limits warning and cleaning up that mess too.
 2012-12-21 21:53:13 +09:00
Bill Currie
cb259823af Scale the glsl crosshairs to match gl. 2012-12-12 21:37:55 +09:00
Bill Currie
f71affdfba Use exact texture coords for 2d pics in glsl. 
Moving the texture coordinates in 1/4 pixel made a mess of the 2d pics
(very noticable on the round crosshair).
 2012-12-12 21:34:37 +09:00
Bill Currie
a372efee5c Add a new crosshair. 
Now all 4 slots of the crosshair table are used :)

Also, fix the offset for pic based crosshairs in glsl, and use just one
func for them.
 2012-12-12 19:36:50 +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
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
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
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
d6a1daaf30 Force a refdef update when nearclip or farclip change. 2012-08-29 09:55:17 +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
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
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
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
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
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
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
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
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
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
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
3406cad99a Many distcheck fixes. 
Yay, bitrot :P
 2012-06-29 10:49:21 +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
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
0fbaa2a88a Add sw32 support for iqm models. 
That was easy :)
 2012-05-20 14:23:41 +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
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
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
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
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
bea8f8f9c4 Fix a segfault when searching for dlights. 
Uninitialized var bites my bum :P
 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
42b87ee80c Fix the memory leak in rua Draw_CachePic. 2012-02-06 12:49:57 +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
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
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
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
df87cffe15 Start working on the new GL skin code. 2012-01-24 23:06:07 +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
08990ebb5a Make top/bottom color work for GLSL. 
Works quite nicely (love those colormaps).
 2012-01-23 19:24:12 +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
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
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
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
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
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
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
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
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
0993803006 Add texture sub-image management. 
The planned uses are lightmaps and 2d icons.
 2012-01-06 16:24:13 +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
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