summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-02-28 14:17:14 +0100
committeraap <aap@papnet.eu>2021-02-28 14:17:14 +0100
commitd2b5a422e464a202c58d330976fecddf1ee0f7f4 (patch)
tree3b9a033dcc311d51c1e42d02ddf3b0852b628e36 /src/core
parentFixes (diff)
downloadre3-d2b5a422e464a202c58d330976fecddf1ee0f7f4.tar
re3-d2b5a422e464a202c58d330976fecddf1ee0f7f4.tar.gz
re3-d2b5a422e464a202c58d330976fecddf1ee0f7f4.tar.bz2
re3-d2b5a422e464a202c58d330976fecddf1ee0f7f4.tar.lz
re3-d2b5a422e464a202c58d330976fecddf1ee0f7f4.tar.xz
re3-d2b5a422e464a202c58d330976fecddf1ee0f7f4.tar.zst
re3-d2b5a422e464a202c58d330976fecddf1ee0f7f4.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Game.cpp10
-rw-r--r--src/core/re3.cpp5
2 files changed, 13 insertions, 2 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 43bd3d11..bffc620c 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 = { 64, 64, 64, 255 };
+ rw::MatFX::envMapColor = envcol;
#else
#ifdef PS2_MATFX
ReplaceMatFxCallback();
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 0ce7f834..e2220467 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -1037,6 +1037,11 @@ extern bool gbRenderWorld2;
#ifndef MASTER
DebugMenuAddVarBool8("Render", "Occlusion debug", &bDispayOccDebugStuff, 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,