divverent/darkplaces.git
9 years agoMerge commit 'origin/master' into div0/traceboxbox div0/traceboxbox
Rudolf Polzer [Thu, 25 Mar 2010 06:43:14 +0000 (07:43 +0100)]
Merge commit 'origin/master' into div0/traceboxbox

Conflicts:
model_brush.c

9 years agomake model decompiling more robus regarding anim names (if name is pain1_4, treat...
divverent [Thu, 18 Mar 2010 19:20:33 +0000 (19:20 +0000)]
make model decompiling more robus regarding anim names (if name is pain1_4, treat this as pain1 frame 4, not pain frame 1_4)

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

9 years agomake q3 shader settings work on dedicated servers (dpmeshcollisions for
havoc [Thu, 18 Mar 2010 03:45:40 +0000 (03:45 +0000)]
make q3 shader settings work on dedicated servers (dpmeshcollisions for
example)

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

9 years agosv_curl_maxspeed: maximum speed for the curl downloads recommended by this server...
divverent [Sun, 14 Mar 2010 19:20:30 +0000 (19:20 +0000)]
sv_curl_maxspeed: maximum speed for the curl downloads recommended by this server (incompatible with clients not having this commit, so do not use yet)

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

9 years agofix how plural of alias works
divverent [Sun, 14 Mar 2010 18:08:39 +0000 (18:08 +0000)]
fix how plural of alias works
wrong: sg. aliases, pl. aliasess
right: sg. alias, pl. aliases

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

9 years agomodeldecompile: also write a framegroups file if possible
divverent [Sat, 13 Mar 2010 18:27:09 +0000 (18:27 +0000)]
modeldecompile: also write a framegroups file if possible

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

9 years agomade IQM framerate a float
eihrul [Sat, 13 Mar 2010 18:08:41 +0000 (18:08 +0000)]
made IQM framerate a float

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

9 years agorandomized loadingscreen pic (cvar: scr_loadingscreen_count, when 2 or above, randomi...
divverent [Sat, 13 Mar 2010 16:31:58 +0000 (16:31 +0000)]
randomized loadingscreen pic (cvar: scr_loadingscreen_count, when 2 or above, randomized gfx/loading{,2-n} pic is used, not recommended for general use as it costs GPU memory)

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

9 years agofixes for entity caching when r_shadows == 1
eihrul [Tue, 9 Mar 2010 02:58:06 +0000 (02:58 +0000)]
fixes for entity caching when r_shadows == 1

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

9 years agouse stencil shadows if r_shadows == 1
eihrul [Tue, 9 Mar 2010 02:51:39 +0000 (02:51 +0000)]
use stencil shadows if r_shadows == 1

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

9 years agookay, don't use shadow sampler in Cg
havoc [Tue, 9 Mar 2010 02:17:08 +0000 (02:17 +0000)]
okay, don't use shadow sampler in Cg

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

9 years agofixed bug in vsdct in cg
eihrul [Tue, 9 Mar 2010 02:03:47 +0000 (02:03 +0000)]
fixed bug in vsdct in cg

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

9 years agochange texcoord assignments in Cg shader back to the way it was, because
havoc [Tue, 9 Mar 2010 01:59:20 +0000 (01:59 +0000)]
change texcoord assignments in Cg shader back to the way it was, because
there was a conflict on TEXCOORD5 in one situation

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

9 years agofixed ShadowMap_Parameters usage in GetShadowMapTCCube in builtincgshaderstring
eihrul [Tue, 9 Mar 2010 01:44:20 +0000 (01:44 +0000)]
fixed ShadowMap_Parameters usage in GetShadowMapTCCube in builtincgshaderstring

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

9 years agoimplemented a new type of height fog using a texture to describe
havoc [Tue, 9 Mar 2010 01:33:41 +0000 (01:33 +0000)]
implemented a new type of height fog using a texture to describe
multiple fog layers, some visual issues due to the method used.
new command and worldspawn property - identical extra for a new
texturename parameter at the end
fixed some issues with shadowmapping in Cg shaders

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

9 years agoIQM base pose cleanups
eihrul [Mon, 8 Mar 2010 08:50:03 +0000 (08:50 +0000)]
IQM base pose cleanups

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

9 years agomore IQM loading fixes
eihrul [Mon, 8 Mar 2010 05:16:27 +0000 (05:16 +0000)]
more IQM loading fixes

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

9 years agomisc IQM loading fixes
eihrul [Mon, 8 Mar 2010 03:08:08 +0000 (03:08 +0000)]
misc IQM loading fixes

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

9 years agoadded per frame bounds to IQM format
eihrul [Mon, 8 Mar 2010 02:30:20 +0000 (02:30 +0000)]
added per frame bounds to IQM format

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

9 years agobuild IQM inverse base pose from joints if necessary
eihrul [Sun, 7 Mar 2010 21:50:15 +0000 (21:50 +0000)]
build IQM inverse base pose from joints if necessary

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

9 years agoexperimental IQM model format support
eihrul [Sun, 7 Mar 2010 21:13:06 +0000 (21:13 +0000)]
experimental IQM model format support

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

9 years agoproperly support huge sideways friction
divverent [Sat, 6 Mar 2010 15:37:45 +0000 (15:37 +0000)]
properly support huge sideways friction

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

9 years agocast Mem_Allocs in FS_Init_SelfPack
eihrul [Sun, 28 Feb 2010 20:52:44 +0000 (20:52 +0000)]
cast Mem_Allocs in FS_Init_SelfPack

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

9 years agoWarpZones:
divverent [Sun, 28 Feb 2010 19:35:36 +0000 (19:35 +0000)]
WarpZones:
- entities with a camera_transform function field
  arguments: vector origin, vector angles
  global input: v_forward, v_right, v_up = camera orientation
  return value: new origin
  global output: v_forward, v_right, v_up = new camera orientation
  global output: trace_endpos = origin on "remote side" for culling purposes
- on server, only the trace_endpos return value is used, and '0 0 0' angles are passed, and only the trace_endpos is used (this may be subject to change)
- a warpzone is an above described entity that contains a surface of a shader that uses the keywords dp_camera AND dp_refract
- a camera is an above described entity that contains a surface of a shader that JUST uses the keyword dp_camera
- in case of a camera, preferably the camera_transform function shall not use the input values (except for use for certain special effects)
- rendering of these warpzones is not recursive (yet)
- the warpzones do not have any impact on gameplay - QC support code is needed both on client and server
- example support code will be committed to Nexuiz SVN
- the interface is not stable yet and may be subject to change

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

9 years agoDetect appended data to the DP executable.
divverent [Sun, 28 Feb 2010 19:10:37 +0000 (19:10 +0000)]
Detect appended data to the DP executable.
If it's a pk3, it is added FIRST (TODO: should this be LAST) into the search path.
If it contains a darkplaces.opt text file, its contents are parsed and used as extra command line arguments.

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

9 years agoGetShadowMapTCCube fixes
eihrul [Sat, 27 Feb 2010 23:30:08 +0000 (23:30 +0000)]
GetShadowMapTCCube fixes

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

9 years agofix a bug that prevented coronas from being rendered for lights with no
havoc [Sat, 27 Feb 2010 21:12:40 +0000 (21:12 +0000)]
fix a bug that prevented coronas from being rendered for lights with no
diffuse or specular intensity

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

9 years agofix bug that prevented reflection cubemaps from working with Cg shaders
havoc [Sat, 27 Feb 2010 21:11:04 +0000 (21:11 +0000)]
fix bug that prevented reflection cubemaps from working with Cg shaders

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

9 years agodon't apply motionblur when rendering to an envmap
havoc [Sat, 27 Feb 2010 21:10:42 +0000 (21:10 +0000)]
don't apply motionblur when rendering to an envmap

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

9 years agouse a larger triangle buffer for r_batchmode 2
havoc [Sat, 27 Feb 2010 21:10:14 +0000 (21:10 +0000)]
use a larger triangle buffer for r_batchmode 2

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

9 years agominor cleanup to R_DrawSurface_TransparentCallback
havoc [Sat, 27 Feb 2010 21:08:14 +0000 (21:08 +0000)]
minor cleanup to R_DrawSurface_TransparentCallback

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

9 years agochanged r_speeds labels again, less csqc monitoring and more consistent
havoc [Sat, 27 Feb 2010 18:31:15 +0000 (18:31 +0000)]
changed r_speeds labels again, less csqc monitoring and more consistent
label order from frame to frame

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

9 years agomake some cvars static, to help the compiler a bit
divverent [Sat, 27 Feb 2010 18:11:31 +0000 (18:11 +0000)]
make some cvars static, to help the compiler a bit

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

9 years agoadded cl_prydoncursor_notrace cvar
havoc [Sat, 27 Feb 2010 18:09:54 +0000 (18:09 +0000)]
added cl_prydoncursor_notrace cvar
added support for cl_prydoncursor < 0 as no visible cursor

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

9 years agotry to fix all project files (to add winmm)
divverent [Sat, 27 Feb 2010 18:08:26 +0000 (18:08 +0000)]
try to fix all project files (to add winmm)

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

9 years agoshut up a (in this case wrong) warning about possibly uninitialized variable
divverent [Sat, 27 Feb 2010 18:02:50 +0000 (18:02 +0000)]
shut up a (in this case wrong) warning about possibly uninitialized variable

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

9 years agoadd -lwinmm to win32 sdl
divverent [Sat, 27 Feb 2010 18:01:33 +0000 (18:01 +0000)]
add -lwinmm to win32 sdl

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

9 years agoyet another include fix, this time for MSVC
divverent [Sat, 27 Feb 2010 16:39:44 +0000 (16:39 +0000)]
yet another include fix, this time for MSVC

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

9 years agoanother include
divverent [Sat, 27 Feb 2010 15:12:13 +0000 (15:12 +0000)]
another include

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

9 years agoattempt to fix the includes for win32
divverent [Sat, 27 Feb 2010 15:09:43 +0000 (15:09 +0000)]
attempt to fix the includes for win32

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

9 years agofix another win32 time typo
divverent [Sat, 27 Feb 2010 15:07:21 +0000 (15:07 +0000)]
fix another win32 time typo

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

9 years agofix two remaining uses of sys_usetimegettime
divverent [Sat, 27 Feb 2010 15:04:07 +0000 (15:04 +0000)]
fix two remaining uses of sys_usetimegettime

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

9 years agoadded 6x6 pcf option for people with too much framerate
eihrul [Sat, 27 Feb 2010 02:04:38 +0000 (02:04 +0000)]
added 6x6 pcf option for people with too much framerate

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

9 years agofix strstrofs with unicode
divverent [Fri, 26 Feb 2010 20:32:24 +0000 (20:32 +0000)]
fix strstrofs with unicode

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

9 years agoalso: sys_usesdldelay for using SDL_Delay() for sleeping instead of something better...
divverent [Fri, 26 Feb 2010 15:44:03 +0000 (15:44 +0000)]
also: sys_usesdldelay for using SDL_Delay() for sleeping instead of something better system provided

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

9 years agorefactor timing, so that timing code is in sys_shared.c.
divverent [Fri, 26 Feb 2010 15:43:58 +0000 (15:43 +0000)]
refactor timing, so that timing code is in sys_shared.c.
Changes in behaviour: Win32 now prefers select() (PLEASE TEST), SDL timers can be overridden by sys_usequeryperformancecounter or sys_useclockgettime, new cvar sys_debugtime

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

9 years agoRevert "added linux timing code to SDL client for more accurate r_speeds reports"
divverent [Fri, 26 Feb 2010 15:43:54 +0000 (15:43 +0000)]
Revert "added linux timing code to SDL client for more accurate r_speeds reports"

This reverts commit ef4adee42c844523c889cbc6c19d2da940f00ec6.

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

9 years agoadded linux timing code to SDL client for more accurate r_speeds reports
havoc [Fri, 26 Feb 2010 13:58:35 +0000 (13:58 +0000)]
added linux timing code to SDL client for more accurate r_speeds reports
(sys_usetimegettime and sys_useclockgettime apply, set both to 0 to use
SDL_GetTicks instead)
added support for sys_usenoclockbutbenchmark in SDL client

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

9 years agodon't bother calling Collision_ValidateBrush when creating box brushes
havoc [Fri, 26 Feb 2010 12:30:07 +0000 (12:30 +0000)]
don't bother calling Collision_ValidateBrush when creating box brushes

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

9 years agoundo an edit in r9537 that caused it to be possible to walk through a
havoc [Fri, 26 Feb 2010 12:03:37 +0000 (12:03 +0000)]
undo an edit in r9537 that caused it to be possible to walk through a
narrow gap in toxic in Nexuiz near the rocket launcher

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

9 years agoadded collision_debug_tracelineasbox cvar to work around problems with
havoc [Thu, 25 Feb 2010 23:10:15 +0000 (23:10 +0000)]
added collision_debug_tracelineasbox cvar to work around problems with
traceline on q3bsp, disabled by default due to performance being worse
but should aid in debugging the traceline problems

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

9 years agomagical instruction sequence that works on both GL_ARB_texture_gather and GL_AMD_text...
eihrul [Thu, 25 Feb 2010 18:47:26 +0000 (18:47 +0000)]
magical instruction sequence that works on both GL_ARB_texture_gather and GL_AMD_texture_texture4

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

9 years agoadded dpmeshcollisions keyword in shader parsing, this causes all
havoc [Thu, 25 Feb 2010 16:16:46 +0000 (16:16 +0000)]
added dpmeshcollisions keyword in shader parsing, this causes all
rendering triangles of the affected surfaces to be added to the BIH
system, so that q3map2's misc_model collision flag can be turned off,
greatly reducing bsp size and memory usage, as well as possibly
improving collisions (no need to reconstruct points from planes)

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

9 years agomake sure r_glsl_permutation and r_cg_permutation variables are NULL
havoc [Thu, 25 Feb 2010 16:14:13 +0000 (16:14 +0000)]
make sure r_glsl_permutation and r_cg_permutation variables are NULL
when renderer is started or shuts down

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

9 years agoattempting workaround for coord rounding incompatibilities between GL_ARB_texture_gat...
eihrul [Thu, 25 Feb 2010 16:12:37 +0000 (16:12 +0000)]
attempting workaround for coord rounding incompatibilities between GL_ARB_texture_gather (nvidia) and GL_AMD_texture_texture4 (ati)

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

9 years agofix crash when MAX_DLIGHTS is hit and a trail effect tries to add a
havoc [Thu, 25 Feb 2010 16:11:50 +0000 (16:11 +0000)]
fix crash when MAX_DLIGHTS is hit and a trail effect tries to add a
dlight

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

9 years agoparticle geometry can now be rotated for more variety, and can spin too
havoc [Thu, 25 Feb 2010 16:11:13 +0000 (16:11 +0000)]
particle geometry can now be rotated for more variety, and can spin too
added rotate command in effectinfo.txt which specifies min/max starting
angle and min/max rotation speed (spin)

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

9 years agodon't bother checking if bsp file has been modified on a level change if
havoc [Thu, 25 Feb 2010 16:09:49 +0000 (16:09 +0000)]
don't bother checking if bsp file has been modified on a level change if
developer is 0

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

9 years agouse CONFIGFILENAME and STARTCONFIGFILENAME macros instead of config.cfg
havoc [Thu, 25 Feb 2010 16:01:54 +0000 (16:01 +0000)]
use CONFIGFILENAME and STARTCONFIGFILENAME macros instead of config.cfg
and quake.rc

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

9 years agoadded cl_particles_collisions cvar to allow collisions to be turned off
havoc [Thu, 25 Feb 2010 15:58:10 +0000 (15:58 +0000)]
added cl_particles_collisions cvar to allow collisions to be turned off
for performance testing

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

9 years agoadd several more R_TimeReport calls for better analysis of csqc time
havoc [Thu, 25 Feb 2010 15:55:47 +0000 (15:55 +0000)]
add several more R_TimeReport calls for better analysis of csqc time

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

9 years agodon't bother calling Mod_ForName in client precache parsing if server
havoc [Thu, 25 Feb 2010 15:50:24 +0000 (15:50 +0000)]
don't bother calling Mod_ForName in client precache parsing if server
already loaded them in a local game

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

9 years agochanges to rtlight surface culling:
havoc [Thu, 25 Feb 2010 07:32:04 +0000 (07:32 +0000)]
changes to rtlight surface culling:
SVBSP culling mode now also checks PVS (not sure why this helps)
no longer rejects backfaces in light culling (fixes several glitches in
start.bsp and elsewhere - not sure why the light would be considered
behind these triangles though)
optimized svbsp building conditions a bit

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

9 years agofix signed vs. unsigned comparison warning in GL_TextureMode_f
eihrul [Thu, 25 Feb 2010 06:31:44 +0000 (06:31 +0000)]
fix signed vs. unsigned comparison warning in GL_TextureMode_f

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

9 years agofix degenerate triangle elimination
divverent [Mon, 22 Feb 2010 18:33:57 +0000 (18:33 +0000)]
fix degenerate triangle elimination

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

9 years agoOffsetmapping now could be customized on per-texture basis. Added mod_q3shader_defaul...
vortex [Sun, 21 Feb 2010 01:52:02 +0000 (01:52 +0000)]
Offsetmapping now could be customized on per-texture basis. Added mod_q3shader_default_offsetmapping cvar which is 1 by default (offsetmapping is on by default on all surfs), and 0 (only shader-set). New q3shader keyword "dp_offsetmapping <type> <scale>". Typical example: "dp_offsetmapping default 2". Types are "off", "default" (legacy cvar-based behavior), "linear" and "relief". Linear/relief is forced modes that ignores r_glsl_offsetmapping_reliefmapping.

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

9 years ago+some tune ups for Steel Storm screenshot prefix
motorsep [Sat, 20 Feb 2010 18:31:50 +0000 (18:31 +0000)]
+some tune ups for Steel Storm screenshot prefix

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

9 years agofixed BIH line clipping and enabled it, BIH is now faster than BSP
havoc [Sat, 20 Feb 2010 14:03:14 +0000 (14:03 +0000)]
fixed BIH line clipping and enabled it, BIH is now faster than BSP

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

9 years agoslight improvement to BIH recursion speeds by checking for box overlap
havoc [Sat, 20 Feb 2010 13:31:40 +0000 (13:31 +0000)]
slight improvement to BIH recursion speeds by checking for box overlap
on every node (in addition to the side check)

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

9 years agoadded server and client timing data to r_speeds 2
havoc [Sat, 20 Feb 2010 12:42:59 +0000 (12:42 +0000)]
added server and client timing data to r_speeds 2

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

9 years agofix more cg shader errors
havoc [Fri, 19 Feb 2010 15:10:54 +0000 (15:10 +0000)]
fix more cg shader errors

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

9 years agofix two compile errors in cg shader
havoc [Fri, 19 Feb 2010 14:45:49 +0000 (14:45 +0000)]
fix two compile errors in cg shader

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

9 years agodon't error out if external lightmap sizes mismatch, just print a
havoc [Thu, 18 Feb 2010 12:11:48 +0000 (12:11 +0000)]
don't error out if external lightmap sizes mismatch, just print a
warning and ignore the mismatching one and any later ones

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

9 years agonew argument "force" to gl_texturemode for more augenkrebs fun (and e.g. debugging...
divverent [Thu, 18 Feb 2010 11:39:49 +0000 (11:39 +0000)]
new argument "force" to gl_texturemode for more augenkrebs fun (and e.g. debugging lightmaps)

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

9 years agomoved BIH_LEAF from bih_nodetype_t to bih_leaftype_t
havoc [Thu, 18 Feb 2010 06:25:26 +0000 (06:25 +0000)]
moved BIH_LEAF from bih_nodetype_t to bih_leaftype_t
renamed BIH_LEAF to BIH_BRUSH
renamed BIH_LEAF + 1 to BIH_COLLISIONTRIANGLE
renamed BIH_LEAF + 2 to BIH_RENDERTRIANGLE

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

9 years agomove RESTRICT keyword define to qtypes.h and add it to all the
havoc [Thu, 18 Feb 2010 06:23:28 +0000 (06:23 +0000)]
move RESTRICT keyword define to qtypes.h and add it to all the
AnimateVertices functions to hush a warning in MSVC

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

9 years agoadded RF_FULLBRIGHT and RF_NOSHADOW renderflags for CSQC
havoc [Thu, 18 Feb 2010 06:10:59 +0000 (06:10 +0000)]
added RF_FULLBRIGHT and RF_NOSHADOW renderflags for CSQC

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

9 years agofix a couple enum mixed with int warnings
havoc [Thu, 18 Feb 2010 06:10:03 +0000 (06:10 +0000)]
fix a couple enum mixed with int warnings

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

9 years agoadd bih.[ch] to MSVC projects
havoc [Thu, 18 Feb 2010 06:09:40 +0000 (06:09 +0000)]
add bih.[ch] to MSVC projects

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

9 years agochanged default value of mod_collision_bih from 0 to 1 because it seems
havoc [Thu, 18 Feb 2010 04:36:46 +0000 (04:36 +0000)]
changed default value of mod_collision_bih from 0 to 1 because it seems
fine but more testing is needed (and nothing gets tested if it has to be
done manually)

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

9 years agoset supercontents and surfaceflags on models not using shaders
havoc [Thu, 18 Feb 2010 04:01:53 +0000 (04:01 +0000)]
set supercontents and surfaceflags on models not using shaders

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

9 years agomake model collisions work when q3 shaders are used (by calculating
havoc [Thu, 18 Feb 2010 03:57:04 +0000 (03:57 +0000)]
make model collisions work when q3 shaders are used (by calculating
supercontents based on surfaceparm)

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

9 years agoadded some #if 0 test cases for BSP collision culling, to allow testing
havoc [Thu, 18 Feb 2010 01:02:28 +0000 (01:02 +0000)]
added some #if 0 test cases for BSP collision culling, to allow testing
the accuracy of the culling code by bypassing the optimized code

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

9 years agomade the old BSP collision code check bounding boxes of brushes and
havoc [Thu, 18 Feb 2010 00:51:09 +0000 (00:51 +0000)]
made the old BSP collision code check bounding boxes of brushes and
triangle meshes (curves) before colliding with them

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

9 years agodisable broken Mod_CollisionBIH_TracePoint_Mesh and
havoc [Thu, 18 Feb 2010 00:25:56 +0000 (00:25 +0000)]
disable broken Mod_CollisionBIH_TracePoint_Mesh and
Mod_CollisionBIH_PointSuperContents_Mesh, they need more advanced
triangle checks to function properly

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

9 years agomade BIH collision culling support the mod_q3bsp_curves_collisions cvar
havoc [Thu, 18 Feb 2010 00:23:50 +0000 (00:23 +0000)]
made BIH collision culling support the mod_q3bsp_curves_collisions cvar

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

9 years agoadded mod_recalculatenodeboxes cvar to allow this behavior to be
havoc [Thu, 18 Feb 2010 00:22:51 +0000 (00:22 +0000)]
added mod_recalculatenodeboxes cvar to allow this behavior to be
disabled (but it defaults 1 as before)

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

9 years agodon't check mod_collision_bih in r_showcollisionbrushes because the old
havoc [Thu, 18 Feb 2010 00:20:36 +0000 (00:20 +0000)]
don't check mod_collision_bih in r_showcollisionbrushes because the old
code path was removed

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

9 years agodeal with colbrushf == NULL cases in Mod_MakeCollisionBIH
havoc [Wed, 17 Feb 2010 18:27:58 +0000 (18:27 +0000)]
deal with colbrushf == NULL cases in Mod_MakeCollisionBIH

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

9 years agofix getsurfacetriangle on a submodel
divverent [Wed, 17 Feb 2010 14:35:33 +0000 (14:35 +0000)]
fix getsurfacetriangle on a submodel

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

9 years agoadded mod_q1bsp_polygoncollisions cvar (off by default, because it
havoc [Wed, 17 Feb 2010 09:19:46 +0000 (09:19 +0000)]
added mod_q1bsp_polygoncollisions cvar (off by default, because it
disables clip brushes in the bsp)
added BIH collision optimization to all model formats if the model is
not animated, this should mean that model collisions are much faster
(when used with SOLID_BSP and such)

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

9 years agoMod_Decompile_SMD blend weight fixes
eihrul [Wed, 17 Feb 2010 08:45:57 +0000 (08:45 +0000)]
Mod_Decompile_SMD blend weight fixes

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

9 years agostore blend weights as unsigned char data
eihrul [Wed, 17 Feb 2010 07:21:41 +0000 (07:21 +0000)]
store blend weights as unsigned char data

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

9 years agoMerge branch 'master' into div0/traceboxbox
Rudolf Polzer [Wed, 17 Feb 2010 07:19:36 +0000 (08:19 +0100)]
Merge branch 'master' into div0/traceboxbox

Conflicts:
clvm_cmds.c
collision.h
model_alias.c
model_brush.c
svvm_cmds.c

9 years agoimplemented and debugged BIH (Bounding Interval Hierarchy) code, more
havoc [Wed, 17 Feb 2010 06:55:00 +0000 (06:55 +0000)]
implemented and debugged BIH (Bounding Interval Hierarchy) code, more
optimizations possible but this is a good start
mod_collision_bih cvar added, defaults to 0 because it is not yet
consistently faster than q3bsp collisions

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

9 years agodon't use dummy entries for single-bone blend palette entries
eihrul [Wed, 17 Feb 2010 06:23:18 +0000 (06:23 +0000)]
don't use dummy entries for single-bone blend palette entries

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

9 years agodon't crash if the model produces no shadowmesh (no geometry)
havoc [Wed, 17 Feb 2010 04:22:08 +0000 (04:22 +0000)]
don't crash if the model produces no shadowmesh (no geometry)

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

9 years ago+ added bih.c and bih.h files into SDL project file for DevCPP
motorsep [Wed, 17 Feb 2010 03:32:40 +0000 (03:32 +0000)]
+ added bih.c and bih.h files into SDL project file for DevCPP

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

9 years agodon't error out when Mod_Q3BSP_LoadTriangles is called on a map with no
havoc [Wed, 17 Feb 2010 03:14:12 +0000 (03:14 +0000)]
don't error out when Mod_Q3BSP_LoadTriangles is called on a map with no
vertexes

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

9 years agofix two typos in Mod_Q3BSP_LoadTriangles errors
havoc [Wed, 17 Feb 2010 03:03:55 +0000 (03:03 +0000)]
fix two typos in Mod_Q3BSP_LoadTriangles errors

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