]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
vortex [Wed, 13 Oct 2010 20:57:26 +0000 (20:57 +0000)]
add r_glsl_saturation_redcompensate optional effect to r_glsl_saturate (only works when saturate is below 1), will produce desaturation with red channel compensated. Tweaked water shader parms, added slight water animation by counter-scrolling 2 water normalmap layers in shader.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10529
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
60735ece67a401288eb8f3cf957f726f9011b964
divverent [Wed, 13 Oct 2010 20:45:36 +0000 (20:45 +0000)]
hope the scissor code is fine now
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10528
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d1a0b2b601cbca0fac77e775924c704421d34bcd
vortex [Wed, 13 Oct 2010 20:33:30 +0000 (20:33 +0000)]
bring old R_Shadow_ScissorForBBox code (new code still there, commented out), since new code is broken on ATI cards, a temporary solution
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10527
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6aa5a03c470f7a0ee54459b3a9263b771626b8c4
divverent [Wed, 13 Oct 2010 19:57:13 +0000 (19:57 +0000)]
oops, scissormode wasn't meant to be CVAR_SAVE
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10526
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
70276afb0a9206892cb1f4f9079b1c39ea2707d7
divverent [Wed, 13 Oct 2010 19:46:10 +0000 (19:46 +0000)]
shut up a gcc warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10525
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
613f06b867cca45c2fc29aed93b82517d398abfe
divverent [Wed, 13 Oct 2010 19:32:40 +0000 (19:32 +0000)]
fix D3D scissoring
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10524
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1c0077b12b379813c5ed6caeeb7385e88e10ff8e
divverent [Wed, 13 Oct 2010 17:42:50 +0000 (17:42 +0000)]
fix another typo in the water rendering improvement
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10523
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
89a044f065d368295a805d75fa38639150a75ab5
divverent [Wed, 13 Oct 2010 17:22:56 +0000 (17:22 +0000)]
r_water_scissormode: 0 = none, 1 = scissor only, 2 = cull only, 3 = both
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10522
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
82673bcd65394c9a261c9396e14f15f384c1f9a2
divverent [Wed, 13 Oct 2010 17:18:55 +0000 (17:18 +0000)]
adjust for left handed coordinate system in a reflected view
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10521
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5e15507f0fc13b7f22d39bf2cc77b16d606e8660
divverent [Wed, 13 Oct 2010 16:08:13 +0000 (16:08 +0000)]
r_water_scissormode: 0 = none, 1 = glScissor, 2 = glScissor and frustum culling
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10520
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8bbf1d28e7c0f0195cab09ca0f31398fa3b89191
divverent [Wed, 13 Oct 2010 09:56:29 +0000 (09:56 +0000)]
"cl_movement_replay 0" to disable the built-in prediction
From: Jānis Rūcis <parasti@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10519
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6d82f45c9a2d332323be1546f7929a921ade9b02
divverent [Sun, 10 Oct 2010 16:36:44 +0000 (16:36 +0000)]
I have no idea why, but R_Viewport_TransformToScreen apparently should NOT invert y, as doing so breaks dynamic light rendering in size-reduced views (HDR, water)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10518
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f485da47bd3a3737bb1db4e42b21e9e3b6c58dd9
divverent [Fri, 8 Oct 2010 17:54:16 +0000 (17:54 +0000)]
SSE patch by kyre, with runtime CPU detection and a cvar r_skeletal_use_sse if SSE is detected
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10517
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8823e14b9482ce5779c09a48e9b81f397f94b55f
divverent [Wed, 6 Oct 2010 11:20:45 +0000 (11:20 +0000)]
fix another warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10516
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
939c572d67d451f33a977ab1ed1cb937e6c558c2
divverent [Wed, 6 Oct 2010 11:19:27 +0000 (11:19 +0000)]
fix a syntax error. Why didn't my gcc catch it? clang does...
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10515
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f57d9c23e169d7b996ee332adac7f2608024e177
divverent [Wed, 6 Oct 2010 09:48:53 +0000 (09:48 +0000)]
fix misparsing of portless IPv6 addresses
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10514
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
560eb405cfebc3c582f09d1358c170aa4e885e1a
divverent [Wed, 6 Oct 2010 09:48:52 +0000 (09:48 +0000)]
adding my own IPv6 master server: dpmaster.div0.qc.to - default master server 4 (admin: divVerent) (only enabled if SUPPORTIPV6)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10513
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d63a3c8a9951cfdb81741d7478261411473f790a
divverent [Sun, 3 Oct 2010 13:59:29 +0000 (13:59 +0000)]
turn off the weird "%interface_name" thing in IPv6 addresses, as it won't compare right
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10512
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
13f5cfe3e80c22eaf001856423dd03e68c476a33
divverent [Sun, 3 Oct 2010 13:59:19 +0000 (13:59 +0000)]
make IPv6 addresses actually work in server queries
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10511
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a99f9360b7301b2cde94d176b450fc708f50d5d1
divverent [Sun, 3 Oct 2010 13:06:58 +0000 (13:06 +0000)]
make "status" support IPv6
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10510
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ab91734e41c1b02ff74222d17e3e89819c5f06ed
divverent [Sat, 2 Oct 2010 19:20:48 +0000 (19:20 +0000)]
fix a stupid and trivial IPv6 bug that causes a v6 supporting engine to HANG
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10509
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ffc42cb750e2e3b941a79d4acf95e3a3f67f5058
havoc [Thu, 30 Sep 2010 20:35:12 +0000 (20:35 +0000)]
don't crash in obj loading if v, vt, or vn are NULL or the indices are
invalid
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10508
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
efe66e1a99b2ad1b6aaa2a5c131237b9cb7b4ee4
divverent [Wed, 29 Sep 2010 07:23:15 +0000 (07:23 +0000)]
depthonly, prepass: do not compare lightmap texture for batching (less meshes)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10507
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3e2531a30de55e9b77ad90931f865b14a3ccb89c
Rudolf Polzer [Wed, 29 Sep 2010 07:18:32 +0000 (09:18 +0200)]
fix lightmap switching/batching in fakelight
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10506
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
369bccdb9b45de01e7d0ba4225e12884e0dc0951
divverent [Wed, 29 Sep 2010 07:10:44 +0000 (07:10 +0000)]
Revert "for some reason, it's faster to always set the lightmaptexture (more than double fps) even if fakelight is enabled. LordHavoc, any idea why?"
This reverts commit
1a2ab86f0789c4b473dad83368c86634e4b7eb2c .
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10505
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
02de8946ccfab1fffc695735152d2a97cccee2a6
Rudolf Polzer [Tue, 28 Sep 2010 19:09:13 +0000 (21:09 +0200)]
fix vertextextureblend in fakelight
Rudolf Polzer [Tue, 28 Sep 2010 12:36:46 +0000 (14:36 +0200)]
for some reason, it's faster to always set the lightmaptexture (more than double fps) even if fakelight is enabled. LordHavoc, any idea why?
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10504
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1a2ab86f0789c4b473dad83368c86634e4b7eb2c
divverent [Tue, 28 Sep 2010 12:04:33 +0000 (12:04 +0000)]
r_fakelight: 1 = use "fake" lighting (falloff-less light source at eye origin) if the loaded worldmodel is unlit, 2 = always use "fake" lighting; controlling cvar r_fakelight_intensity (0.75 is an empiric default value that on average seems to match the lightmap brightness of a selection of nexuiz maps)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10503
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2fe74a1bd078fa8684b11fc555d6501cbdd3513c
havoc [Mon, 27 Sep 2010 02:44:16 +0000 (02:44 +0000)]
avoid crashes if MAX_SVBSP_POLYGONPOINTS would be exceeded
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10502
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1ea73c92f65f5f8342edef1d7b4bba7580217176
divverent [Sun, 26 Sep 2010 17:48:31 +0000 (17:48 +0000)]
cameras: when new eye pos == old eye pos, do not create a network eye
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10501
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
44bfaab727457c0b4d084da92bedea1969cfb1db
divverent [Sun, 26 Sep 2010 17:37:40 +0000 (17:37 +0000)]
fix alpha in water rendering
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10500
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
284906f540ab8a7a704c0d4135d93009ff0441ad
divverent [Sun, 26 Sep 2010 16:45:18 +0000 (16:45 +0000)]
fix autoload semantics of drawpics
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10499
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e8aced660a23cd4ad64764b8ed161a8811262fd3
divverent [Sun, 26 Sep 2010 12:14:21 +0000 (12:14 +0000)]
fix a display issue with warpzone decals I caused in my last change
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10498
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
41b3bfc57e21b55b823da97f4edcfc4fb8f4919c
divverent [Sun, 26 Sep 2010 06:40:31 +0000 (06:40 +0000)]
fix warnings in terencehill's code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10497
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e2ca60e84ef1525d1b097548534e6ab1c96885b2
divverent [Sat, 25 Sep 2010 19:48:30 +0000 (19:48 +0000)]
allow .alpha to fade out water/refraction/reflection surfaces (only tested on refraction at the moment, sorry)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10496
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
77f5e1094bbab7eaca225154d1f566845f37c394
divverent [Sat, 25 Sep 2010 08:39:40 +0000 (08:39 +0000)]
Fix a typo (v_idlescale is always 0 there)
Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10495
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fcdaa4edcc329da6cebc246e0e2db876603f0e05
divverent [Sat, 25 Sep 2010 08:39:37 +0000 (08:39 +0000)]
Fix showsound that cannot be shown alone cause of a missing check Simplify a bit the code to avoid redundant checks
Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10494
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ecc62789a22a9b7161a863a1c046b8b170c6cca8
divverent [Sat, 25 Sep 2010 08:39:33 +0000 (08:39 +0000)]
loadfont now prints a warning if it gets more than MAX_FONT_SIZES sizes and skips duplicated sizes
Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10493
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
df715e90671b3ea25ce8e79ebb9f7afc86b42bd0
divverent [Sat, 25 Sep 2010 08:39:29 +0000 (08:39 +0000)]
Fix again u8_COM_StringLengthNoColors returning always 0 if end is NULL (strlennocol case), and counting 1 less character if the last character is multibyte and end is not NULL
Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10492
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a315e532aafafc62929aeed9662cdcb66a454172
divverent [Sat, 25 Sep 2010 08:35:59 +0000 (08:35 +0000)]
New command 'history' and new shortcuts to search through the commands history
ctrl-, goes to the first command of the history
ctrl-. goes to the last command of the history
type a string (wildcards allowed) and
ctrl-f prints all the matching commands
ctrl-r searches backwards
ctrl-shift-r searches forwards
The last 2 shortcuts also point the history's index to the matching command but without fetching it to let one continue the search. To fetch it, it suffices to just press UP or DOWN.
Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10491
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0961be131f8762ddd1d659a7a3a2803b42c6bad4
divverent [Fri, 24 Sep 2010 21:37:43 +0000 (21:37 +0000)]
Fix a possible crash when an invalid skinframe gets accessed after cl.time steps backwards (e.g. due to time syncing) right after an entity has been created. Might fix the steel storm crash, but certainly IS a segfault on unstable network connection. Note that a%b can be negative for a<0, b>0 (unlike mathematical 'mod' operation, C '%' is based on rounding towards zero)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10490
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e63a0114bbd617c020c6217f5e1fe1145b1d2c78
divverent [Fri, 24 Sep 2010 11:21:33 +0000 (11:21 +0000)]
comment out another unused var
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10489
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1ae269e1612265dc7c54fbccdb1ca0f285752b79
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 1 May 2010 16:48:33 +0000 (16:48 +0000)]
UNMERGE
overhauled vertex formats, now supports 100% interleaved arrays
rendering mode, reworked vertexbuffer management to be a more robust
system, added fully vertex buffered rendering options
(gl_vbo_dynamicvertex, gl_vbo_dynamicindex) which are off by default
(they seem to hurt fps in tests here)
centralized handling of "generic" mesh rendering (fixed function stuff)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10109
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
38185bc1aea210514d6970e3c36a25ad97615e5f
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 2 May 2010 14:19:27 +0000 (14:19 +0000)]
UNMERGE
fix a crash on deformvertexes wave
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10163
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
83541505084139df34de53d084b40fc0b807822c
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 2 May 2010 15:08:22 +0000 (15:08 +0000)]
UNMERGE
fix water/reflection/camera surface rendering
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10164
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
b55ff03e177e5c4f9e10f1f91bbd5a9e6eb01cdb
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 2 May 2010 18:17:14 +0000 (18:17 +0000)]
UNMERGE
don't generate vertex colors in q1bsp format for shader path
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10166
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
1882c330367f233f0f639a825e590be078398c5d
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 9 May 2010 00:13:51 +0000 (00:13 +0000)]
UNMERGE
fix a stencil shadowvolume bug with models that use dynamic batches
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10177
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
dfd1c391f1e669db38ae21e776707c0ec791b7e2
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 9 May 2010 00:16:01 +0000 (00:16 +0000)]
UNMERGE
use rsurface.modelelement3i variable instead of
model->surfmesh.data_element3i for consistency sake
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10178
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
4220845a0fc613d8ea9216b6e3fcde44a44ff3bf
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 9 May 2010 00:17:27 +0000 (00:17 +0000)]
UNMERGE
changed R_Mesh_PrepareVertices_*_Unlock and _Lock functions to always
use the rsurface.preparevertices_ arrays, rather than having an
unnecessary renderpath check
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10179
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
2b5bf11a5c533a36544f9529f9be03ff3de9c482
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 9 May 2010 10:52:43 +0000 (10:52 +0000)]
UNMERGE
fix funny loading screen breakage with DX vertex formats
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10182
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
4108c0a580d0cb88188512f832f6b163cfa9edeb
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 17 Jun 2010 21:53:45 +0000 (21:53 +0000)]
UNMERGE
optimize away NOP wave functions in one more case
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10238
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
2ee9568b18dcacc2d9a774b3bac98ef1682fdeec
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 26 Jun 2010 20:46:57 +0000 (20:46 +0000)]
UNMERGE
make sure dynamicvertex gets set by deformvertexes commands
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10253
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
6b80426972681281130a7d3b0a1ce79a9c7d88d6
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 2 Jul 2010 02:24:32 +0000 (02:24 +0000)]
UNMERGE
fix a bunch of warnings if compiling darkplaces as C++ in MSVC2008
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10262
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
861c406b589acf1252ddc231e02f94557a15e2bc
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 2 Jul 2010 09:00:08 +0000 (09:00 +0000)]
UNMERGE
created new MSVC2008 project files and solution from scratch
fixed several warnings in MSVC2008
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10266
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
434efc92fc320ccdb33442b4879e40704f5326d6
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 3 Jul 2010 10:27:16 +0000 (10:27 +0000)]
UNMERGE
implemented Direct3D9 renderer (off by default), not very optimized but almost completely functional
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10267
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
cb9437e103e973ba5833636ba973833945a2a148
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 3 Jul 2010 10:33:30 +0000 (10:33 +0000)]
UNMERGE
updated glsl and cg (now also directly compiled as hlsl) shaders - integrated the r_bloom_colorsubtract behavior into the shader rather than relying on fixed function blending in an extra pass, this should be a little faster...
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10268
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
9ee9172d8494e36c272e72d3301966673b01d37e
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 5 Jul 2010 08:30:22 +0000 (08:30 +0000)]
UNMERGE
remove the #define list at the start of the embedded default.glsl, it
was unintended (this list is prepended by r_glsl_dumpshader)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10274
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
5f3f4500441e25bb570136717e29e79327685778
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 9 Jul 2010 17:21:51 +0000 (17:21 +0000)]
UNMERGE
cleanup mempool use when generating a shadow mesh (one instance that used "loadmodel->mempool" that shouldn't)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10276
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
a19a4d85d2b64f05334d015c6ccbe5c61166243a
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:11:05 +0000 (10:11 +0000)]
UNMERGE
fix a warning in mingw
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10317
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
0f140a239847203b502939781805b619b49cebeb
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:11:20 +0000 (10:11 +0000)]
UNMERGE
fix a warning in mingw
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10318
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
d34c63e7b39ac9ba7cb181cc09cab84508586df7
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:11:44 +0000 (10:11 +0000)]
UNMERGE
fix more warnings in mingw
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10319
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
2abc0848d56d9c16ec587a90b4052d71e7aa6c6b
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:12:46 +0000 (10:12 +0000)]
UNMERGE
fix a warning in mingw
changed a model->brush.data_nodes check to data_leafs instead
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10320
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
102c27e9f7f292ff2ae0dfe9d80e20335be10906
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:13:01 +0000 (10:13 +0000)]
UNMERGE
fix more mingw warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10321
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
fb5629acb1f2686c39bfb4993ffd86b0094b8bbb
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:13:17 +0000 (10:13 +0000)]
UNMERGE
fix a mingw warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10322
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
3ef6861ba3638beea619a8a641cf4e9ade450eee
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:14:07 +0000 (10:14 +0000)]
UNMERGE
fix a mingw warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10324
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
fffe0ca6036ab33e870ff082e3d5dd7ad0ae17d7
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 15 Jul 2010 12:38:52 +0000 (12:38 +0000)]
UNMERGE
improved r_shadows 2 shadowmapping setup code a bit, especially the
debugging code snippets
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10330
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
3b9340be64eef705edfc005476b9913a314b8c84
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 15 Jul 2010 12:39:14 +0000 (12:39 +0000)]
UNMERGE
fix r_shadows 2 shadowmapping by rendering to the correct depth range in
GL again
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10331
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
1212b6bbf6264e63229f0c4fcdca7cade6065a6e
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 25 Jul 2010 14:56:25 +0000 (14:56 +0000)]
UNMERGE
fix a nasty bug in refraction/water renders. It is evil that GL20TU_FIRST must be matching, out of all texture units, the one of normalmaps.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10361
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
a36bfc88b5c627a1f2aa17a53df482a20c5e76f0
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 9 Aug 2010 17:32:26 +0000 (17:32 +0000)]
UNMERGE
fix a few warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10383
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
53b08e0497613f69601607824c4d5cba788f1309
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 19 Aug 2010 14:36:01 +0000 (14:36 +0000)]
UNMERGE
load d3dx9_*.dll dynamically to get D3DXCompileShader to fix a compile
error with mingw headers, this also means it doesn't matter which
version is present on the user's system
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10401
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
8876b1a376af3ecbc434d5f5788d85658757ee37
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 19 Aug 2010 14:38:49 +0000 (14:38 +0000)]
UNMERGE
fix almost all g++ -pedantic warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10402
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
0f80ff51ff9f369233d17b3377d3a0d34b4c8e5a
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 19 Aug 2010 15:15:32 +0000 (15:15 +0000)]
UNMERGE
fix a compile error
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10403
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
cbfd258f467a1a2f62f2d98176cfbf4073a4d463
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 19 Aug 2010 17:44:57 +0000 (17:44 +0000)]
UNMERGE
fix compilation of sdl and server builds when SUPPORTD3D is defined
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10407
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
a03b36647e6f8648eb9cec6170b226a707452012
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 23 Aug 2010 15:09:37 +0000 (15:09 +0000)]
UNMERGE
split and overhauled R_Upload into two functions:
R_UploadPartialTexture - does a partial update for real, not used by
anything if gl_nopartialtextureupdates is on
R_UploadFullTexture - takes only new pixel data, does appropriate
scaling and uploads to video memory
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10416
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
7a98ba933dc5de54c8ae6556ac48c3ff067f33ee
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 24 Aug 2010 17:16:29 +0000 (17:16 +0000)]
UNMERGE
fix previous warning fix that only worked properly for MINGW
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10417
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
1e6056400d6d93a7045ffc6be5546c7468a243f3
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 24 Aug 2010 17:19:14 +0000 (17:19 +0000)]
UNMERGE
fix some HLSL shader compile errors
disable check for gl_vbo in one part of surface setup code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10418
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
346a62627336fb1f89c9342b4d32b154b1338c1a
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 24 Aug 2010 17:26:01 +0000 (17:26 +0000)]
UNMERGE
overhauled dynamic vertex rendering in DX9 based on research by mh that showed the DrawIndexedPrimitiveUP function is many times faster than using dynamic vertex buffers
applied a patch from mh to the D3D Present handling to better cope with lost devices
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10419
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
133289ecaac8633e9a71e3ce68eac43360844e35
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 30 Aug 2010 00:36:32 +0000 (00:36 +0000)]
UNMERGE
fix components parameter on a few TexCoordPointer normal3f calls, thanks
to kyre for reporting this bug
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10430
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
796d03386decaf9af1f674aaf25616686524cc4d
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 31 Aug 2010 07:28:24 +0000 (07:28 +0000)]
UNMERGE
get rid of calculating vertexmesh animcache buffers if we do not need the vertexmesh... fixes performance of steel storm
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10431
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
010f524039d1780063484288f9a832b473709a6b
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 31 Aug 2010 10:53:54 +0000 (10:53 +0000)]
UNMERGE
generate s- and t-vector of deformVertexes only if really needed (optimization for depthfirst pass mainly)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10432
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
c93c208ad76c4ba3cff084544d862d3285829135
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 4 Sep 2010 15:39:43 +0000 (15:39 +0000)]
UNMERGE
optimize R_AnimCache_UpdateEntityMeshBuffers to use memcpy instead of VectorCopy, Steel Storm 150fps -> 167fps (now only effective in D3D mode, as this path is usually not used any more in OpenGL)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10441
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
8e6b20a776721497beebfbb19ce34d6111082098
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 11 Sep 2010 09:54:18 +0000 (09:54 +0000)]
UNMERGE
Ignored MSVC build directories
Silenced a warning in MSVC 2008
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10456
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
3c548bdcd17c203e381914e2bad9240646b52e85
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 12 Sep 2010 01:38:43 +0000 (01:38 +0000)]
UNMERGE
Fix stencil shadows in D3D9
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10457
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
fe2b0e78a4b355c52930d781af275e1c580136d0
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 14 Sep 2010 20:49:41 +0000 (20:49 +0000)]
UNMERGE
Set r_shadow_shadowmap2dcolortexture as first rendertarget when doing shadowmaps, sadly this didn't fix the shadowmaps but it at least fixed the white sky.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10462
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
24eb9d93a8cdc6a8c8bac7f821a40eea5a262387
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 16 Sep 2010 08:45:34 +0000 (08:45 +0000)]
UNMERGE
on D3D9 renderer do not allow textures to be uploaded with a size smaller than 2xN or Nx2 because the REF rasterizer refuses these (which makes PIX debugging hard)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10463
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
ff37132b0137d1e241c185a73e18d6fbc3c3cdb3
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 16 Sep 2010 09:14:39 +0000 (09:14 +0000)]
UNMERGE
restructure the previous fix so it actually does something
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10464
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
f3581bd039cdb478dfd0e7bbc48a66bad593ae7a
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 16 Sep 2010 10:58:28 +0000 (10:58 +0000)]
UNMERGE
change D3D9 implementation of TEXTYPE_SHADOWMAP textures to use CreateDepthStencilSurface instead of CreateTexture, this fixes lots of errors (PIX works, REF rasterizer works, etc)
implement freeing of D3D9 textures
disable the texture size padding on D3D9 as it was not the cause of PIX trouble
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10465
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
3b8498c0b8b8ae1740c13519d3ceea8d9823774e
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 16 Sep 2010 22:20:24 +0000 (22:20 +0000)]
UNMERGE
Added debug shaderflags used by the shader compiler which is needed to debug the shaders in pix
Also added saving of vertstring and fragstring to disk and D3DXCompileShaderFromFileA to load them, this helps when debugging shaders in pix ( all commented out )
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10466
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
24d6306967a695130789ada49e6a7f0e58f4fbad
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 08:56:55 +0000 (08:56 +0000)]
UNMERGE
remove r_shadow_texturetype cvar (now always uses 2D textures), remove shadowmap cube and rect support
removed GL_ARB_texture_rectangle texture support throughout engine (nothing using it)
refactored D3D9 path in R_Mesh_SetRenderTargets in unsuccessful attempt to fix D3D9 shadowmapping
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10467
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
5896a10952478d0f0f805aca72f1bb268ace7d81
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 09:16:30 +0000 (09:16 +0000)]
UNMERGE
enable Tomaz's PIX-friendly shader debugging code if gl_paranoid is 1
made CHECKGLERROR not crash if qglGetError is NULL (as in D3D9 renderer for example)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10468
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
5f5982cec6cf87e5a9d729ba73ec387b03d1f58a
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 11:24:52 +0000 (11:24 +0000)]
UNMERGE
fix a crash in D3D9 with r_sky 0
cleaned up some shadowmap debugging code in D3D9 shader
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10469
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
9ed81e318d66aa533b9c494d61b0609ba19499de
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 11:28:24 +0000 (11:28 +0000)]
UNMERGE
in D3D9 mode do not use the VSDCT cubemap because the ShadowMap_Parameters are completely incompatible in the D3D9 renderer
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10470
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
f9e8d27908695f31f979cc07f96e5d8e312e4af4
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 14:19:14 +0000 (14:19 +0000)]
UNMERGE
fix some bugs in the HLSL shader, mostly to do with r_shadow_deferred
change texture unit for shadowmaps to 15 rather than 11 because this fixes a conflict between r_shadow_deferred 1 and r_shadows 2
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10471
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
30d2b84076b90be73d1838f1c396edcfd9989c69
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 22:47:20 +0000 (22:47 +0000)]
UNMERGE
More debug code for shaders, this time it preprocesses the shader before saving it as an .fx file
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10472
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
e1adc7df0732e7b25af3fc9ca3a82c2f1782fda4
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 22:47:57 +0000 (22:47 +0000)]
UNMERGE
Forgot to put back the paranoid code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10473
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
84e35ab21fc6f198614cf12441e8338af19058cb
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 22:58:16 +0000 (22:58 +0000)]
UNMERGE
Fix a couple HLSL shader warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10474
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
36d70aa30a19f9e2fc038b6f82ea193736527292
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 18 Sep 2010 12:47:03 +0000 (12:47 +0000)]
UNMERGE
don't use D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL because it clears the backbuffer depth on SetDepthStencilSurface calls
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10475
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
886269645343d27bed3ea58c9b32ae9bc872ead2
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 18 Sep 2010 22:45:49 +0000 (22:45 +0000)]
UNMERGE
Fixed the x axis flipped shadows, 1 step closer to getting all this to work perfecty in d3d9
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10476
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
633439b8c943def5f39a8be5b460733ba3c1fd07
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 21 Sep 2010 19:35:20 +0000 (19:35 +0000)]
UNMERGE
Fixed dynamic light shadowmapping in D3D, still gotta fix them in deferred
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10477
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
4352792d696b5831ffd9ab0f3ec2b91b89f24708
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 22 Sep 2010 16:21:11 +0000 (16:21 +0000)]
UNMERGE
fix a compile error and some warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10480
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
c37fd1ded7fac519b126bd630360af1c3890003a