OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added a flash component to the colormap shader.

Browse source 
Its main purpose is for RR's lightning flash in Raze but this looks very useful for manipulating fullscreen colormaps. Currently not exposed, though.
This commit is contained in:
Christoph Oelckers 2020-06-07 09:16:56 +02:00
commit b06af634e2
17 changed files with 46 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
View file

@ -532,20 +532,26 @@ void PPCameraExposure::UpdateTextures(int width, int height)
/////////////////////////////////////////////////////////////////////////////
void PPColormap::Render(PPRenderState *renderstate, int fixedcm)
void PPColormap::Render(PPRenderState *renderstate, int fixedcm, float flash)
{
ColormapUniforms uniforms;
if (fixedcm < CM_FIRSTSPECIALCOLORMAP || fixedcm >= CM_MAXCOLORMAP)
{
return;
if (flash == 1.f)
return;
uniforms.MapStart = { 0,0,0, flash };
uniforms.MapRange = { 0,0,0, 1.f };
}
else
{
FSpecialColormap* scm = &SpecialColormaps[fixedcm - CM_FIRSTSPECIALCOLORMAP];
FSpecialColormap *scm = &SpecialColormaps[fixedcm - CM_FIRSTSPECIALCOLORMAP];
float m[] = { scm->ColorizeEnd[0] - scm->ColorizeStart[0],
scm->ColorizeEnd[1] - scm->ColorizeStart[1], scm->ColorizeEnd[2] - scm->ColorizeStart[2], 0.f };
ColormapUniforms uniforms;
uniforms.MapStart = { scm->ColorizeStart[0], scm->ColorizeStart[1], scm->ColorizeStart[2], 0.f };
uniforms.MapRange = m;
uniforms.MapStart = { scm->ColorizeStart[0], scm->ColorizeStart[1], scm->ColorizeStart[2], flash };
uniforms.MapRange = { scm->ColorizeEnd[0] - scm->ColorizeStart[0],
scm->ColorizeEnd[1] - scm->ColorizeStart[1], scm->ColorizeEnd[2] - scm->ColorizeStart[2], 0.f };
}
renderstate->PushGroup("colormap");
@ -1117,10 +1123,10 @@ void Postprocess::Pass1(PPRenderState* state, int fixedcm, int sceneWidth, int s
bloom.RenderBloom(state, sceneWidth, sceneHeight, fixedcm);
}
void Postprocess::Pass2(PPRenderState* state, int fixedcm, int sceneWidth, int sceneHeight)
void Postprocess::Pass2(PPRenderState* state, int fixedcm, float flash, int sceneWidth, int sceneHeight)
{
tonemap.Render(state);
colormap.Render(state, fixedcm);
colormap.Render(state, fixedcm, flash);
lens.Render(state);
fxaa.Render(state);
customShaders.Run(state, "scene");

4
src/common/rendering/hwrenderer/postprocessing/hw_postprocess.h
View file

@ -530,7 +530,7 @@ struct ColormapUniforms
class PPColormap
{
public:
void Render(PPRenderState *renderstate, int fixedcm);
void Render(PPRenderState *renderstate, int fixedcm, float flash);
private:
PPShader Colormap = { "shaders/pp/colormap.fp", "", ColormapUniforms::Desc() };
@ -841,7 +841,7 @@ public:
void Pass1(PPRenderState *state, int fixedcm, int sceneWidth, int sceneHeight);
void Pass2(PPRenderState* state, int fixedcm, int sceneWidth, int sceneHeight);
void Pass2(PPRenderState* state, int fixedcm, float flash, int sceneWidth, int sceneHeight);
};
extern Postprocess hw_postprocess;