diff options
| author | aap <aap@papnet.eu> | 2020-08-19 14:36:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 14:36:38 +0200 |
| commit | 76fe1247c86873fa548c85ae8598efd4ce1947c2 (patch) | |
| tree | 0d7d5e42a8e92841af0f89dc577eb0888831fd9f /src/rw | |
| parent | Island loading cleanup and fix (diff) | |
| parent | Merge branch 'master' of github.com:gtamodding/re3 (diff) | |
| download | re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.gz re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.bz2 re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.lz re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.xz re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.zst re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.zip | |
Diffstat (limited to 'src/rw')
| -rw-r--r-- | src/rw/Lights.h | 6 | ||||
| -rw-r--r-- | src/rw/VisibilityPlugins.cpp | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/rw/Lights.h b/src/rw/Lights.h index 6fdd51de..b296816b 100644 --- a/src/rw/Lights.h +++ b/src/rw/Lights.h @@ -1,5 +1,11 @@ #pragma once +extern RpLight *pAmbient; +extern RpLight *pDirect; +extern RpLight *pExtraDirectionals[4]; +extern int LightStrengths[4]; +extern int NumExtraDirLightsInWorld; + void SetLightsWithTimeOfDayColour(RpWorld *); RpWorld *LightsCreate(RpWorld *world); void LightsDestroy(RpWorld *world); diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp index f6a9c3b5..b2e252a0 100644 --- a/src/rw/VisibilityPlugins.cpp +++ b/src/rw/VisibilityPlugins.cpp @@ -8,6 +8,7 @@ #include "Camera.h" #include "VisibilityPlugins.h" #include "World.h" +#include "custompipes.h" #define FADE_DISTANCE 20.0f @@ -146,6 +147,10 @@ CVisibilityPlugins::RenderFadingEntities(void) CEntity *e = node->item.entity; if(e->m_rwObject == nil) continue; +#ifdef EXTENDED_PIPELINES + if(CustomPipes::bRenderingEnvMap && (e->IsPed() || e->IsVehicle())) + continue; +#endif mi = (CSimpleModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex()); #ifdef FIX_BUGS if(mi->GetModelType() == MITYPE_SIMPLE && mi->m_noZwrite) |