Infinite Color Engine: fix for YUV & hybrid interpolators (#1302)

Author: awawa-dev

sources/infinite-color-engine/InfiniteExponentialInterpolator.cpp

@@ -97,7 +97,7 @@ void InfiniteExponentialInterpolator::updateCurrentColors(float currentTimeMs)
 		return;
 
 	float dt = currentTimeMs - _lastUpdate;
-	float kOrg = 1.0f - std::exp(-dt / _tau);
+	float kOrg = std::min(std::max(1.0f - std::exp(-dt / _tau), 0.0001f), 1.0f);
 	_lastUpdate = currentTimeMs;
 
 	float4 aspectK = float4{

sources/infinite-color-engine/InfiniteHybridInterpolator.cpp

@@ -123,10 +123,10 @@ void InfiniteHybridInterpolator::updateCurrentColors(float currentTimeMs) {
 
 	auto computeChannelVec = [&](float3& cur, const float3& diff, float3& vel) -> bool {
 		const float FINISH_COMPONENT_THRESHOLD = 0.0013732906f;
+		const float VELOCITY_THRESHOLD = 0.0005f;
 
-		float val = linalg::maxelem(linalg::abs(diff));
-
-		if (val < FINISH_COMPONENT_THRESHOLD)
+		if (linalg::maxelem(linalg::abs(diff)) < FINISH_COMPONENT_THRESHOLD && // color match
+			linalg::maxelem(linalg::abs(vel)) < VELOCITY_THRESHOLD) // speed should be almost zero
 		{
 			cur += diff;
 			vel = float3{ 0,0,0 };
@@ -140,23 +140,15 @@ void InfiniteHybridInterpolator::updateCurrentColors(float currentTimeMs) {
 			vel += acc * (dt * 0.001f);
 			float3 step = vel * (dt * 0.001f);
 
-			if (_maxLuminanceChangePerStep > 0.f)
-			{
-				float stepY = step[0];
-				if (fabs(stepY) > _maxLuminanceChangePerStep)
-				{
-					stepY = std::copysignf(_maxLuminanceChangePerStep, stepY);
-					vel[0] = stepY / (dt * 0.001f);
-				}
-				cur[0] += stepY;
-			}
-			else
+			if (_maxLuminanceChangePerStep > 0.f && fabs(step[0]) > _maxLuminanceChangePerStep)
 			{
-				cur[0] += step[0];
+				float scale = _maxLuminanceChangePerStep / fabs(step[0]);
+				step *= scale;
+
+				vel *= scale;
 			}
+			cur += step;
 
-			cur[1] += step[1];
-			cur[2] += step[2];
 			return true;
 		}
 	};

sources/infinite-color-engine/InfiniteRgbInterpolator.cpp

@@ -124,7 +124,7 @@ void InfiniteRgbInterpolator::updateCurrentColors(float currentTimeMs)
 	// obliczenie czasu, analog setupAdvColor
 	float deltaTime = _targetTime - currentTimeMs;
 	float totalTime = _targetTime - _startAnimationTimeMs;
-	float kOrg = std::max(1.0f - deltaTime / totalTime, 0.0001f);
+	float kOrg = std::min(std::max(1.0f - deltaTime / totalTime, 0.0001f), 1.0f);
 	_lastUpdate = currentTimeMs;
 
 	float4 aspectK = float4{

sources/infinite-color-engine/InfiniteStepperInterpolator.cpp

@@ -102,7 +102,7 @@ void InfiniteStepperInterpolator::updateCurrentColors(float currentTimeMs)
 	// obliczenie czasu, analog setupAdvColor
 	float deltaTime = _targetTime - currentTimeMs;
 	float totalTime = _targetTime - _startAnimationTimeMs;
-	float kOrg = std::max(1.0f - deltaTime / totalTime, 0.0001f);
+	float kOrg = std::min(std::max(1.0f - deltaTime / totalTime, 0.0001f), 1.0f);
 	_lastUpdate = currentTimeMs;
 
 	float4 aspectK = float4{

sources/infinite-color-engine/InfiniteYuvInterpolator.cpp

@@ -137,7 +137,7 @@ void InfiniteYuvInterpolator::updateCurrentColors(float currentTimeMs)
 	// obliczenie czasu, analog setupAdvColor
 	float deltaTime = _targetTime - currentTimeMs;
 	float totalTime = _targetTime - _startAnimationTimeMs;
-	float kOrg = std::max(1.0f - deltaTime / totalTime, 0.0001f);
+	float kOrg = std::min(std::max(1.0f - deltaTime / totalTime, 0.0001f), 1.0f);
 	_lastUpdate = currentTimeMs;
 
 	auto computeChannelVec = [&](float3& cur, const float3& diff) -> bool {
@@ -152,27 +152,13 @@ void InfiniteYuvInterpolator::updateCurrentColors(float currentTimeMs)
 		}
 		else
 		{
-			if (_maxLuminanceChangePerStep == 0.f)
+			float3 step = kOrg * diff;
+			if (_maxLuminanceChangePerStep > 0.f && fabs(step[0]) > _maxLuminanceChangePerStep)
 			{
-				cur += kOrg * diff;
-			}
-			else
-			{
-				float scale = kOrg;
-				auto stepY = kOrg * diff[0];
-				if (fabs(stepY) > _maxLuminanceChangePerStep)
-				{
-					scale = stepY;
-					stepY = std::copysignf(_maxLuminanceChangePerStep, stepY);
-					scale = fabs(stepY / scale) * kOrg;
-				}
-				cur[0] += stepY;
-
-				for (int i = 1; i < 3; ++i)
-				{
-					cur[i] += scale * diff[i];
-				}
+				float scale = _maxLuminanceChangePerStep / fabs(step[0]);
+				step *= scale;
 			}
+			cur += step;
 
 			return true;
 		}