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

some random cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2013-03-29 09:04:02 +01:00
parent c5f0556451
commit e7684c4677
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwrender/objects.cpp
View file

@ -1,5 +1,7 @@
#include "objects.hpp" #include "objects.hpp"
#include <cmath>
#include <OgreSceneNode.h> #include <OgreSceneNode.h>
#include <OgreSceneManager.h> #include <OgreSceneManager.h>
#include <OgreEntity.h> #include <OgreEntity.h>
@ -271,11 +273,7 @@ void Objects::insertLight (const MWWorld::Ptr& ptr, Ogre::Entity* skelBase, Ogre
info.time = Ogre::Math::RangeRandom(-500, +500); info.time = Ogre::Math::RangeRandom(-500, +500);
info.phase = Ogre::Math::RangeRandom(-500, +500); info.phase = Ogre::Math::RangeRandom(-500, +500);
bool quadratic; bool quadratic = lightOutQuadInLin() ? !info.interior : lightQuadratic();
if (!lightOutQuadInLin())
quadratic = lightQuadratic();
else
quadratic = !info.interior;
if (!quadratic) if (!quadratic)
{ {
@ -286,7 +284,7 @@ void Objects::insertLight (const MWWorld::Ptr& ptr, Ogre::Entity* skelBase, Ogre
else else
{ {
float r = radius * lightQuadraticRadiusMult(); float r = radius * lightQuadraticRadiusMult();
float attenuation = lightQuadraticValue() / pow(r, 2); float attenuation = lightQuadraticValue() / std::pow(r, 2);
light->setAttenuation(r*10, 0, 0, attenuation); light->setAttenuation(r*10, 0, 0, attenuation);
} }