mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

Star fading (Bug #2693)

Browse source
This commit is contained in:
scrawl 2015-06-19 20:55:04 +02:00
parent 74260a9a44
commit efad4efe19
4 changed files with 54 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@ namespace MWRender
class AtmosphereUpdater : public SceneUtil::StateSetUpdater
{
public:
void setEmissionColor(osg::Vec4f emissionColor)
void setEmissionColor(const osg::Vec4f& emissionColor)
{
mEmissionColor = emissionColor;
}
@ -117,6 +117,45 @@ private:
osg::Vec4f mEmissionColor;
};
class AtmosphereNightUpdater : public SceneUtil::StateSetUpdater
{
public:
AtmosphereNightUpdater(Resource::TextureManager* textureManager)
{
// we just need a texture, its contents don't really matter
mTexture = textureManager->getWarningTexture();
}
void setFade(const float fade)
{
mColor.a() = fade;
}
protected:
virtual void setDefaults(osg::StateSet* stateset)
{
osg::ref_ptr<osg::TexEnvCombine> texEnv (new osg::TexEnvCombine);
texEnv->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
texEnv->setSource1_Alpha(osg::TexEnvCombine::CONSTANT);
texEnv->setCombine_RGB(osg::TexEnvCombine::REPLACE);
texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
stateset->setTextureAttributeAndModes(1, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
stateset->setTextureAttributeAndModes(1, texEnv, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
}
virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/)
{
osg::TexEnvCombine* texEnv = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
texEnv->setConstantColor(mColor);
}
osg::ref_ptr<osg::Texture2D> mTexture;
osg::Vec4f mColor;
};
class CloudUpdater : public SceneUtil::StateSetUpdater
{
public:
@ -129,7 +168,7 @@ public:
{
mTexture = texture;
}
void setEmissionColor(osg::Vec4f emissionColor)
void setEmissionColor(const osg::Vec4f& emissionColor)
{
mEmissionColor = emissionColor;
}
@ -570,6 +609,8 @@ void SkyManager::create()
atmosphereNight->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
ModVertexAlphaVisitor modStars(2);
atmosphereNight->accept(modStars);
mAtmosphereNightUpdater = new AtmosphereNightUpdater(mSceneManager->getTextureManager());
atmosphereNight->addUpdateCallback(mAtmosphereNightUpdater);
mSun.reset(new Sun(mRootNode, mSceneManager));
@ -806,13 +847,9 @@ void SkyManager::setWeather(const MWWorld::WeatherResult& weather)
if (weather.mNight && mStarsOpacity != weather.mNightFade)
{
if (weather.mNightFade != 0)
{
//sh::Factory::getInstance().setSharedParameter ("nightFade",
// sh::makeProperty<sh::FloatValue>(new sh::FloatValue(weather.mNightFade)));
mStarsOpacity = weather.mNightFade;
//mStarsOpacity = weather.mNightFade;
}
mAtmosphereNightUpdater->setFade(mStarsOpacity);
}
mAtmosphereNightNode->setNodeMask(weather.mNight ? ~0 : 0);

2
apps/openmw/mwrender/sky.hpp
View file

@ -20,6 +20,7 @@ namespace Resource
namespace MWRender
{
class AtmosphereUpdater;
class AtmosphereNightUpdater;
class CloudUpdater;
class Sun;
class Moon;
@ -107,6 +108,7 @@ namespace MWRender
osg::ref_ptr<osg::PositionAttitudeTransform> mAtmosphereNightNode;
float mAtmosphereNightRoll;
osg::ref_ptr<AtmosphereNightUpdater> mAtmosphereNightUpdater;
osg::ref_ptr<AtmosphereUpdater> mAtmosphereUpdater;

5
components/resource/texturemanager.cpp
View file

@ -145,4 +145,9 @@ namespace Resource
}
}
osg::Texture2D* TextureManager::getWarningTexture()
{
return mWarningTexture.get();
}
}

2
components/resource/texturemanager.hpp
View file

@ -38,6 +38,8 @@ namespace Resource
const VFS::Manager* getVFS() { return mVFS; }
osg::Texture2D* getWarningTexture();
private:
const VFS::Manager* mVFS;