mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-18 13:20:47 +00:00
Code Issues Projects Releases Wiki Activity

Use settings values for Groundcover settings

Browse Source
This commit is contained in:
elsid 2023-07-07 21:21:03 +02:00
parent 63e9a63c67
commit 0851f0705d
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -414,13 +414,11 @@ namespace MWRender
globalDefines[itr->first] = itr->second;
// Refactor this at some point - most shaders don't care about these defines
float groundcoverDistance = std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover"));
const float groundcoverDistance = Settings::groundcover().mRenderingDistance;
globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * 0.9f);
globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
globalDefines["groundcoverStompMode"]
= std::to_string(std::clamp(Settings::Manager::getInt("stomp mode", "Groundcover"), 0, 2));
globalDefines["groundcoverStompIntensity"]
= std::to_string(std::clamp(Settings::Manager::getInt("stomp intensity", "Groundcover"), 0, 2));
globalDefines["groundcoverStompMode"] = std::to_string(Settings::groundcover().mStompMode);
globalDefines["groundcoverStompIntensity"] = std::to_string(Settings::groundcover().mStompIntensity);
globalDefines["reverseZ"] = reverseZ ? "1" : "0";
@ -1327,7 +1325,7 @@ namespace MWRender
RenderingManager::WorldspaceChunkMgr newChunkMgr;
const float lodFactor = Settings::Manager::getFloat("lod factor", "Terrain");
bool groundcover = Settings::Manager::getBool("enabled", "Groundcover");
const bool groundcover = Settings::groundcover().mEnabled;
bool distantTerrain = Settings::Manager::getBool("distant terrain", "Terrain");
if (distantTerrain || groundcover)
{
@ -1350,10 +1348,8 @@ namespace MWRender
}
if (groundcover)
{
float groundcoverDistance
= std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover"));
float density = Settings::Manager::getFloat("density", "Groundcover");
density = std::clamp(density, 0.f, 1.f);
const float groundcoverDistance = Settings::groundcover().mRenderingDistance;
const float density = Settings::groundcover().mDensity;
newChunkMgr.mGroundcover = std::make_unique<Groundcover>(
mResourceSystem->getSceneManager(), density, groundcoverDistance, mGroundCoverStore);

2
apps/openmw/mwworld/worldimp.cpp
View File

@ -2892,7 +2892,7 @@ namespace MWWorld
void World::loadGroundcoverFiles(const Files::Collections& fileCollections,
const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
{
if (!Settings::Manager::getBool("enabled", "Groundcover"))
if (!Settings::groundcover().mEnabled)
return;
Log(Debug::Info) << "Loading groundcover:";