summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/core/Game.cpp10
-rw-r--r--src/core/re3.cpp5
-rw-r--r--src/render/Renderer.cpp2
m---------vendor/librw0
4 files changed, 14 insertions, 3 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 2a6afa97..f6156a4c 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -245,10 +245,16 @@ CGame::InitialiseRenderWare(void)
#ifdef LIBRW
#ifdef PS2_MATFX
- rw::MatFX::modulateEnvMap = true;
+ rw::MatFX::envMapApplyLight = true;
+ rw::MatFX::envMapUseMatColor = true;
+ rw::MatFX::envMapFlipU = true;
#else
- rw::MatFX::modulateEnvMap = false;
+ rw::MatFX::envMapApplyLight = false;
+ rw::MatFX::envMapUseMatColor = false;
+ rw::MatFX::envMapFlipU = false;
#endif
+ rw::RGBA envcol = { 128, 128, 128, 255 };
+ rw::MatFX::envMapColor = envcol;
#else
#ifdef PS2_MATFX
ReplaceMatFxCallback();
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index f27f10fe..fe0347d9 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -964,6 +964,11 @@ extern bool gbRenderWorld2;
DebugMenuAddVar("Render", "Intensity", &CPostFX::Intensity, nil, 0.05f, 0, 10.0f);
DebugMenuAddVarBool8("Render", "Motion Blur", &CPostFX::MotionBlurOn, nil);
#endif
+#ifdef LIBRW
+ DebugMenuAddVarBool32("Render", "MatFX env map apply light", &rw::MatFX::envMapApplyLight, nil);
+ DebugMenuAddVarBool32("Render", "MatFX env map flip U", &rw::MatFX::envMapFlipU, nil);
+ DebugMenuAddVarBool32("Render", "MatFX env map use matcolor", &rw::MatFX::envMapUseMatColor, nil);
+#endif
#ifdef EXTENDED_PIPELINES
static const char *vehpipenames[] = { "MatFX", "Neo" };
e = DebugMenuAddVar("Render", "Vehicle Pipeline", &CustomPipes::VehiclePipeSwitch, nil,
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 9e60fe22..165ef235 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -1451,7 +1451,7 @@ CRenderer::ScanBigBuildingList(CPtrList &list)
// all missing from game actually
TestedBigBuildings++;
#endif
- if(!ent->bZoneCulled){
+ if(!ent->bZoneCulled || gbDisableZoneCull){
if(SetupBigBuildingVisibility(ent) == VIS_VISIBLE)
InsertEntityIntoList(ent);
#ifndef MASTER
diff --git a/vendor/librw b/vendor/librw
-Subproject 8b2caf8f86b4f793d07fbc6b7d0bd4aafd22162
+Subproject 0102f8836754c82b0ac35015bd1e6058904bc33