Merge branch 'develop'

gurki · May 19, 2019 · 7380891 · 7380891
2 parents 49b77ac + e21cffb
commit 7380891
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [v1.1.1] - 2019-05-19
+
+## Fixed
+- Fix `LCH` interpolation after `HCL` re-work
+
+
 ## [v1.1.0] - 2019-05-19
 
 ## Added

diff --git a/docs/images/interpolations/lerpLch.png b/docs/images/interpolations/lerpLch.png
diff --git a/src/functions.cpp b/src/functions.cpp
@@ -254,10 +254,10 @@ col_t lerp(
 {
     col_t delta = lch2 - lch1;
 
-    if ( delta.x > glm::pi<float>() ) {
-        delta.x -= glm::two_pi<float>();
-    } else if ( delta.x < - glm::pi<float>() ) {
-        delta.x += glm::two_pi<float>();
+    if ( delta.z > glm::pi<float>() ) {
+        delta.z -= glm::two_pi<float>();
+    } else if ( delta.z < - glm::pi<float>() ) {
+        delta.z += glm::two_pi<float>();
     }
 
     return lch1 + t * delta;