6557800707
Merge branch 'master' into game/eliteforce
2014-12-02 17:40:09 -06:00
60d28722ef
Remove unfinished OpenGL display list code
...
It seems unlikely anyone is going to do anything with this aside from stub
it out in OpenGLES ports.
2014-11-16 14:57:13 -06:00
b1821e303d
OpenGL2: remove lightmap support from generic glsl shader.
...
This path was barely used and doing this compiles fewer shaders.
2014-11-10 21:59:37 -08:00
943259f6b4
OpenGL2: Support half floats for texcoords and vertex colors.
2014-11-03 19:10:35 -08:00
b7cd6b6088
Elite Force white space clean up
...
Also fixed some code to match ioq3 (a few comments, a printf, ..).
2014-10-29 10:13:12 -05:00
ccd93c127b
Port Elite Force renderer changes to OpenGL2
...
Appling the diff to renderergl2 mostly worked.
Had to change GLimp_HaveExtension to use GL_EXTENTIONS
directly because Elite Forces GL2 requires an extension that didn't fit in (the smaller than Q3)
glConfig.extensions_string.
Had to set ambientLight for RF_FULLBRIGHT, GL2 doesn't use ambientLightInt.
Made the RF_FORCE_ENT_ALPHA code change pStage->stateBits because the stateBits
are read a lot, whereas in GL1 it's done as an expression and passed to GL_State.
Copied from Spearmint.
There are a few issues; holodeck doors are missing and parts of light grid are black (???).
2014-10-29 09:00:23 -05:00
3765652778
OpenGL2: Fix corrupt models.
2014-10-23 16:51:10 -07:00
4f5ebf8349
OpenGL2: Bit of multidraw optimization.
2014-10-16 00:32:20 -07:00
541d3a40c2
OpenGL2: Interleave vertex data for static MD3s.
2014-10-15 03:42:29 -07:00
0578b70f38
OpenGL2: Reduce redundant GL calls.
2014-10-14 06:15:06 -07:00
84206c8598
OpenGL2: Vertex array object support.
2014-10-14 01:50:44 -07:00
873a02bd3c
OpenGL2: VBO cleanup.
2014-10-13 21:57:06 -07:00
2a3368481d
Merge branch 'master' into sdl2
...
Conflicts:
Makefile
code/renderergl2/tr_image.c
2014-08-25 15:00:48 +01:00
2b2d696f12
OpenGL2: Add fourth cascade for sun shadows, and adjust sun shadow cvar defaults.
2014-07-31 21:01:57 -07:00
75cce50a9c
Don't load external GLSL files by default
...
External GLSL should probably only be used for development testing,
not released products. The GLSL files are tied to the code, and the
code changes some what often.
Fixes using OpenArena 0.8.8 which has incompatible GLSL files in a pk3.
2014-07-25 23:57:53 -05:00
107cae63d6
Merge branch 'master' into sdl2
...
Conflicts:
.travis.yml
2014-06-03 00:52:49 -05:00
b12a9acf4d
Merge branch 'master' (early part 2) into sdl2
2014-06-03 00:50:50 -05:00
318d45cff5
OpenGL2: Reimplement MD3 tangent space calculation.
2014-05-27 18:20:12 -07:00
4fe69cb418
OpenGL2: Remove sRGB support, replace with gamma cvars.
2014-04-16 05:26:03 -07:00
73aa7ef2c7
Merge branch 'master' (early part) into sdl2
2014-03-24 17:51:57 -05:00
b099255748
#6095 : OpenGL2: Use areamask and leaf cluster for PVS when VIS is missing.
2014-03-19 17:59:07 -07:00
375f6247d4
OpenGL2: Parallax corrected cubemap (cheaper trick)
2014-03-16 16:29:38 -07:00
9ec7931c54
Merge branch 'master' into sdl2
2014-03-08 21:32:47 -06:00
ee67d0a981
OpenGL2: Add normalScale and parallaxDepth stage keywords and helper cvars.
2014-03-03 21:02:39 -08:00
3740c55dec
OpenGL2: Remove and force r_softOverbright.
2014-02-20 17:01:50 -08:00
1250b352be
Merge branch 'master' into sdl2
2014-02-18 10:30:35 +00:00
5fabc28dff
OpenGL2: Fix rendering when r_hdr = 0 and r_floatLightmap = 1
2014-02-14 22:41:25 -08:00
ed087bb89e
Merge branch 'master' into sdl2
2014-02-07 23:24:12 -06:00
bc2efc4870
#6077 : OpenGL2: Add r_ignoreDstAlpha.
2013-12-17 04:08:25 -08:00
f6f3a19f73
OpenGL2: Support GL_ARB_vertex_type_2_10_10_10_rev for normals/tangents/lightdirs
2013-12-09 17:33:54 -08:00
0a4da32d62
Remove R_AddAnimSurfaces and R_MakeAnimModel prototypes
2013-11-30 03:16:05 -06:00
ecc1f23b1d
OpenGL2: Remove redundant GLS_* enum.
...
Thanks Xycaleth for pointing out.
2013-11-29 23:40:48 -08:00
6f3edb20b8
#6069 : Remove md4 model support.
2013-11-29 16:13:47 -08:00
ad514c9689
Merge branch 'master' into sdl2
2013-11-26 16:57:10 -06:00
c350963bf2
OpenGL2: Match glsl data type names: matrix_t -> mat4_t, vec*i_t -> ivec*_t
2013-11-19 03:23:50 -08:00
3736968943
Merge branch 'master' into sdl2
2013-11-17 19:01:35 -06:00
6e5f8cc918
OpenGL2: Calculate bitangent in shader, and store normal/tangent as normalized byte arrays.
2013-11-12 19:21:51 -08:00
ef9fe17dd5
OpenGL2: Remove srfTriangle_t, and use glIndex_t instead.
2013-11-08 01:46:17 -08:00
8c3ae8d7d2
OpenGL2: Reimplement soft overbright to avoid a framebuffer blit.
2013-11-05 00:08:59 -08:00
3846c115e6
OpenGL2: Reduce glsl shader count by using a uniform to disable textures.
2013-11-03 19:34:22 -08:00
779ebfacfd
Merge branch 'master' into sdl2
2013-11-02 19:12:52 +00:00
ae0e09aba9
Remove vertexLightmap from textureBundle_t, it's never qtrue
2013-11-02 02:59:31 -05:00
6bd52de44e
Remove unused shader state code from tr_local.h
2013-11-02 02:35:59 -05:00
0f30dad10a
Merge last two commits into renderergl2
2013-10-29 23:22:02 -05:00
0bf1f3d0ba
Add support for IQM int blend indices and float blend weights
...
Integer blend indices are converted to bytes at load, ioq3 doesn't allow more than 128 joints.
Heavily based on code by @zippers.
2013-10-29 22:09:06 -05:00
1515841b38
Support IQMs with joints and no poses
2013-10-29 20:47:33 -05:00
535d0ea70e
OpenGL2: Merge bsp surface structs into a single struct, and more cleanup.
2013-10-15 01:19:16 -07:00
01efe4a538
OpenGL2: Use an idea from ETXreal and separate world VBO into separate VBOs by shader.
2013-10-14 03:58:13 -07:00
08fcecc829
OpenGL2: Clean up texmod calculations, and improve vertex animation handling.
2013-10-14 01:55:54 -07:00
f8355ba2fb
OpenGL2: Fix TCGEN_ENVIRONMENT stages not rendering correctly.
2013-10-10 03:41:31 -07:00
Zack Middleton
SmileTheory
Tim Angus
Tim Angus