From 3bd2aaddea168f4e27fdd2e3244b64bc6daf4af7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 18 Nov 2015 23:14:01 +0100
Subject: [PATCH] Adjust PulseSlow light controller (Fixes #1963)
---
components/sceneutil/lightcontroller.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index d31e3d1075..ccfd836f72 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -76,7 +76,7 @@ namespace SceneUtil
if(mType == LT_Pulse || mType == LT_PulseSlow)
{
cycle_time = 2.0f * pi;
- time_distortion = 20.0f;
+ time_distortion = mType == LT_Pulse ? 20.0f : 4.f;
}
else
{
@@ -114,9 +114,9 @@ namespace SceneUtil
else if(mType == LT_FlickerSlow)
brightness = 0.75f + flickerAmplitude(mDeltaCount*slow)*0.25f;
else if(mType == LT_Pulse)
- brightness = 1.0f + pulseAmplitude(mDeltaCount*fast)*0.25f;
+ brightness = 0.7f + pulseAmplitude(mDeltaCount*fast)*0.3f;
else if(mType == LT_PulseSlow)
- brightness = 1.0f + pulseAmplitude(mDeltaCount*slow)*0.25f;
+ brightness = 0.7f + pulseAmplitude(mDeltaCount*slow)*0.3f;
static_cast<SceneUtil::LightSource*>(node)->getLight()->setDiffuse(mDiffuseColor * brightness);
}