mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 18:09:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'settings_values_groundcover' into 'master'

Browse source 
Use settings values for Groundcover settings (#6876)

See merge request OpenMW/openmw!3204
This commit is contained in:
Alexei Kotov 2023-07-11 13:58:03 +00:00
commit 89c18d85de
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; globalDefines[itr->first] = itr->second;
// Refactor this at some point - most shaders don't care about these defines // 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["groundcoverFadeStart"] = std::to_string(groundcoverDistance * 0.9f);
globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance); globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
globalDefines["groundcoverStompMode"] globalDefines["groundcoverStompMode"] = std::to_string(Settings::groundcover().mStompMode);
= std::to_string(std::clamp(Settings::Manager::getInt("stomp mode", "Groundcover"), 0, 2)); globalDefines["groundcoverStompIntensity"] = std::to_string(Settings::groundcover().mStompIntensity);
globalDefines["groundcoverStompIntensity"]
= std::to_string(std::clamp(Settings::Manager::getInt("stomp intensity", "Groundcover"), 0, 2));
globalDefines["reverseZ"] = reverseZ ? "1" : "0"; globalDefines["reverseZ"] = reverseZ ? "1" : "0";
@ -1327,7 +1325,7 @@ namespace MWRender
RenderingManager::WorldspaceChunkMgr newChunkMgr; RenderingManager::WorldspaceChunkMgr newChunkMgr;
const float lodFactor = Settings::Manager::getFloat("lod factor", "Terrain"); 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"); bool distantTerrain = Settings::Manager::getBool("distant terrain", "Terrain");
if (distantTerrain || groundcover) if (distantTerrain || groundcover)
{ {
@ -1350,10 +1348,8 @@ namespace MWRender
} }
if (groundcover) if (groundcover)
{ {
float groundcoverDistance const float groundcoverDistance = Settings::groundcover().mRenderingDistance;
= std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover")); const float density = Settings::groundcover().mDensity;
float density = Settings::Manager::getFloat("density", "Groundcover");
density = std::clamp(density, 0.f, 1.f);
newChunkMgr.mGroundcover = std::make_unique<Groundcover>( newChunkMgr.mGroundcover = std::make_unique<Groundcover>(
mResourceSystem->getSceneManager(), density, groundcoverDistance, mGroundCoverStore); 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, void World::loadGroundcoverFiles(const Files::Collections& fileCollections,
const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener) const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
{ {
if (!Settings::Manager::getBool("enabled", "Groundcover")) if (!Settings::groundcover().mEnabled)
return; return;
Log(Debug::Info) << "Loading groundcover:"; Log(Debug::Info) << "Loading groundcover:";