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

Rework pulsing light sources (bug #4615)

Browse Source
This commit is contained in:
Andrei Kortunov 2018-08-28 12:05:27 +04:00
parent 327f36b081
commit c677f7ca27
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -105,6 +105,7 @@
Bug #4591: Attack strength should be 0 if player did not hold the attack button Bug #4591: Attack strength should be 0 if player did not hold the attack button
Bug #4597: <> operator causes a compile error Bug #4597: <> operator causes a compile error
Bug #4604: Picking up gold from the ground only makes 1 grabbed Bug #4604: Picking up gold from the ground only makes 1 grabbed
Bug #4615: Flicker effects for light sources are handled incorrectly
Feature #1645: Casting effects from objects Feature #1645: Casting effects from objects
Feature #2606: Editor: Implemented (optional) case sensitive global search Feature #2606: Editor: Implemented (optional) case sensitive global search
Feature #3083: Play animation when NPC is casting spell via script Feature #3083: Play animation when NPC is casting spell via script

16
components/sceneutil/lightcontroller.cpp
View File

@ -73,17 +73,15 @@ namespace SceneUtil
float cycle_time; float cycle_time;
float time_distortion; float time_distortion;
const float pi = 3.14159265359;
if(mType == LT_Pulse || mType == LT_PulseSlow) if(mType == LT_Pulse || mType == LT_PulseSlow)
{ {
cycle_time = 2.0f * pi; cycle_time = 2.0f * osg::PI;
time_distortion = mType == LT_Pulse ? 20.0f : 4.f; time_distortion = 3.0f;
} }
else else
{ {
static const float fa = 0.785398f; static const float fa = osg::PI / 4.0f;
static const float phase_wavelength = 120.0f * pi / fa; static const float phase_wavelength = 120.0f * osg::PI / fa;
cycle_time = 500.0f; cycle_time = 500.0f;
mPhase = std::fmod(mPhase + dt, phase_wavelength); mPhase = std::fmod(mPhase + dt, phase_wavelength);
@ -94,12 +92,14 @@ namespace SceneUtil
if(mDirection > 0 && mDeltaCount > +cycle_time) if(mDirection > 0 && mDeltaCount > +cycle_time)
{ {
mDirection = -1.0f; mDirection = -1.0f;
mDeltaCount = 2.0f*cycle_time - mDeltaCount; float extra = mDeltaCount - cycle_time;
mDeltaCount -= 2*extra;
} }
if(mDirection < 0 && mDeltaCount < -cycle_time) if(mDirection < 0 && mDeltaCount < -cycle_time)
{ {
mDirection = +1.0f; mDirection = +1.0f;
mDeltaCount = -2.0f*cycle_time - mDeltaCount; float extra = cycle_time - mDeltaCount;
mDeltaCount += 2*extra;
} }
static const float fast = 4.0f/1.0f; static const float fast = 4.0f/1.0f;