mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-28 03:40:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bright_spells' into 'master'

Browse Source 
Replicate Morrowind spell lighting (#4949)

Closes #4949

See merge request OpenMW/openmw!1544
This commit is contained in:
psi29a 2022-01-09 11:07:14 +00:00
commit a1f8db7600
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@
Bug #4602: Robert's Bodies: crash inside createInstance()
Bug #4700: Editor: Incorrect command implementation
Bug #4744: Invisible particles must still be processed
Bug #4949: Incorrect particle lighting
Bug #5088: Sky abruptly changes direction during certain weather transitions
Bug #5100: Persuasion doesn't always clamp the resulting disposition
Bug #5120: Scripted object spawning updates physics system

18
apps/openmw/mwrender/animation.cpp
View File

@ -7,6 +7,7 @@
#include <osg/BlendFunc>
#include <osg/Material>
#include <osg/Switch>
#include <osg/LightModel>
#include <osgParticle/ParticleSystem>
#include <osgParticle/ParticleProcessor>
@ -372,6 +373,19 @@ namespace
private:
int mEffectId;
};
osg::ref_ptr<osg::LightModel> getVFXLightModelInstance()
{
static osg::ref_ptr<osg::LightModel> lightModel = nullptr;
if (!lightModel)
{
lightModel = new osg::LightModel;
lightModel->setAmbientIntensity({1,1,1,1});
}
return lightModel;
}
}
namespace MWRender
@ -1547,7 +1561,9 @@ namespace MWRender
parentNode->addChild(trans);
osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model, trans);
node->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
// Morrowind has a white ambient light attached to the root VFX node of the scenegraph
node->getOrCreateStateSet()->setAttributeAndModes(getVFXLightModelInstance(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
SceneUtil::FindMaxControllerLengthVisitor findMaxLengthVisitor;
node->accept(findMaxLengthVisitor);