diff options
| author | aap <aap@papnet.eu> | 2020-07-20 23:25:04 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-07-20 23:25:04 +0200 |
| commit | 5bedca7692490914ad2545767a6f1aa1fd46f386 (patch) | |
| tree | fcee819f4c59b21fb4cbd48eb9f0c96cfbdff239 /src/core | |
| parent | Merge pull request #650 from majesticCoding/miami (diff) | |
| download | re3-5bedca7692490914ad2545767a6f1aa1fd46f386.tar re3-5bedca7692490914ad2545767a6f1aa1fd46f386.tar.gz re3-5bedca7692490914ad2545767a6f1aa1fd46f386.tar.bz2 re3-5bedca7692490914ad2545767a6f1aa1fd46f386.tar.lz re3-5bedca7692490914ad2545767a6f1aa1fd46f386.tar.xz re3-5bedca7692490914ad2545767a6f1aa1fd46f386.tar.zst re3-5bedca7692490914ad2545767a6f1aa1fd46f386.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/FileLoader.cpp | 2 | ||||
| -rw-r--r-- | src/core/re3.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index a29d26fa..86ebb5dd 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -1279,7 +1279,7 @@ CFileLoader::LoadOcclusionVolume(const char *line) &x, &y, &z, &width, &length, &height, &angle); - COcclusion::AddOne(x, y, z, width, length, z + height/2.0f, angle); + COcclusion::AddOne(x, y, z + height/2.0f, width, length, height, angle); } diff --git a/src/core/re3.cpp b/src/core/re3.cpp index b11fb5c7..f7a895c3 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -4,6 +4,7 @@ #include "crossplatform.h" #include "patcher.h" #include "Renderer.h" +#include "Occlusion.h" #include "Credits.h" #include "Camera.h" #include "Weather.h" @@ -495,6 +496,7 @@ DebugMenuPopulate(void) DebugMenuAddVarBool8("Render", "Frame limiter", &FrontEndMenuManager.m_PrefsFrameLimiter, nil); DebugMenuAddVarBool8("Render", "VSynch", &FrontEndMenuManager.m_PrefsVsync, nil); DebugMenuAddVar("Render", "Max FPS", &RsGlobal.maxFPS, nil, 1, 1, 1000, nil); + DebugMenuAddVarBool8("Render", "Occlusion debug", &bDisplayOccDebugStuff, nil); DebugMenuAddVarBool8("Render", "Show Ped Paths", &gbShowPedPaths, nil); DebugMenuAddVarBool8("Render", "Show Car Paths", &gbShowCarPaths, nil); DebugMenuAddVarBool8("Render", "Show Car Path Links", &gbShowCarPathsLinks, nil); |