Christoph Oelckers
d2309af3d5
Merge remote-tracking branch 'remotes/origin/master' into modern
...
# Conflicts:
# src/d_main.cpp
# src/hwrenderer/scene/hw_weapon.cpp
2018-06-19 19:40:52 +02:00
Christoph Oelckers
cf1641d0f6
- reduce number of places in weapon code which access r_viewpoint directly.
2018-06-19 10:25:11 +02:00
Christoph Oelckers
4937848123
- refactoring of fixed colormap stuff to have it better organized and to reduce the number of uniforms in the main shader.
...
This removes 3 uniforms, consisting of 9 floats. Those were merged into other values that never get used at the same time.
It also moves the costly setup of the fixed colormap out of the render state into the 2D processing code.
Since 3D forces use of render buffers now, it is no longer necessary to draw the entire scene with the colormap active, meaning it can be handled more efficiently.
2018-06-16 22:40:44 +02:00
Christoph Oelckers
8ab68264c1
- removal of all code to handle OpenGL 2. From this commit on the main build of GZDoom will be OpenGL 3.3 or higher.
...
# Conflicts:
# src/gl/renderer/gl_renderer.cpp
# src/gl/shaders/gl_shader.cpp
# src/gl/system/gl_framebuffer.cpp
# src/gl_load/gl_interface.cpp
2018-06-15 21:45:05 +02:00
Magnus Norddahl
31abe3df7e
- avoid reusing the same mVBuf pointer for the different renderers as that causes too many problems when switching between them
...
- remove gl_ prefix for model functions that are no longer GL specific
2018-05-21 17:52:03 +02:00
alexey.lysiuk
2cdc9f9dda
- fixed applying of alpha to weapon sprites
...
https://forum.zdoom.org/viewtopic.php?t=60638
https://forum.zdoom.org/viewtopic.php?t=60642
2018-05-21 10:53:02 +03:00
Christoph Oelckers
142368d958
- fixed alpha of weapon sprite.
2018-05-12 18:45:12 +02:00
Christoph Oelckers
e1ad4b618d
- fixed: The targeter drawer did not check the return value of its setup function.
...
This caused invalid items to be passed to the renderer.
2018-05-10 09:09:24 +02:00
Christoph Oelckers
52d73eabbf
- weapon drawing code refactor complete.
...
Setup and drawing are now done separately, this also no longer needs the Quad drawer.
2018-05-04 23:11:37 +02:00
Christoph Oelckers
e0833d5005
- prepared the weapon sprite drawer for full separation.
2018-05-03 23:49:16 +02:00
Christoph Oelckers
2b5019ea6e
- fix for rendering a brightmapped 2D texture with ColorIsFixed render style.
...
This must disable the brightmap.
2018-04-30 21:28:06 +02:00
Christoph Oelckers
ebc1c5741b
- some more weapon code extracted.
2018-04-30 00:09:42 +02:00
Christoph Oelckers
c2ac985357
- split off the utility functions from gl_weapon.cpp.
...
Meaning there's only half as much code left to clean up.
2018-04-29 23:38:26 +02:00
