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

Make projectiles receive lighting

Browse source
This commit is contained in:
scrawl 2015-12-05 00:44:04 +01:00
parent 258f7a2b42
commit 67a6a8f5d4
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -227,6 +227,11 @@ namespace MWRender
return mResourceSystem; return mResourceSystem;
} }
osg::Group* RenderingManager::getLightRoot()
{
return mLightRoot.get();
}
void RenderingManager::setNightEyeFactor(float factor) void RenderingManager::setNightEyeFactor(float factor)
{ {
if (factor != mNightEyeFactor) if (factor != mNightEyeFactor)

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

@ -65,6 +65,8 @@ namespace MWRender
Resource::ResourceSystem* getResourceSystem(); Resource::ResourceSystem* getResourceSystem();
osg::Group* getLightRoot();
void setNightEyeFactor(float factor); void setNightEyeFactor(float factor);
void setAmbientColour(const osg::Vec4f& colour); void setAmbientColour(const osg::Vec4f& colour);

3
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -8,6 +8,7 @@
#include <components/resource/scenemanager.hpp> #include <components/resource/scenemanager.hpp>
#include <components/sceneutil/controller.hpp> #include <components/sceneutil/controller.hpp>
#include <components/sceneutil/visitor.hpp> #include <components/sceneutil/visitor.hpp>
#include <components/sceneutil/lightmanager.hpp>
#include "../mwworld/manualref.hpp" #include "../mwworld/manualref.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
@ -96,6 +97,8 @@ namespace MWWorld
SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor; SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
state.mNode->accept(disableFreezeOnCullVisitor); state.mNode->accept(disableFreezeOnCullVisitor);
state.mNode->addCullCallback(new SceneUtil::LightListCallback);
mParent->addChild(state.mNode); mParent->addChild(state.mNode);
state.mEffectAnimationTime.reset(new MWRender::EffectAnimationTime); state.mEffectAnimationTime.reset(new MWRender::EffectAnimationTime);

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -164,7 +164,7 @@ namespace MWWorld
{ {
mPhysics = new MWPhysics::PhysicsSystem(resourceSystem, rootNode); mPhysics = new MWPhysics::PhysicsSystem(resourceSystem, rootNode);
mRendering = new MWRender::RenderingManager(viewer, rootNode, resourceSystem, &mFallback, resourcePath); mRendering = new MWRender::RenderingManager(viewer, rootNode, resourceSystem, &mFallback, resourcePath);
mProjectileManager.reset(new ProjectileManager(rootNode, resourceSystem, mRendering, mPhysics)); mProjectileManager.reset(new ProjectileManager(mRendering->getLightRoot(), resourceSystem, mRendering, mPhysics));
mEsm.resize(contentFiles.size()); mEsm.resize(contentFiles.size());
Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen(); Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();