ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make lights fade in when they appear

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14824 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2013-12-28 22:02:29 +00:00
parent ad3ea6c5e0
commit db44852d8b
4 changed files with 58 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/irr_driver.hpp
View File

@ -194,7 +194,7 @@ private:
void renderLights(const core::aabbox3df& cambox,
scene::ICameraSceneNode * const camnode,
video::SOverrideMaterial &overridemat,
int cam);
int cam, float dt);
void renderDisplacement(video::SOverrideMaterial &overridemat,
int cam);
void doScreenShot();

3
src/graphics/light.cpp
View File

@ -37,7 +37,8 @@ aabbox3df LightNode::box;
LightNode::LightNode(scene::ISceneManager* mgr, float radius, float e, float r, float g, float b):
ISceneNode(mgr->getRootSceneNode(), mgr, -1)
{
energy = e;
m_energy = e;
m_energy_multiplier = 1.0f;
m_color[0] = r;
m_color[1] = g;
m_color[2] = b;

11
src/graphics/light.hpp
View File

@ -51,9 +51,13 @@ public:
virtual bool isPointLight() { return true; }
float getRadius() const { return m_radius; }
float getEnergy() const { return energy; }
float getEnergy() const { return m_energy; }
float getEffectiveEnergy() const { return m_energy_multiplier * m_energy; }
core::vector3df getColor() const { return core::vector3df(m_color[0], m_color[1], m_color[2]); }
float getEnergyMultiplier() const { return m_energy_multiplier; }
void setEnergyMultiplier(float newval) { m_energy_multiplier = newval; }
protected:
static core::aabbox3df box;
@ -61,7 +65,10 @@ protected:
float m_radius;
float m_color[3];
float energy;
float m_energy;
/// The energy multiplier is in range [0, 1] and is used to fade in lights when they come in range
float m_energy_multiplier;
};
#endif

71
src/graphics/render.cpp
View File

@ -47,6 +47,8 @@
#include "utils/log.hpp"
#include "utils/profiler.hpp"
#include <algorithm>
void IrrDriver::renderGLSL(float dt)
{
World *world = World::getWorld(); // Never NULL.
@ -214,7 +216,7 @@ void IrrDriver::renderGLSL(float dt)
}
// Lights
renderLights(cambox, camnode, overridemat, cam);
renderLights(cambox, camnode, overridemat, cam, dt);
if (!bgnodes)
{
@ -670,7 +672,7 @@ void IrrDriver::renderGlow(video::SOverrideMaterial &overridemat,
void IrrDriver::renderLights(const core::aabbox3df& cambox,
scene::ICameraSceneNode * const camnode,
video::SOverrideMaterial &overridemat,
int cam)
int cam, float dt)
{
core::array<video::IRenderTarget> rtts;
// Diffuse
@ -705,39 +707,58 @@ void IrrDriver::renderLights(const core::aabbox3df& cambox,
std::vector<LightNode *> BucketedLN[15];
for (unsigned int i = 0; i < lightcount; i++)
{
if (!m_lights[i]->isPointLight()) {
if (!m_lights[i]->isPointLight())
{
m_lights[i]->render();
continue;
}
const core::vector3df &lightpos = (m_lights[i]->getPosition() - campos);
unsigned idx = (unsigned)(lightpos.getLength() / 10);
if(idx > 14)
if (idx > 14)
continue;
BucketedLN[idx].push_back(m_lights[i]);
}
unsigned lightnum = 0;
for (unsigned i = 0; i < 15; i++) {
for (unsigned j = 0; j < BucketedLN[i].size(); j++) {
if (++lightnum > MAXLIGHT)
for (unsigned i = 0; i < 15; i++)
{
for (unsigned j = 0; j < BucketedLN[i].size(); j++)
{
if (++lightnum > MAXLIGHT)
{
LightNode* light_node = BucketedLN[i].at(j);
light_node->setEnergyMultiplier(0.0f);
}
else
{
LightNode* light_node = BucketedLN[i].at(j);
float em = light_node->getEnergyMultiplier();
if (em < 1.0f)
{
light_node->setEnergyMultiplier(std::min(1.0f, em + dt));
}
const core::vector3df &pos = light_node->getPosition();
accumulatedLightPos.push_back(pos.X);
accumulatedLightPos.push_back(pos.Y);
accumulatedLightPos.push_back(pos.Z);
accumulatedLightPos.push_back(0.);
const core::vector3df &col = light_node->getColor();
accumulatedLightColor.push_back(col.X);
accumulatedLightColor.push_back(col.Y);
accumulatedLightColor.push_back(col.Z);
accumulatedLightColor.push_back(0.);
accumulatedLightEnergy.push_back(light_node->getEffectiveEnergy());
}
}
if (lightnum > MAXLIGHT)
{
irr_driver->setLastLightBucketDistance(i * 10);
break;
LightNode *LN = BucketedLN[i].at(j);
const core::vector3df &pos = LN->getPosition();
accumulatedLightPos.push_back(pos.X);
accumulatedLightPos.push_back(pos.Y);
accumulatedLightPos.push_back(pos.Z);
accumulatedLightPos.push_back(0.);
const core::vector3df &col = LN->getColor();
accumulatedLightColor.push_back(col.X);
accumulatedLightColor.push_back(col.Y);
accumulatedLightColor.push_back(col.Z);
accumulatedLightColor.push_back(0.);
accumulatedLightEnergy.push_back(LN->getEnergy());
}
if (lightnum > MAXLIGHT) {
irr_driver->setLastLightBucketDistance(i * 10);
break;
}
}
}
LightNode::renderLightSet(accumulatedLightPos, accumulatedLightColor, accumulatedLightEnergy);
// Handle SSAO