commit 6ea14d4107e51c56fb7e8be068b60c9e19cbd903
author Luigi Rosso <luigi@rive.app> Thu Aug 26 10:17:16 2021 -0700
committer Luigi Rosso <luigi@rive.app> Thu Aug 26 10:17:16 2021 -0700
tree 659d1eeab1eced8cf4cc7fd5034c7395b353582b
parent 54f6ab24e2fb60fdcf77b89dd0b7f4cb933229c2
parent 968b3d6cb4ff35b1d0b03476fb3f3c29f8e86306

Merge branch 'master' of https://github.com/rive-app/rive-cpp into low_level_rendering

src/constraints/ik_constraint.cpp

diff --git a/src/constraints/ik_constraint.cpp b/src/constraints/ik_constraint.cpp
index 66e3a2d..fd64aad 100644
--- a/src/constraints/ik_constraint.cpp
+++ b/src/constraints/ik_constraint.cpp
@@ -280,23 +280,22 @@
 			break;
 		}
 	}
-
 	// At the end, mix the FK angle with the IK angle by strength
 	if (strength() != 1.0f)
 	{
 		for (BoneChainLink& fk : m_FkChain)
 		{
 			float fromAngle =
-			    std::fmod(fk.transformComponents.rotation(), (float)M_PI_2);
-			float toAngle = std::fmod(fk.angle, (float)M_PI_2);
+			    std::fmod(fk.transformComponents.rotation(), (float)M_PI * 2);
+			float toAngle = std::fmod(fk.angle, (float)M_PI * 2);
 			float diff = toAngle - fromAngle;
 			if (diff > M_PI)
 			{
-				diff -= M_PI_2;
+				diff -= M_PI * 2;
 			}
 			else if (diff < -M_PI)
 			{
-				diff += M_PI_2;
+				diff += M_PI * 2;
 			}
 			float angle = fromAngle + diff * strength();
 			constrainRotation(fk, angle);

src/constraints/rotation_constraint.cpp

diff --git a/src/constraints/rotation_constraint.cpp b/src/constraints/rotation_constraint.cpp
index 30b80e4..b84c943 100644
--- a/src/constraints/rotation_constraint.cpp
+++ b/src/constraints/rotation_constraint.cpp
@@ -88,17 +88,17 @@
 		Mat2D::decompose(m_ComponentsB, transformB);
 	}
 
-	float angleA = std::fmod(m_ComponentsA.rotation(), (float)M_PI_2);
-	float angleB = std::fmod(m_ComponentsB.rotation(), (float)M_PI_2);
+	float angleA = std::fmod(m_ComponentsA.rotation(), (float)M_PI * 2);
+	float angleB = std::fmod(m_ComponentsB.rotation(), (float)M_PI * 2);
 	float diff = angleB - angleA;
 
 	if (diff > M_PI)
 	{
-		diff -= M_PI_2;
+		diff -= M_PI * 2;
 	}
 	else if (diff < -M_PI)
 	{
-		diff += M_PI_2;
+		diff += M_PI * 2;
 	}
 
 	m_ComponentsB.rotation(m_ComponentsA.rotation() + diff * strength());

src/constraints/transform_constraint.cpp

diff --git a/src/constraints/transform_constraint.cpp b/src/constraints/transform_constraint.cpp
index c29dacd..bdc43f7 100644
--- a/src/constraints/transform_constraint.cpp
+++ b/src/constraints/transform_constraint.cpp
@@ -34,16 +34,16 @@
 	Mat2D::decompose(m_ComponentsA, transformA);
 	Mat2D::decompose(m_ComponentsB, transformB);
 
-	float angleA = std::fmod(m_ComponentsA.rotation(), (float)M_PI_2);
-	float angleB = std::fmod(m_ComponentsB.rotation(), (float)M_PI_2);
+	float angleA = std::fmod(m_ComponentsA.rotation(), (float)M_PI * 2);
+	float angleB = std::fmod(m_ComponentsB.rotation(), (float)M_PI * 2);
 	float diff = angleB - angleA;
 	if (diff > M_PI)
 	{
-		diff -= M_PI_2;
+		diff -= M_PI * 2;
 	}
 	else if (diff < -M_PI)
 	{
-		diff += M_PI_2;
+		diff += M_PI * 2;
 	}
 
 	float t = strength();