1
0
mirror of https://github.com/td512/re3.git synced 2026-05-26 01:07:16 +00:00

Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
This commit is contained in:
Sergeanur
2021-04-09 04:31:46 +03:00
16 changed files with 194 additions and 91 deletions

View File

@@ -1297,10 +1297,12 @@ void
RenderEffects_new(void)
{
PUSH_RENDERGROUP("RenderEffects_new");
/* // stupid to do this before the whole world is drawn!
CShadows::RenderStaticShadows();
CShadows::RenderStoredShadows();
CSkidmarks::Render();
CRubbish::Render();
*/
// these aren't really effects
DefinedState();
@@ -1323,6 +1325,13 @@ if(gbRenderFadingInEntities)
CRenderer::RenderFadingInEntities();
// actual effects here
// from above
CShadows::RenderStaticShadows();
CShadows::RenderStoredShadows();
CSkidmarks::Render();
CRubbish::Render();
CGlass::Render();
// CMattRenderer::ResetRenderStates
DefinedState();