kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-fcurve] Fix bug in Segment2D.tForX

Browse Source
This commit is contained in:
Edwin Jakobs
2024-04-21 09:37:35 +02:00
parent 8eccde914b
commit dda653b2cf
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
orx-fcurve/src/commonMain/kotlin/FCurve.kt
View File

@@ -11,6 +11,9 @@ import kotlin.math.abs
* Find the (first) t value for a given [x] value * Find the (first) t value for a given [x] value
*/ */
private fun Segment2D.tForX(x: Double): Double { private fun Segment2D.tForX(x: Double): Double {
if (x == start.x) return 0.0
if (x == end.x) return 1.0
if (linear) { if (linear) {
return (x - start.x) / (end.x - start.x) return (x - start.x) / (end.x - start.x)
} else { } else {
@@ -155,7 +158,7 @@ data class FCurve(val segments: List<Segment2D>) {
if (segments.isEmpty()) { if (segments.isEmpty()) {
return Pair(0.0, null) return Pair(0.0, null)
} }
if (t < segments.first().start.x) { if (t <= segments.first().start.x) {
val segment = segments.first() val segment = segments.first()
return Pair(segment.start.y, segment) return Pair(segment.start.y, segment)
} else if (t > segments.last().end.x) { } else if (t > segments.last().end.x) {

8
orx-fcurve/src/commonTest/kotlin/TestEFCurve.kt
View File

@@ -1,4 +1,5 @@
import org.openrndr.extra.fcurve.efcurve import org.openrndr.extra.fcurve.efcurve
import org.openrndr.extra.fcurve.fcurve
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
@@ -30,4 +31,11 @@ class TestEFCurve {
assertEquals("M0 L1.0, ${0.0} L1.0, ${1.0}", efcurve("M0 (L1.0, {it})[2]")) assertEquals("M0 L1.0, ${0.0} L1.0, ${1.0}", efcurve("M0 (L1.0, {it})[2]"))
assertEquals("M0 L1.0, ${0.0} L1.0, ${1.0} L1.0, ${0.0} L1.0, ${1.0} L1.0, ${0.0} L1.0, ${1.0}", efcurve("M0 ((L1.0, {it})[2])[3]")) assertEquals("M0 L1.0, ${0.0} L1.0, ${1.0} L1.0, ${0.0} L1.0, ${1.0} L1.0, ${0.0} L1.0, ${1.0}", efcurve("M0 ((L1.0, {it})[2])[3]"))
} }
@Test
fun testContinuity() {
val fc = fcurve("Q1 25% 3 100 Q1 25% 3 0 Q1 25% 3 100 Q1 25% 3 0")
val s = fc.sampler()
assertEquals(0.0, s(6.0))
}
} }