krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

make snow create water ripples

Browse source
This commit is contained in:
Miloslav Číž 2017-10-16 20:23:56 +02:00
parent da47653625
commit 797e407269
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/openmw/mwrender/sky.cpp
View file

@ -1245,9 +1245,11 @@ private:
class AlphaFader : public SceneUtil::StateSetUpdater class AlphaFader : public SceneUtil::StateSetUpdater
{ {
public: public:
AlphaFader() /// @param rainIntensityUniform rain uniform to update along with alpha, can be NULL
AlphaFader(osg::Uniform *rainIntensityUniform=NULL)
: mAlpha(1.f) : mAlpha(1.f)
{ {
mRainIntensityUniform = rainIntensityUniform;
} }
void setAlpha(float alpha) void setAlpha(float alpha)
@ -1266,15 +1268,19 @@ public:
{ {
osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL)); osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,mAlpha)); mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,mAlpha));
if (mRainIntensityUniform)
mRainIntensityUniform->set((float) mAlpha);
} }
// Helper for adding AlphaFaders to a subgraph // Helper for adding AlphaFaders to a subgraph
class SetupVisitor : public osg::NodeVisitor class SetupVisitor : public osg::NodeVisitor
{ {
public: public:
SetupVisitor() SetupVisitor(osg::Uniform *rainIntensityUniform)
: osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
{ {
mRainIntensityUniform = rainIntensityUniform;
} }
virtual void apply(osg::Node &node) virtual void apply(osg::Node &node)
@ -1285,14 +1291,16 @@ public:
{ {
SceneUtil::CompositeStateSetUpdater* composite = NULL; SceneUtil::CompositeStateSetUpdater* composite = NULL;
osg::Callback* callback = node.getUpdateCallback(); osg::Callback* callback = node.getUpdateCallback();
while (callback) while (callback)
{ {
if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback))) if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback)))
break; break;
callback = callback->getNestedCallback(); callback = callback->getNestedCallback();
} }
osg::ref_ptr<AlphaFader> alphaFader (new AlphaFader); osg::ref_ptr<AlphaFader> alphaFader (new AlphaFader(mRainIntensityUniform));
if (composite) if (composite)
composite->addController(alphaFader); composite->addController(alphaFader);
@ -1312,10 +1320,12 @@ public:
private: private:
std::vector<osg::ref_ptr<AlphaFader> > mAlphaFaders; std::vector<osg::ref_ptr<AlphaFader> > mAlphaFaders;
osg::Uniform *mRainIntensityUniform;
}; };
protected: protected:
float mAlpha; float mAlpha;
osg::Uniform *mRainIntensityUniform;
}; };
class RainFader : public AlphaFader class RainFader : public AlphaFader
@ -1645,12 +1655,16 @@ void SkyManager::setWeather(const WeatherResult& weather)
mParticleNode->setNodeMask(Mask_WeatherParticles); mParticleNode->setNodeMask(Mask_WeatherParticles);
mRootNode->addChild(mParticleNode); mRootNode->addChild(mParticleNode);
} }
mParticleEffect = mSceneManager->getInstance(mCurrentParticleEffect, mParticleNode); mParticleEffect = mSceneManager->getInstance(mCurrentParticleEffect, mParticleNode);
SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource)); SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
mParticleEffect->accept(assignVisitor); mParticleEffect->accept(assignVisitor);
AlphaFader::SetupVisitor alphaFaderSetupVisitor; osg::Uniform *rainUniform = weather.mIsStorm ? NULL : mRainIntensityUniform;
AlphaFader::SetupVisitor alphaFaderSetupVisitor(rainUniform);
mParticleEffect->accept(alphaFaderSetupVisitor); mParticleEffect->accept(alphaFaderSetupVisitor);
mParticleFaders = alphaFaderSetupVisitor.getAlphaFaders(); mParticleFaders = alphaFaderSetupVisitor.getAlphaFaders();