]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
13 years agofix gl_rmain
Akari [Tue, 29 Mar 2011 09:01:30 +0000 (12:01 +0300)]
fix gl_rmain

13 years agoMerge branch 'master' into akari/irc
Akari [Tue, 29 Mar 2011 08:57:53 +0000 (11:57 +0300)]
Merge branch 'master' into akari/irc

Conflicts:
cl_particles.c
cl_video.c
gl_rmain.c
gl_rsurf.c
gl_textures.c
model_brush.c
r_shadow.c
r_shadow.h
r_sprites.c
screen.h
snd_main.c

13 years agohush some unrecognized SDL event type warnings
havoc [Tue, 29 Mar 2011 01:32:20 +0000 (01:32 +0000)]
hush some unrecognized SDL event type warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10981 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadded joy_axiskeyevents_deadzone cvar which makes the arrow key
havoc [Mon, 28 Mar 2011 23:00:30 +0000 (23:00 +0000)]
added joy_axiskeyevents_deadzone cvar which makes the arrow key
emulation far less sensitive

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10980 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomake sure collision cache parameter struct is the same every frame by
havoc [Mon, 28 Mar 2011 11:48:21 +0000 (11:48 +0000)]
make sure collision cache parameter struct is the same every frame by
using memset first

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10979 d7cf8633-e32d-0410-b094-e92efae38249

13 years agor_shadow_bouncegrid_particleintensity changed from 2 to 1 because it was
havoc [Mon, 28 Mar 2011 11:36:41 +0000 (11:36 +0000)]
r_shadow_bouncegrid_particleintensity changed from 2 to 1 because it was
overwhelming (still is quite bright...)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10978 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix some warnings
havoc [Mon, 28 Mar 2011 10:48:22 +0000 (10:48 +0000)]
fix some warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10977 d7cf8633-e32d-0410-b094-e92efae38249

13 years agorestore the active rtlights check in bouncegrid
havoc [Mon, 28 Mar 2011 10:47:53 +0000 (10:47 +0000)]
restore the active rtlights check in bouncegrid
memset the bouncegrid settings struct to make it consistently pass the
memcmp check even if some bytes are not set
improved bouncegrid dynamic mode size check to compare pixel count
rather than individual dimensions

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10976 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoremove check for active rtlights in bouncegrid because it was not
havoc [Mon, 28 Mar 2011 10:18:01 +0000 (10:18 +0000)]
remove check for active rtlights in bouncegrid because it was not
working

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10975 d7cf8633-e32d-0410-b094-e92efae38249

13 years agobetter detection of active rtlights in bouncegrid code
havoc [Mon, 28 Mar 2011 09:59:12 +0000 (09:59 +0000)]
better detection of active rtlights in bouncegrid code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10974 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodo not use light scissoring on deferred lighting mode, it often yields
havoc [Mon, 28 Mar 2011 07:16:34 +0000 (07:16 +0000)]
do not use light scissoring on deferred lighting mode, it often yields
strange artifacts on shadowless lights

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10973 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodisallow r_shadow_bouncegrid on renderpaths that do not support it
havoc [Mon, 28 Mar 2011 07:15:19 +0000 (07:15 +0000)]
disallow r_shadow_bouncegrid on renderpaths that do not support it

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10972 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadded r_shadow_bouncegrid_static cvar which makes a proper static mode
havoc [Mon, 28 Mar 2011 06:56:32 +0000 (06:56 +0000)]
added r_shadow_bouncegrid_static cvar which makes a proper static mode
and this is now the default, its framerate cost is very low and it makes
realtime world lighting look nicer, tweaked all relevant cvars for this
detect whether any lights warrant bouncegrid each frame - this means
that the cvar could be defaulted on and still do nothing when realtime
world lighting is turned off

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10971 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a crash in RSurf_DrawBatch_GL11_MakeFogColor
divverent [Sun, 27 Mar 2011 06:20:51 +0000 (06:20 +0000)]
fix a crash in RSurf_DrawBatch_GL11_MakeFogColor

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10970 d7cf8633-e32d-0410-b094-e92efae38249

13 years agolast commit was a bad fix - fix it correctly, preventing reliefmapping artifacts...
divverent [Sat, 26 Mar 2011 19:12:04 +0000 (19:12 +0000)]
last commit was a bad fix - fix it correctly, preventing reliefmapping artifacts on these pesky reflections

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10969 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a compile error in refractions
divverent [Sat, 26 Mar 2011 18:59:26 +0000 (18:59 +0000)]
fix a compile error in refractions

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10968 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix another dp_shadow2D call
divverent [Fri, 25 Mar 2011 21:39:02 +0000 (21:39 +0000)]
fix another dp_shadow2D call

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10967 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix some GLSL warnings
havoc [Fri, 25 Mar 2011 21:32:17 +0000 (21:32 +0000)]
fix some GLSL warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10966 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoprevent crashes on BIH code
havoc [Fri, 25 Mar 2011 21:11:04 +0000 (21:11 +0000)]
prevent crashes on BIH code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10965 d7cf8633-e32d-0410-b094-e92efae38249

13 years agospeed up packet loss handling by changing EntityFrame5_LostFrame from O(states^2...
divverent [Fri, 25 Mar 2011 20:57:26 +0000 (20:57 +0000)]
speed up packet loss handling by changing EntityFrame5_LostFrame from O(states^2*edictsperstate^2) to O(MAX_EDICTS + states*edictsperstate)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10964 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoAdd R_LightPoint which is fast version of R_CompleteLightPoint that only grabs ambien...
vortex [Thu, 24 Mar 2011 23:13:40 +0000 (23:13 +0000)]
Add R_LightPoint which is fast version of R_CompleteLightPoint that only grabs ambient color to use with litsprites and particles. Fix bug in R_CompleteLightPoint (RTWORLD and DYNLIGHT wasnt processed if LP_LIGHTMAP flag is there). New trick for SPR_OVERHEAD (a bit of additional rotation).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10963 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomake the endless loop run in 3 milliseconds (fixes BIH TracePoint)
divverent [Wed, 23 Mar 2011 20:09:21 +0000 (20:09 +0000)]
make the endless loop run in 3 milliseconds (fixes BIH TracePoint)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10962 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix PRVM error and warning backtrace display
divverent [Wed, 23 Mar 2011 19:57:52 +0000 (19:57 +0000)]
fix PRVM error and warning backtrace display

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10961 d7cf8633-e32d-0410-b094-e92efae38249

13 years agowe need one more glsl 130 compat ifdef...
divverent [Wed, 23 Mar 2011 10:36:16 +0000 (10:36 +0000)]
we need one more glsl 130 compat ifdef...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10960 d7cf8633-e32d-0410-b094-e92efae38249

13 years agochanged default r_useportalculling from 1 to 2, this forces use of it on
havoc [Tue, 22 Mar 2011 21:44:18 +0000 (21:44 +0000)]
changed default r_useportalculling from 1 to 2, this forces use of it on
vised maps, because although it only gives minor gains (and sometimes
minor losses) in quake maps, it gives substantial gains in outdoor maps,
particularly when viewed from overhead, such as in steelstorm

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10959 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoGLSL shader: make dp_waterscroll work with dp_reflect and dp_refract
vortex [Tue, 22 Mar 2011 15:15:59 +0000 (15:15 +0000)]
GLSL shader: make dp_waterscroll work with dp_reflect and dp_refract

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10958 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoenable another AABB overlap check, this time on point tests
havoc [Mon, 21 Mar 2011 07:10:16 +0000 (07:10 +0000)]
enable another AABB overlap check, this time on point tests

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10957 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoincreased bih traceline speed by nearly 50% by enabling an additional
havoc [Mon, 21 Mar 2011 07:08:25 +0000 (07:08 +0000)]
increased bih traceline speed by nearly 50% by enabling an additional
AABB overlap check

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10956 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoBIH building and recursion no longer directly links leaf nodes into the
havoc [Mon, 21 Mar 2011 06:57:28 +0000 (06:57 +0000)]
BIH building and recursion no longer directly links leaf nodes into the
hierarchy, they are only used by unordered children group nodes
changed BIH_MAXUNORDEREDCHILDREN to 8 and removed
mod_collision_bih_childrengrouping cvar because this seems to be the
optimal value (values up to 16 sometimes yield minor gains but not
consistent)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10955 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadded mod_collision_bih_childrengrouping cvar (default 16), this
havoc [Mon, 21 Mar 2011 06:14:02 +0000 (06:14 +0000)]
added mod_collision_bih_childrengrouping cvar (default 16), this
accelerates BIH traces by using a shallower tree

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10954 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix some disabled code so that it could compile again
havoc [Mon, 21 Mar 2011 06:11:48 +0000 (06:11 +0000)]
fix some disabled code so that it could compile again

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10953 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoswap out some _mm_stream_ps usage
eihrul [Sun, 20 Mar 2011 21:17:01 +0000 (21:17 +0000)]
swap out some _mm_stream_ps usage

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10952 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix GL20TU list for deluxemapping
divverent [Sun, 20 Mar 2011 19:44:49 +0000 (19:44 +0000)]
fix GL20TU list for deluxemapping

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10951 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodeluxemapping support for dpsoftrast
divverent [Sun, 20 Mar 2011 17:31:23 +0000 (17:31 +0000)]
deluxemapping support for dpsoftrast

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10950 d7cf8633-e32d-0410-b094-e92efae38249

13 years agosaturated bloom subtract
eihrul [Sun, 20 Mar 2011 16:00:58 +0000 (16:00 +0000)]
saturated bloom subtract

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10949 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix post-process shader using invalid texcoord array
eihrul [Sun, 20 Mar 2011 15:23:27 +0000 (15:23 +0000)]
fix post-process shader using invalid texcoord array

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10948 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix row order of screen to texture copies
eihrul [Sun, 20 Mar 2011 14:32:43 +0000 (14:32 +0000)]
fix row order of screen to texture copies

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10947 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix some redundant shuffles
eihrul [Sun, 20 Mar 2011 14:14:47 +0000 (14:14 +0000)]
fix some redundant shuffles

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10946 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomake it easier to benchmark steelstorm by stopping video playback when
havoc [Sun, 20 Mar 2011 13:32:18 +0000 (13:32 +0000)]
make it easier to benchmark steelstorm by stopping video playback when
a serverinfo packet is received, and ignoring attempts to connect to a
server when -benchmark is used

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10945 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodefault vid_netwmfullscreen to 0 again because it doesn't work with
havoc [Sat, 19 Mar 2011 23:41:58 +0000 (23:41 +0000)]
default vid_netwmfullscreen to 0 again because it doesn't work with
XVideMode, and XRandR isn't implemented yet

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10944 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadded r_usesurfaceculling cvar which defaults on, this new code reduces
havoc [Sat, 19 Mar 2011 22:36:02 +0000 (22:36 +0000)]
added r_usesurfaceculling cvar which defaults on, this new code reduces
the number of surfaces drawn each frame, which is not always a speed
gain but is usually helpful

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10943 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadd "r_fog_clear" cvar which allows to disable framebuffer clearing to fog color...
vortex [Sat, 19 Mar 2011 22:13:11 +0000 (22:13 +0000)]
add "r_fog_clear" cvar which allows to disable framebuffer clearing to fog color (helps to fix bad borders on water reflections if fog is used), still, some old maps may want r_fog_clear = 1

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10942 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix an array index out of bounds error on
havoc [Sat, 19 Mar 2011 21:47:01 +0000 (21:47 +0000)]
fix an array index out of bounds error on
SHADERSTATICPARM_VERTEXTEXTUREBLEND_USEBOTHALPHAS

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10941 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a syntax error in the non-glsl13 case
divverent [Sat, 19 Mar 2011 21:03:09 +0000 (21:03 +0000)]
fix a syntax error in the non-glsl13 case

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10940 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoremove CRLFs added by last commit
divverent [Sat, 19 Mar 2011 21:02:35 +0000 (21:02 +0000)]
remove CRLFs added by last commit

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10939 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoAdded JAM video decoder plugin, used by Blood Omnicide
vortex [Sat, 19 Mar 2011 20:47:35 +0000 (20:47 +0000)]
Added JAM video decoder plugin, used by Blood Omnicide

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10938 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoAdd "Both Alphas" technique for VertexTextureBlend (use both layer alpha's for microb...
vortex [Sat, 19 Mar 2011 20:26:54 +0000 (20:26 +0000)]
Add "Both Alphas" technique for VertexTextureBlend (use both layer alpha's for microblending), toggled globally by "r_glsl_vertextextureblend_usebothalphas" cvar.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10937 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoAdd "originscale" parameter to r_editlights (may be useful if map was scaled)
vortex [Sat, 19 Mar 2011 20:24:43 +0000 (20:24 +0000)]
Add "originscale" parameter to r_editlights (may be useful if map was scaled)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10936 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodynamically grow maxtempentities
vortex [Sat, 19 Mar 2011 20:23:39 +0000 (20:23 +0000)]
dynamically grow maxtempentities

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10935 d7cf8633-e32d-0410-b094-e92efae38249

13 years agouse vid_netwmfullscreen 1 by default (yes I know auto-detection is not
havoc [Sat, 19 Mar 2011 18:50:30 +0000 (18:50 +0000)]
use vid_netwmfullscreen 1 by default (yes I know auto-detection is not
coded, but xorg supports it so I don't really care...)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10934 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadd -maxtempents switch to increase starting 256/4000 tempentities limit.
vortex [Sat, 19 Mar 2011 17:37:07 +0000 (17:37 +0000)]
add -maxtempents switch to increase starting 256/4000 tempentities limit.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10933 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodefine GLSL version explicitly to work around a problem with ATI/AMD drivers not...
divverent [Sat, 19 Mar 2011 15:44:19 +0000 (15:44 +0000)]
define GLSL version explicitly to work around a problem with ATI/AMD drivers not getting __VERSION__ right (?)

From: Maik Merten <maikmerten@googlemail.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10932 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a possible glsl compile error (no idea why it didn't throw any yet, weird cpp...
divverent [Sat, 19 Mar 2011 12:47:55 +0000 (12:47 +0000)]
fix a possible glsl compile error (no idea why it didn't throw any yet, weird cpp on nvidia?)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10931 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoturn "assignment to world" from dprint into warning (so backtraces can work)
divverent [Sat, 19 Mar 2011 12:23:09 +0000 (12:23 +0000)]
turn "assignment to world" from dprint into warning (so backtraces can work)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10930 d7cf8633-e32d-0410-b094-e92efae38249

13 years agonew con_closeontoggleconsole logic:
divverent [Fri, 18 Mar 2011 11:03:31 +0000 (11:03 +0000)]
new con_closeontoggleconsole logic:

1 now only works at the start of the line, for all toggleconsole keys
2 works anywhere, if the key is not ^
3 works anywhere, even if the key is ^

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10929 d7cf8633-e32d-0410-b094-e92efae38249

13 years agochange default r_shadow_deferred_8bitrange to 4 to reduce saturating
havoc [Thu, 17 Mar 2011 17:52:31 +0000 (17:52 +0000)]
change default r_shadow_deferred_8bitrange to 4 to reduce saturating
artifacts in common usage

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10928 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofixes for GLSL syntax errors in the deferred geometry shader
havoc [Thu, 17 Mar 2011 17:34:47 +0000 (17:34 +0000)]
fixes for GLSL syntax errors in the deferred geometry shader

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10927 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoavoid a crash when creating model decals if RSurf_ActiveModel does not
havoc [Thu, 17 Mar 2011 16:50:33 +0000 (16:50 +0000)]
avoid a crash when creating model decals if RSurf_ActiveModel does not
produce normals (why not?)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10926 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadded r_shadow_bouncegrid_directionalshading cvar, if enabled this uses
havoc [Mon, 14 Mar 2011 12:34:49 +0000 (12:34 +0000)]
added r_shadow_bouncegrid_directionalshading cvar, if enabled this uses
a much larger texture to store first-order spherical harmonics data
(average color and directional gradients) for bumpmapped diffuse shading
which also reduces light-bleed issues on thin walls

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10925 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a crash on r_restart related to collision caching
havoc [Mon, 14 Mar 2011 12:29:33 +0000 (12:29 +0000)]
fix a crash on r_restart related to collision caching

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10924 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoimproved vid_touchscreen - it now adapts to screen shape (using
havoc [Mon, 14 Mar 2011 08:43:27 +0000 (08:43 +0000)]
improved vid_touchscreen - it now adapts to screen shape (using
corner-relative values) and is compatible with mouse input for testing

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10923 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadd cvars r_glsl_offsetmapping_steps and r_glsl_offsetmapping_reliefmapping_steps
divverent [Sun, 13 Mar 2011 18:08:47 +0000 (18:08 +0000)]
add cvars r_glsl_offsetmapping_steps and r_glsl_offsetmapping_reliefmapping_steps

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10922 d7cf8633-e32d-0410-b094-e92efae38249

13 years agohuge glsl change: avoid #defining reserved keywords
divverent [Sun, 13 Mar 2011 17:19:32 +0000 (17:19 +0000)]
huge glsl change: avoid #defining reserved keywords

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10921 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix some warnings in the shader
divverent [Sun, 13 Mar 2011 17:19:24 +0000 (17:19 +0000)]
fix some warnings in the shader

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10920 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoproperly detect glsl 1.3 support
divverent [Sun, 13 Mar 2011 17:19:18 +0000 (17:19 +0000)]
properly detect glsl 1.3 support

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10919 d7cf8633-e32d-0410-b094-e92efae38249

13 years agobetter support non-GLSL130 in offsetmapping
divverent [Sun, 13 Mar 2011 14:21:35 +0000 (14:21 +0000)]
better support non-GLSL130 in offsetmapping

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10918 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoreduced number of varying variables required in a certain case in
havoc [Sun, 13 Mar 2011 10:43:03 +0000 (10:43 +0000)]
reduced number of varying variables required in a certain case in
steelstorm by 1, to bring the shader within limits of older cards

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10917 d7cf8633-e32d-0410-b094-e92efae38249

13 years agor_shadow_bouncegrid now uses floats for accumulating photons, to allow
havoc [Sun, 13 Mar 2011 10:23:00 +0000 (10:23 +0000)]
r_shadow_bouncegrid now uses floats for accumulating photons, to allow
higher photon counts without issues
minor optimization to r_shadow_bouncegrid pixel conversion (now does a
batch conversion on the array rather than on each photon contribution)
removed r_shadow_bouncegrid_nolerpsplat cvar to reduce code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10916 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix an HLSL warning
havoc [Sun, 13 Mar 2011 07:39:13 +0000 (07:39 +0000)]
fix an HLSL warning

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10915 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a typo (Fogcolor should be FogColor)
havoc [Sun, 13 Mar 2011 07:23:48 +0000 (07:23 +0000)]
fix a typo (Fogcolor should be FogColor)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10914 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix offset/reliefmapping by using the proper miplevel - NOTE: this makes use of a...
divverent [Sat, 12 Mar 2011 20:46:27 +0000 (20:46 +0000)]
fix offset/reliefmapping by using the proper miplevel - NOTE: this makes use of a GLSL 1.30 function in offsetmapping, non-GLSL 1.30 drivers will have to degrade

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10913 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoslight speedup to collision_cache by using individual field compares
havoc [Sat, 12 Mar 2011 14:42:17 +0000 (14:42 +0000)]
slight speedup to collision_cache by using individual field compares
rather than memcmp

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10912 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoredesigned most of collision_cache code, cleaner and faster
havoc [Sat, 12 Mar 2011 14:01:11 +0000 (14:01 +0000)]
redesigned most of collision_cache code, cleaner and faster

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10911 d7cf8633-e32d-0410-b094-e92efae38249

13 years agosignificant speed gain on collision_cache 1 by tweaking some numbers
havoc [Sat, 12 Mar 2011 10:56:44 +0000 (10:56 +0000)]
significant speed gain on collision_cache 1 by tweaking some numbers

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10910 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoreduce number of varying variables required in shaders by 1
havoc [Sat, 12 Mar 2011 05:40:32 +0000 (05:40 +0000)]
reduce number of varying variables required in shaders by 1

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10909 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix two C++ errors
havoc [Fri, 11 Mar 2011 22:56:02 +0000 (22:56 +0000)]
fix two C++ errors

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10908 d7cf8633-e32d-0410-b094-e92efae38249

13 years agocache collision trace results from frame to frame
havoc [Fri, 11 Mar 2011 10:12:14 +0000 (10:12 +0000)]
cache collision trace results from frame to frame
increased r_shadow_bouncegrid_photons from 2000 to 5000 (same
performance, thanks to the collision cache)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10907 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoactually the culling in
havoc [Wed, 9 Mar 2011 09:25:55 +0000 (09:25 +0000)]
actually the culling in
Mod_Q1BSP_TraceLineAgainstSurfacesFindTextureOnNode is a slight speed
loss compared to having it entirely disabled...  so disable it.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10906 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofixed a flaw in the culling in
havoc [Wed, 9 Mar 2011 09:13:52 +0000 (09:13 +0000)]
fixed a flaw in the culling in
Mod_Q1BSP_TraceLineAgainstSurfacesFindTextureOnNode which was preventing
culling from working in most cases, minor speed gain

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10905 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofixed bug with toggling r_shadow_bouncegrid where the texture binding
havoc [Mon, 7 Mar 2011 20:53:53 +0000 (20:53 +0000)]
fixed bug with toggling r_shadow_bouncegrid where the texture binding
state was incorrect, causing bouncegrid to not work after being toggled
once

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10904 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a warning about an unsigned array on ios
havoc [Sun, 6 Mar 2011 20:59:46 +0000 (20:59 +0000)]
fix a warning about an unsigned array on ios

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10903 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoimprove the evaluation script
divverent [Sun, 6 Mar 2011 19:21:05 +0000 (19:21 +0000)]
improve the evaluation script

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10902 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadd a hack to support fog on premultiplied alpha surfaces too
divverent [Sun, 6 Mar 2011 18:42:35 +0000 (18:42 +0000)]
add a hack to support fog on premultiplied alpha surfaces too

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10901 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix fog/colormodability evaluation
divverent [Sun, 6 Mar 2011 18:25:02 +0000 (18:25 +0000)]
fix fog/colormodability evaluation

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10900 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix fog for GL_SRC_ALPHA GL_ONE
divverent [Sun, 6 Mar 2011 17:36:37 +0000 (17:36 +0000)]
fix fog for GL_SRC_ALPHA GL_ONE

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10899 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix drawclipsetarea in D3D9, this fixes the minimap in steelstorm and also the menu...
havoc [Sun, 6 Mar 2011 17:28:14 +0000 (17:28 +0000)]
fix drawclipsetarea in D3D9, this fixes the minimap in steelstorm and also the menu scrolling

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10898 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadded shader_glsl.h and shader_hlsl.h to the project files
havoc [Sun, 6 Mar 2011 17:27:39 +0000 (17:27 +0000)]
added shader_glsl.h and shader_hlsl.h to the project files

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10897 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoalso turn off fog on blendfuncs that cannot handle it
divverent [Sun, 6 Mar 2011 15:51:39 +0000 (15:51 +0000)]
also turn off fog on blendfuncs that cannot handle it

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10896 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomove glsl/default.glsl embedded file out to its own header file
havoc [Sat, 5 Mar 2011 23:38:23 +0000 (23:38 +0000)]
move glsl/default.glsl embedded file out to its own header file
move hlsl/default.hlsl embedded file out to its own header file

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10895 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoinstead, define the FILE_OFFSET_BITS part in the build environment, and remove it...
divverent [Sat, 5 Mar 2011 14:59:14 +0000 (14:59 +0000)]
instead, define the FILE_OFFSET_BITS part in the build environment, and remove it from quakedef.h as it is not reliable there

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10894 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix compile problem on win32
divverent [Sat, 5 Mar 2011 06:46:23 +0000 (06:46 +0000)]
fix compile problem on win32

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10893 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomove the "quakedef.h" include, which gives us _FILE_OFFSET_BITS=64, above all system...
divverent [Fri, 4 Mar 2011 23:36:37 +0000 (23:36 +0000)]
move the "quakedef.h" include, which gives us _FILE_OFFSET_BITS=64, above all system header includes

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10892 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoput back the changes that make >2GB work (fix signedness)
divverent [Fri, 4 Mar 2011 23:36:34 +0000 (23:36 +0000)]
put back the changes that make >2GB work (fix signedness)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10891 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoRevert "properly use lseek64 on Linux for files larger than 2GB" because it breaks...
divverent [Fri, 4 Mar 2011 23:36:31 +0000 (23:36 +0000)]
Revert "properly use lseek64 on Linux for files larger than 2GB" because it breaks compilation on FreeBSD (no lseek64 there, file offsets are always 64bit)

This reverts commit 6095a33fdc4a434d11de102b445515021847cfce.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10890 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix zfighting on decals in D3D9 (where negative polygon offset isn't possible)
havoc [Fri, 4 Mar 2011 00:36:36 +0000 (00:36 +0000)]
fix zfighting on decals in D3D9 (where negative polygon offset isn't possible)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10889 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoupdate HLSL shader to no longer swap R/B color components on vertex
havoc [Thu, 3 Mar 2011 17:53:37 +0000 (17:53 +0000)]
update HLSL shader to no longer swap R/B color components on vertex
colors, as they are no longer being sent as D3DCOLOR

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10888 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoeliminated color4ub vertex formats, now everything is float, this fixes color wrappin...
havoc [Thu, 3 Mar 2011 17:48:26 +0000 (17:48 +0000)]
eliminated color4ub vertex formats, now everything is float, this fixes color wrapping/clamping issues in D3D9 renderer

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10887 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix rounding error that caused a memory block overflow in steelstorm when loading...
havoc [Thu, 3 Mar 2011 15:56:55 +0000 (15:56 +0000)]
fix rounding error that caused a memory block overflow in steelstorm when loading certain sound files

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10886 d7cf8633-e32d-0410-b094-e92efae38249

13 years agobouncegrid now uses interpolated photon accumulation, looks better
havoc [Thu, 3 Mar 2011 01:43:32 +0000 (01:43 +0000)]
bouncegrid now uses interpolated photon accumulation, looks better

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10885 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoskip backfaces in surface traceline
havoc [Thu, 3 Mar 2011 00:48:23 +0000 (00:48 +0000)]
skip backfaces in surface traceline

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10884 d7cf8633-e32d-0410-b094-e92efae38249