Merge branch '2' into 'master'

stop making new reflacttetures at intext change See merge request OpenMW/openmw!116
usmanhf · May 24, 2019 · e0fb411 · e0fb411
2 parents 97873f9 + 6c310c6
commit e0fb411
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
@@ -336,14 +336,7 @@ class Reflection : public osg::Camera
         setName("ReflectionCamera");
         setCullCallback(new InheritViewPointCallback);
 
-        int reflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
-        reflectionDetail = std::min(4, std::max(isInterior ? 2 : 0, reflectionDetail));
-        unsigned int extraMask = 0;
-        if(reflectionDetail >= 1) extraMask |= Mask_Terrain;
-        if(reflectionDetail >= 2) extraMask |= Mask_Static;
-        if(reflectionDetail >= 3) extraMask |= Mask_Effect|Mask_ParticleSystem|Mask_Object;
-        if(reflectionDetail >= 4) extraMask |= Mask_Player|Mask_Actor;
-        setCullMask(Mask_Scene|Mask_Sky|Mask_Lighting|extraMask);
+        setInterior(isInterior);
         setNodeMask(Mask_RenderToTexture);
 
         unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
@@ -374,6 +367,18 @@ class Reflection : public osg::Camera
         SceneUtil::ShadowManager::disableShadowsForStateSet(getOrCreateStateSet());
     }
 
+    void setInterior(bool isInterior)
+    {
+        int reflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
+        reflectionDetail = std::min(4, std::max(isInterior ? 2 : 0, reflectionDetail));
+        unsigned int extraMask = 0;
+        if(reflectionDetail >= 1) extraMask |= Mask_Terrain;
+        if(reflectionDetail >= 2) extraMask |= Mask_Static;
+        if(reflectionDetail >= 3) extraMask |= Mask_Effect|Mask_ParticleSystem|Mask_Object;
+        if(reflectionDetail >= 4) extraMask |= Mask_Player|Mask_Actor;
+        setCullMask(Mask_Scene|Mask_Sky|Mask_Lighting|extraMask);
+    }
+
     void setWaterLevel(float waterLevel)
     {
         setViewMatrix(osg::Matrix::scale(1,1,-1) * osg::Matrix::translate(0,0,2 * waterLevel));
@@ -668,8 +673,8 @@ void Water::changeCell(const MWWorld::CellStore* store)
         mWaterNode->setPosition(osg::Vec3f(0,0,mTop));
         mInterior = true;
     }
-    if(mInterior != wasInterior)
-        updateWaterMaterial();
+    if(mInterior != wasInterior && mReflection)
+        mReflection->setInterior(mInterior);
 
     // create a new StateSet to prevent threading issues
     osg::ref_ptr<osg::StateSet> nodeStateSet (new osg::StateSet);