qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 21:21:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
9772 commits 17 branches 20 tags 33 MiB
Commit graph

3783 commits

Author SHA1 Message Date
Bill Currie
7170a434ee Split out the trail adding code. 
This makes it easier to add multiple trails to one entity, or even better:
to add other types of trails.
 2016-01-25 20:12:48 +09:00
Bill Currie
71630caab8 Merge branch 'master' into trails 
Fix up the bitrot.
 2016-01-22 01:01:06 +09:00
Bill Currie
f163e35f21 Add a builtin to get keydown. 2016-01-10 13:33:05 +09:00
Bill Currie
1ea74c6269 Fix the gl skin segfault. 
This was caused by an out-by one error when setting up the skin: if cmap
was 0 then the gl_skin struct would be taken from index -1 of the array and
thus cause all sorts of grief.
 2016-01-04 22:04:39 +09:00
Bill Currie
9cb23ba67e Clean up some error messages. 
The contractions took the emphasis off where it needed to be.
 2016-01-04 16:12:36 +09:00
Bill Currie
aecea5c350 Document most of they key binding system. 2016-01-04 16:11:15 +09:00
Bill Currie
59f60d1ba7 Enable the Key_StringToKeynum builtin. 
I don't know why I didn't do it earlier other than lack of need.
 2016-01-04 16:10:22 +09:00
Bill Currie
7c16acf4aa Make Key_GetBinding take an imt instead of a name. 2016-01-04 16:06:48 +09:00
Bill Currie
546e333a3c Allow Sys_Error to be hooked. 
This makes debugging builtins that wrap normal functions a little easier by
giving a progs dump when such an error occurs.
 2016-01-03 23:04:00 +09:00
Bill Currie
735fcf68d5 Clean up usage of va_copy. 
AC_TYPE_VA_LIST is no longer necessary, and the code is easier to read.
 2016-01-03 21:16:23 +09:00
Bill Currie
2cbb7cb0c8 Remove a redundant va_start/va_end pair. 
Found while checking how many places use va_copy.
 2016-01-03 18:38:41 +09:00
Bill Currie
61c6a4b68e Include config.h in model tests. 
The gcc inlining changes made it necessary.
 2016-01-03 16:18:14 +09:00
Bill Currie
7b350b2a1b Indicate calls to builtins when tracing. 
This makes following progs traces a little easier.
 2016-01-03 16:13:59 +09:00
Bill Currie
331b054d4a Fix an inappropriate reuse of a variable. 
Using "ax"is for the joystick "var"iable is a bit confusing.
 2015-06-18 21:22:31 +09:00
Jeff Teunissen
890c83ff6e Fix crash in classic GL 
GL sometimes crashes when building skins. This probably isn't the correct
fix (finding the situation where fb->tex can become NULL despite fb being
non-null is), but it does kill the segfault. Luckily, this is git and this
commit can just be reverted when the real fix shows up. :)
 2014-10-16 13:45:39 -04:00
Bill Currie
d1f1375df5 Increase number of supported joystick buttons. 
Also fix a bug where despite supporting 32 buttons, only 18 were actually
supported, and a similar issue for the number of axes.

My saitek x52 has 34 buttons and 10 axes. Whee.
 2014-08-17 11:35:40 +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
f8b5fc2842 Use multi-octave simplex noise for the smoke trails. 
It looks ok-ish, but still needs a lot of work.
 2014-01-31 12:01:20 +09:00
Bill Currie
77fa66b2e8 Properly separate the two glsl files in C. 2014-01-31 12:00:19 +09:00
Bill Currie
4258f0408a Remove the version controls. 
They cause problems where they are. When I need them, all add them as
appropriate at the time.
 2014-01-31 11:59:07 +09:00
Bill Currie
bcb1049f88 Convert particle physics to a scripted system. 
The script format is the same as the console command-line, so no new
format :). The scripts are compiled to byte code and cached. They are
referenced by name (eg, "pt_fire"), though the names are likely to change.
It seems to work quite well and should prove to be a good basis for
scripting particle effects in general.
 2014-01-31 10:40:44 +09:00
Bill Currie
0057970e3c Build the chunk chain correctly. 
Losing all the middle chunks wasn't nice.
 2014-01-31 10:13:56 +09:00
Bill Currie
bb5f5dd334 Correct the spelling of Fragment. 2014-01-29 16:37:48 +09:00
Bill Currie
83aa5759a2 Split up the trail fragment shader. 
The barycentric shader is generally useful for debugging.
 2014-01-29 16:37:48 +09:00
Bill Currie
8310f2aeee Add Stefan Gustavson's glsl noise shaders. 2014-01-29 16:37:48 +09:00
Bill Currie
e60132a9b0 Add a copyright block to quakeforge.glsl 2014-01-29 16:37:48 +09:00
Bill Currie
299f305453 Update the trails code to use shader effects. 
Trails was actually the reason I started that project. This is just cleanup
after rebasing.
 2014-01-29 16:37:48 +09:00
Bill Currie
bb022bc4fc Reverse the trail vertex order. 
That webgl app was designed for GL's default of CCW for front faces, but
quake wants CW. Now the disable/enable of face culling isn't necessary.
 2014-01-29 16:37:48 +09:00
Bill Currie
1a06712405 Handle the singularities on the trail vectors. 
They're actually guaranteed for the first and last segments due to the
first and last points being duplicated in the buffer (simplifies design).
This also handles the rare case where a vector appears to go directly into
or out of the screen.

Everything works nicely if only one of n1 or n2 is 0, and for the very rare
case of both n1 and n2 being 0, then a final normal of 0 is reasonable.
 2014-01-29 16:37:48 +09:00
Bill Currie
2fbab084a1 Build and draw solid trails for rockets. 
And lava balls (handy test, actually).
 2014-01-29 16:37:48 +09:00
Bill Currie
bd3647d671 Put the trail frag shader into debug mode. 
This draws the wire-frame of the trail. Yay Florian Boesch.
 2014-01-29 16:37:48 +09:00
Bill Currie
ddf4ff871f Make the entity param to trail functions non-const. 
Needed for adding trails to entities.
 2014-01-29 16:37:48 +09:00
Bill Currie
ddd8885cd6 Start working on solid trails for smoke etc. 
The implementation is based on
http://codeflow.org/entries/2012/aug/05/webgl-rendering-of-solid-trails/

The shaders have been written and compile and link. The next step is to
generate some data for them.
 2014-01-29 16:37:48 +09:00
Bill Currie
946561ba44 Don't bail out prematurely when searching for files. 
This fixes the problem of not finding files without a .gz extension when
gzip support is enabled (most of my quake data is compressed, so it took a
while for me to notice the problem).
 2014-01-29 16:13:24 +09:00
Bill Currie
99678a571b Remove *.slc on make clean. 2014-01-28 16:26:24 +09:00
Bill Currie
ab3f554a0e Limit the search for lit and ent files. 
The search for these files will stop in the vpath that contains the .bsp
file to which they belong. This will prevent problems with
id1/maps/start.lit being used for shadows/maps/start.bsp.
 2014-01-28 16:22:05 +09:00
Bill Currie
8bea6a66ca Create _QFS_VOpenFile and QFS_VOpenFile. 
_QFS_VOpenFile is actually _QFS_FOpenFile reimplemented to take vpath start
and end parameters so the search can be limited. QFS_VOpenFile,
_QFS_FOpenFile, and QFS_FOpenFile are all wrappers for _QFS_VOpenFile.
 2014-01-28 16:22:05 +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
328b997843 Save the vpath in the model. 
This will be used for restricting searches for auxiliary model files.
 2014-01-28 16:22:05 +09:00
Bill Currie
83c47aacef Remove the stack loading from QFS_LoadFile. 2014-01-28 16:22:05 +09:00
Bill Currie
a561477274 Nuke QFS_LoadStackFile(). 
It was used in only one place and is really not necessary (these days,
anyway).
 2014-01-28 16:22:05 +09:00
Bill Currie
25a060f369 Remove the foundname param from _QFS_FOpenFile. 
It's now obsolete with qfs_foundfile.
 2014-01-28 16:22:05 +09:00
Bill Currie
576c73cf7c Replace qfs_file_from_pak with qfs_foundfile. 
This exposes the found name, vpath and in_pak status.
 2014-01-28 16:22:05 +09:00
Bill Currie
e5148493db Prepend qfs_ to file_from_pak. 
A little better name-spacing.
 2014-01-28 16:22:05 +09:00
Bill Currie
82ded3fbe5 Fix some bitrot resulting from a rebase. 2014-01-28 16:22:05 +09:00
Bill Currie
5560696a65 Fix some unused variables. 2014-01-28 16:22:05 +09:00
Bill Currie
4b18501b00 Fix an uninitialized variable. 2014-01-28 16:22:05 +09:00