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

rain independent from camera plus wrap-around

Browse source
This commit is contained in:
Miloslav Číž 2017-10-04 16:41:55 +02:00
parent 4999c667b6
commit b95c9ba483
3 changed files with 57 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,7 +255,7 @@ namespace MWRender
mRootNode->getOrCreateStateSet()->addUniform(mUniformRainIntensity);
mSky.reset(new SkyManager(sceneRoot, resourceSystem->getSceneManager()));
mSky.reset(new SkyManager(sceneRoot, resourceSystem->getSceneManager(), this));
source->setStateSetModes(*mRootNode->getOrCreateStateSet(), osg::StateAttribute::ON);

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

@ -39,6 +39,7 @@
#include <components/sceneutil/statesetupdater.hpp>
#include <components/sceneutil/controller.hpp>
#include <components/sceneutil/visitor.hpp>
#include <components/nifosg/particle.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
@ -46,6 +47,8 @@
#include "vismask.hpp"
#include "renderbin.hpp"
#define PARTICLE_WIDTH 600.0
namespace
{
@ -1091,8 +1094,9 @@ private:
}
};
SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager)
SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager, MWRender::RenderingManager *renderingManager)
: mSceneManager(sceneManager)
, mRendering(renderingManager)
, mAtmosphereNightRoll(0.f)
, mCreated(false)
, mIsStorm(false)
@ -1337,6 +1341,43 @@ protected:
osg::Uniform* mRainIntensityUniform;
};
class WeatherParticleDrawCallback : public osg::Drawable::DrawCallback
{
public:
WeatherParticleDrawCallback(MWRender::RenderingManager *renderingManager) : osg::Drawable::DrawCallback()
{
mRendering = renderingManager;
}
virtual void drawImplementation(osg::RenderInfo& renderInfo, const osg::Drawable *drawable) const
{
osg::Vec3 cameraPos = mRendering->getCameraPosition();
osg::Vec3 cameraOffset = osg::Vec3(
PARTICLE_WIDTH - fmod(cameraPos.x(), PARTICLE_WIDTH / 2),
PARTICLE_WIDTH - fmod(cameraPos.y(), PARTICLE_WIDTH / 2),
0);
osgParticle::ParticleSystem *ps = (osgParticle::ParticleSystem *) drawable;
for (int xOff = 0; xOff < 3; xOff++)
for (int yOff = 0; yOff < 3; yOff++)
{
osg::Vec3 offset = cameraOffset + osg::Vec3(-1 * xOff * PARTICLE_WIDTH, -1 * yOff * PARTICLE_WIDTH,0);
for(int i = 0; i < ps->numParticles(); i++)
ps->getParticle(i)->setPosition(ps->getParticle(i)->getPosition() + offset);
ps->drawImplementation(renderInfo);
for(int i = 0; i < ps->numParticles(); i++)
ps->getParticle(i)->setPosition(ps->getParticle(i)->getPosition() - offset);
}
}
protected:
MWRender::RenderingManager *mRendering;
};
void SkyManager::createRain()
{
if (mRainNode)
@ -1345,6 +1386,8 @@ void SkyManager::createRain()
mRainNode = new osg::Group;
mRainParticleSystem = new osgParticle::ParticleSystem;
mRainParticleSystem->setDrawCallback(new WeatherParticleDrawCallback(mRendering));
mRainParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
mRainParticleSystem->setAlignVectorX(osg::Vec3f(0.1,0,0));
mRainParticleSystem->setAlignVectorY(osg::Vec3f(0,0,1));
@ -1370,8 +1413,8 @@ void SkyManager::createRain()
emitter->setParticleSystem(mRainParticleSystem);
osg::ref_ptr<osgParticle::BoxPlacer> placer (new osgParticle::BoxPlacer);
placer->setXRange(-300, 300); // Rain_Diameter
placer->setYRange(-300, 300);
placer->setXRange(-PARTICLE_WIDTH / 2, PARTICLE_WIDTH / 2); // Rain_Diameter
placer->setYRange(-PARTICLE_WIDTH / 2, PARTICLE_WIDTH / 2);
placer->setZRange(300, 300);
emitter->setPlacer(placer);
@ -1559,6 +1602,12 @@ void SkyManager::setWeather(const WeatherResult& weather)
SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
mParticleEffect->accept(disableFreezeOnCullVisitor);
osgParticle::ParticleSystem *ps = (osgParticle::ParticleSystem *)
(mParticleEffect->asGroup()->getChild(1)->asGroup()->getChild(0)
->asGroup()->getChild(2));
ps->setDrawCallback(new WeatherParticleDrawCallback(mRendering));
}
}

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

@ -9,6 +9,8 @@
#include <osg/ref_ptr>
#include <osg/Vec4f>
#include <apps/openmw/mwrender/renderingmanager.hpp>
namespace osg
{
class Group;
@ -108,7 +110,7 @@ namespace MWRender
class SkyManager
{
public:
SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager);
SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager, MWRender::RenderingManager *renderingManager);
~SkyManager();
void update(float duration);
@ -170,6 +172,7 @@ namespace MWRender
void updateRainParameters();
Resource::SceneManager* mSceneManager;
MWRender::RenderingManager *mRendering;
osg::ref_ptr<osg::Group> mRootNode;
osg::ref_ptr<osg::Group> mEarlyRenderBinRoot;