zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 12:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Initial work on Doom64-style fade/glow

Browse source 
# Conflicts:
#	src/hwrenderer/scene/hw_renderstate.h

# Conflicts:
#	src/r_defs.h
This commit is contained in:
Kevin Caccamo 2018-12-16 09:09:58 -05:00 committed by drfrag
parent 5f231473fd
commit 8dd306a081
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/renderer/gl_renderstate.h
View file

@ -100,7 +100,7 @@ class FRenderState
FVertexBuffer *mVertexBuffer, *mCurrentVertexBuffer;
FStateVec4 mNormal;
FStateVec4 mColor;
FStateVec4 mColor, mColorAdd;
FStateVec4 mCameraPos;
FStateVec4 mGlowTop, mGlowBottom;
FStateVec4 mGlowTopPlane, mGlowBottomPlane;

1
src/namedef.h
View file

@ -588,6 +588,7 @@ xx(Color_Ceiling)
xx(Color_Walltop)
xx(Color_Wallbottom)
xx(Color_Sprites)
xx(Color_Add)
xx(Desaturation)
xx(SoundSequence)
xx(Silent)

4
src/p_udmf.cpp
View file

@ -1627,6 +1627,10 @@ public:
sec->SpecialColors[sector_t::sprites] = CheckInt(key) | 0xff000000;
break;
case NAME_Color_Add:
sec->SpecialColors[sector_t::add] = CheckInt(key) | 0xff000000;
break;
case NAME_Desaturation:
desaturation = int(255*CheckFloat(key) + FLT_EPSILON); // FLT_EPSILON to avoid rounding errors with numbers slightly below a full integer.
continue;

5
src/r_defs.h
View file

@ -657,7 +657,8 @@ public:
// only used for specialcolors array
walltop,
wallbottom,
sprites
sprites,
add
};
struct splane
@ -964,7 +965,7 @@ public:
secplane_t floorplane, ceilingplane;
// [RH] give floor and ceiling even more properties
PalEntry SpecialColors[5];
PalEntry SpecialColors[6];
FColormap Colormap;
private: