fixed "Interacting with SV triangle"

Author: elect86

src/main/kotlin/imgui/imgui/widgets colorEditorPicker.kt

@@ -369,12 +369,12 @@ interface imgui_widgetsColorEditorPicker {
                 }
                 val cosHueAngle = glm.cos(-h * 2f * glm.PIf)
                 val sinHueAngle = glm.sin(-h * 2f * glm.PIf)
-                if (triangleContainsPoint(trianglePa, trianglePb, trianglePc, initialOff.rotateAssign(cosHueAngle, sinHueAngle))) { // TODO check
+                if (triangleContainsPoint(trianglePa, trianglePb, trianglePc, initialOff.rotate(cosHueAngle, sinHueAngle))) {
                     // Interacting with SV triangle
-                    val currentOffUnrotated = currentOff.rotateAssign(cosHueAngle, sinHueAngle)
+                    val currentOffUnrotated = currentOff.rotate(cosHueAngle, sinHueAngle)
                     if (!triangleContainsPoint(trianglePa, trianglePb, trianglePc, currentOffUnrotated))
                         currentOffUnrotated put triangleClosestPoint(trianglePa, trianglePb, trianglePc, currentOffUnrotated)
-                    val (uu, vv, ww) = triangleBarycentricCoords(trianglePa, trianglePb, trianglePc, currentOffUnrotated)
+                    val (uu, vv, _) = triangleBarycentricCoords(trianglePa, trianglePb, trianglePc, currentOffUnrotated)
                     v = glm.clamp(1f - vv, 0.0001f, 1f)
                     s = glm.clamp(uu / v, 0.0001f, 1f)
                     valueChangedSv = true

src/main/kotlin/imgui/internal/helpers.kt

@@ -181,15 +181,15 @@ fun triangleContainsPoint(a: Vec2, b: Vec2, c: Vec2, p: Vec2): Boolean {
     return ((b1 == b2) && (b2 == b3))
 }
 
-fun triangleBarycentricCoords(a: Vec2, b: Vec2, c: Vec2, p: Vec2, outU: Float = 0f, outV: Float = 0f, outW: Float = 0f): FloatArray {
+fun triangleBarycentricCoords(a: Vec2, b: Vec2, c: Vec2, p: Vec2): FloatArray {
     val v0 = b - a
     val v1 = c - a
     val v2 = p - a
     val denom = v0.x * v1.y - v1.x * v0.y
-    return floatArrayOf(
-            (v2.x * v1.y - v1.x * v2.y) / denom,
-            (v0.x * v2.y - v2.x * v0.y) / denom,
-            1f - outV - outW)
+    val outV = (v2.x * v1.y - v1.x * v2.y) / denom
+    val outW = (v0.x * v2.y - v2.x * v0.y) / denom
+    val outU = 1f - outV - outW
+    return floatArrayOf(outU, outV, outW)
 }
 
 fun triangleClosestPoint(a: Vec2, b: Vec2, c: Vec2, p: Vec2): Vec2 {
@@ -281,7 +281,6 @@ fun Vec2.invLength(failValue: Float): Float {
     return failValue
 }
 
-fun Vec2.rotateAssign(cosA: Float, sinA: Float) = invoke(x * cosA - y * sinA, x * sinA + y * cosA)
 fun Vec2.rotate(cosA: Float, sinA: Float) = Vec2(x * cosA - y * sinA, x * sinA + y * cosA)
 fun linearSweep(current: Float, target: Float, speed: Float) = when {
     current < target -> glm.min(current + speed, target)