From c677f7ca2768262164531385d81b6d2ac29d6f60 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 28 Aug 2018 12:05:27 +0400
Subject: [PATCH] Rework pulsing light sources (bug #4615)

---
 CHANGELOG.md                             |  1 +
 components/sceneutil/lightcontroller.cpp | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34f4dbbad..f5c990b4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,6 +105,7 @@
     Bug #4591: Attack strength should be 0 if player did not hold the attack button
     Bug #4597: <> operator causes a compile error
     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 #2606: Editor: Implemented (optional) case sensitive global search
     Feature #3083: Play animation when NPC is casting spell via script
diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index e3ea93843..b89cfc4bc 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -73,17 +73,15 @@ namespace SceneUtil
         float cycle_time;
         float time_distortion;
 
-        const float pi = 3.14159265359;
-
         if(mType == LT_Pulse || mType == LT_PulseSlow)
         {
-            cycle_time = 2.0f * pi;
-            time_distortion = mType == LT_Pulse ? 20.0f : 4.f;
+            cycle_time = 2.0f * osg::PI;
+            time_distortion = 3.0f;
         }
         else
         {
-            static const float fa = 0.785398f;
-            static const float phase_wavelength = 120.0f * pi / fa;
+            static const float fa = osg::PI / 4.0f;
+            static const float phase_wavelength = 120.0f * osg::PI / fa;
 
             cycle_time = 500.0f;
             mPhase = std::fmod(mPhase + dt, phase_wavelength);
@@ -94,12 +92,14 @@ namespace SceneUtil
         if(mDirection > 0 && mDeltaCount > +cycle_time)
         {
             mDirection = -1.0f;
-            mDeltaCount = 2.0f*cycle_time - mDeltaCount;
+            float extra = mDeltaCount - cycle_time;
+            mDeltaCount -= 2*extra;
         }
         if(mDirection < 0 && mDeltaCount < -cycle_time)
         {
             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;