Zack Middleton
ad514c9689
Merge branch 'master' into sdl2
2013-11-26 16:57:10 -06:00
SmileTheory
c350963bf2
OpenGL2: Match glsl data type names: matrix_t -> mat4_t, vec*i_t -> ivec*_t
2013-11-19 03:23:50 -08:00
Zack Middleton
3736968943
Merge branch 'master' into sdl2
2013-11-17 19:01:35 -06:00
SmileTheory
6e5f8cc918
OpenGL2: Calculate bitangent in shader, and store normal/tangent as normalized byte arrays.
2013-11-12 19:21:51 -08:00
SmileTheory
ef9fe17dd5
OpenGL2: Remove srfTriangle_t, and use glIndex_t instead.
2013-11-08 01:46:17 -08:00
SmileTheory
8c3ae8d7d2
OpenGL2: Reimplement soft overbright to avoid a framebuffer blit.
2013-11-05 00:08:59 -08:00
SmileTheory
3846c115e6
OpenGL2: Reduce glsl shader count by using a uniform to disable textures.
2013-11-03 19:34:22 -08:00
Tim Angus
779ebfacfd
Merge branch 'master' into sdl2
2013-11-02 19:12:52 +00:00
Zack Middleton
ae0e09aba9
Remove vertexLightmap from textureBundle_t, it's never qtrue
2013-11-02 02:59:31 -05:00
Zack Middleton
6bd52de44e
Remove unused shader state code from tr_local.h
2013-11-02 02:35:59 -05:00
Zack Middleton
0f30dad10a
Merge last two commits into renderergl2
2013-10-29 23:22:02 -05:00
Zack Middleton
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
Zack Middleton
1515841b38
Support IQMs with joints and no poses
2013-10-29 20:47:33 -05:00
SmileTheory
535d0ea70e
OpenGL2: Merge bsp surface structs into a single struct, and more cleanup.
2013-10-15 01:19:16 -07:00
SmileTheory
01efe4a538
OpenGL2: Use an idea from ETXreal and separate world VBO into separate VBOs by shader.
2013-10-14 03:58:13 -07:00
SmileTheory
08fcecc829
OpenGL2: Clean up texmod calculations, and improve vertex animation handling.
2013-10-14 01:55:54 -07:00
SmileTheory
f8355ba2fb
OpenGL2: Fix TCGEN_ENVIRONMENT stages not rendering correctly.
2013-10-10 03:41:31 -07:00
SmileTheory
c6774cf113
OpenGL2: default to RGBM lightmap, and add r_floatLightmap for old behaviour.
2013-10-07 01:46:50 -07:00
SmileTheory
acbeca6042
OpenGL2: Remove AGEN_FRESNEL(superceded by cubemap patch), and some small fixes and optimizations.
2013-09-24 03:29:49 -07:00
SmileTheory
82be4e667f
OpenGL2: Disable GL_ARB_seamless_cube_map by default, caused huge frame drops on some hardware
2013-09-20 17:20:36 -07:00
Tim Angus
76e49b668e
Merge branch 'master' into sdl2
2013-09-16 22:34:51 +01:00
SmileTheory
7e875c6941
#5979 : Cubemap support for opengl2.
2013-09-16 00:54:26 -07:00
Tim Angus
bde7665462
Merge branch 'master' into sdl2
...
Conflicts:
code/sdl/sdl_input.c
2013-08-16 23:34:08 +01:00
Ensiform
53bbfc2cd6
Remove unused renderCommandList variable from renderers
2013-05-13 12:08:16 -05:00
Tim Angus
d9d52f0306
Merge branch 'master' into sdl2
...
Conflicts:
Makefile
code/renderercommon/qgl.h
code/renderergl1/tr_local.h
code/sdl/sdl_glimp.c
2013-05-08 14:27:15 +01:00
SmileTheory
8270d54a25
Don't scale shadow multipliers by overbrightbits, and improve documentation.
2013-04-22 21:52:16 -07:00
SmileTheory
28e14c4546
Add sunlight/lightmap merging by multiply (r_sunlightMode 1)
...
Merge additive sunlight and map lighting into one GLSL shader (r_sunlightMode 2)
Change single lightmap blends to use lightall
2013-04-02 00:17:24 -07:00
SmileTheory
66acde6d60
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
2013-03-25 21:05:27 -07:00
Zachary Slater
01efc26654
s/enum/typedef enum/g on uniform_t for glorious fix of mac build. h/t MAN-AT-ARMS
2013-03-25 14:28:01 -07:00
SmileTheory
8b23985358
Make all GLSL shaders use the same set of uniforms.
2013-03-20 22:53:30 -07:00
Tim Angus
ecd50f01c2
Remove RAVENMD4 #define
2013-03-18 19:05:51 +00:00
Tim Angus
bf25c27105
Oops missed a bit
2013-03-12 21:20:33 +00:00
Tim Angus
3e92679100
Fix USE_FREETYPE breakage
2013-03-12 19:41:52 +00:00
Tim Angus
37c69a8009
Move renderers a bit closer together
2013-03-12 17:52:29 +00:00
Zack Middleton
8aa6efe7b6
Fix origin returned by IQM's LerpTag
...
It use to return pose joint's offset from base at the lerped frame, now it returns the joint's origin at the lerped frame.
Patch by Axel Isouard and Zack Middleton.
2013-03-08 13:47:16 -06:00
Zack Middleton
c7059fbf28
Move noise function declations to tr_common.h
...
tr_noise.c is in renderercommon directory, so declare them in header there too.
2013-02-27 15:35:02 -06:00
Tim Angus
d201443350
Remove a few name tags
2013-02-16 21:03:56 +00:00
Tim Angus
2da0fd6de8
Add renderercommon/tr_common.h
2013-02-16 20:58:04 +00:00
Tim Angus
f6fb9eb602
renderer -> renderergl1, rend2 -> renderergl2
2013-02-15 23:46:37 +00:00