From 13a05dbd633a4ae31e722e9a92cc3bdcabd3320f Mon Sep 17 00:00:00 2001 From: cody glassman Date: Fri, 29 Apr 2022 17:01:28 -0700 Subject: [PATCH 1/2] simple water should respect filter settings --- CHANGELOG.md | 1 + apps/openmw/mwrender/water.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26e52a1ea0..d0591139eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ Bug #5913: Failed assertion during Ritual of Trees quest Bug #5928: Glow in the Dahrk functionality used without mod installed Bug #5937: Lights always need to be rotated by 90 degrees + Bug #5989: Simple water isn't affected by texture filter settings Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher Bug #6051: NaN water height in ESM file is not handled gracefully Bug #6066: addtopic "return" does not work from within script. No errors thrown diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp index 7d9aca9b76..20cd789d7f 100644 --- a/apps/openmw/mwrender/water.cpp +++ b/apps/openmw/mwrender/water.cpp @@ -590,6 +590,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha) osg::ref_ptr tex (new osg::Texture2D(mResourceSystem->getImageManager()->getImage(texname.str()))); tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT); tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT); + mResourceSystem->getSceneManager()->applyFilterSettings(tex); textures.push_back(tex); } From ed6cd487ee1773846943bbd0a76ffeb5f2471efd Mon Sep 17 00:00:00 2001 From: cody glassman Date: Fri, 29 Apr 2022 17:26:09 -0700 Subject: [PATCH 2/2] allow updating filtering at runtime --- apps/openmw/mwrender/renderingmanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 384580adb8..b5ad5dac7b 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -1182,6 +1182,7 @@ namespace MWRender ); mTerrain->updateTextureFiltering(); + mWater->processChangedSettings({}); mViewer->startThreading(); }