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

[orx-shapes] Fix minimum number of points bug in RectifiedContour, expose lengthScale

Browse Source
This commit is contained in:
Edwin Jakobs
2023-07-18 22:42:39 +02:00
parent 12da813b09
commit 5770281a5f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
orx-shapes/src/commonMain/kotlin/rectify/RectifiedContour.kt
View File

@@ -10,8 +10,8 @@ import kotlin.math.floor
/** /**
* RectifiedContour provides an approximately uniform parameterization for [ShapeContour] * RectifiedContour provides an approximately uniform parameterization for [ShapeContour]
*/ */
class RectifiedContour(val contour: ShapeContour, lengthScale: Double = 1.0, distanceTolerance: Double = 0.5) { class RectifiedContour(val contour: ShapeContour, distanceTolerance: Double = 0.5, lengthScale: Double = 1.0, ) {
val points = contour.equidistantPositionsWithT((contour.length * lengthScale).toInt(), distanceTolerance) val points = contour.equidistantPositionsWithT((contour.length * lengthScale).toInt().coerceAtLeast(2), distanceTolerance)
private fun safe(t: Double): Double { private fun safe(t: Double): Double {
return if (contour.closed) { return if (contour.closed) {
@@ -68,14 +68,17 @@ class RectifiedContour(val contour: ShapeContour, lengthScale: Double = 1.0, dis
/** create a rectified contour /** create a rectified contour
* @param distanceTolerance distance tolerance to use, 0.5 is the default distance tolerance * @param distanceTolerance distance tolerance to use, 0.5 is the default distance tolerance
* @param lengthScale used to compute the size of the LUT, default value is 1.0
**/ **/
fun ShapeContour.rectified(distanceTolerance: Double = 0.5): RectifiedContour { fun ShapeContour.rectified(distanceTolerance: Double = 0.5, lengthScale: Double = 1.0): RectifiedContour {
return RectifiedContour(this, distanceTolerance = distanceTolerance) return RectifiedContour(this, distanceTolerance, lengthScale)
} }
/** create a rectified contour /** create a rectified contour
* @param distanceTolerance distance tolerance to use, 0.5 is the default distance tolerance * @param distanceTolerance distance tolerance to use, 0.5 is the default distance tolerance
* @param lengthScale used to compute the size of the LUT, default value is 1.0
*
* */ * */
fun Segment.rectified(distanceTolerance: Double = 0.5): RectifiedContour { fun Segment.rectified(distanceTolerance: Double = 0.5, lengthScale: Double = 1.0): RectifiedContour {
return RectifiedContour(this.contour, distanceTolerance = distanceTolerance) return RectifiedContour(this.contour, distanceTolerance, lengthScale)
} }