From d2b5a422e464a202c58d330976fecddf1ee0f7f4 Mon Sep 17 00:00:00 2001 From: aap Date: Sun, 28 Feb 2021 14:17:14 +0100 Subject: update librw --- src/core/Game.cpp | 10 ++++++++-- src/core/re3.cpp | 5 +++++ vendor/librw | 2 +- 3 files changed, 14 insertions(+), 3 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, diff --git a/vendor/librw b/vendor/librw index 8b2caf8f..0102f883 160000 --- a/vendor/librw +++ b/vendor/librw @@ -1 +1 @@ -Subproject commit 8b2caf8f86b4f793d07fbc6b7d0bd4aafd22162f +Subproject commit 0102f8836754c82b0ac35015bd1e6058904bc334 -- cgit v1.2.3