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

[orx-shapes] Add splitIn

Browse Source
This commit is contained in:
Edwin Jakobs
2023-10-28 14:01:39 +02:00
parent cce913d269
commit 2293d5d74e
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
orx-shapes/src/commonMain/kotlin/adjust/ContourAdjusterEdge.kt
View File

@@ -11,17 +11,15 @@ data class ContourAdjusterEdge(val contourAdjuster: ContourAdjuster, val segment
val endPosition
get() = contourAdjuster.contour.segments[segmentIndex()].end
fun position(t: Double) : Vector2 {
fun position(t: Double): Vector2 {
return contourAdjuster.contour.segments[segmentIndex()].position(t)
}
fun normal(t: Double) : Vector2 {
fun normal(t: Double): Vector2 {
return contourAdjuster.contour.segments[segmentIndex()].normal(t)
}
/**
* A [ContourAdjusterVertex] interface for the start-vertex of the edge
*/
@@ -32,7 +30,9 @@ data class ContourAdjusterEdge(val contourAdjuster: ContourAdjuster, val segment
* A [ContourAdjusterVertex] interface for the end-vertex of the edge
*/
val end
get() = ContourAdjusterVertex(contourAdjuster, { (segmentIndex() + 1).mod(contourAdjuster.contour.segments.size) } )
get() = ContourAdjusterVertex(
contourAdjuster,
{ (segmentIndex() + 1).mod(contourAdjuster.contour.segments.size) })
/**
* A link to the edge before this edge
@@ -56,7 +56,7 @@ data class ContourAdjusterEdge(val contourAdjuster: ContourAdjuster, val segment
this.copy(segmentIndex = { (segmentIndex() + 1).mod(contourAdjuster.contour.segments.size) })
} else {
if (segmentIndex() < contourAdjuster.contour.segments.size - 1) {
this.copy(segmentIndex = { segmentIndex() + 1 } )
this.copy(segmentIndex = { segmentIndex() + 1 })
} else {
null
}
@@ -65,27 +65,36 @@ data class ContourAdjusterEdge(val contourAdjuster: ContourAdjuster, val segment
fun select() {
contourAdjuster.selectEdge(segmentIndex())
}
private fun wrap(block: ContourEdge.() -> ContourEdge) {
val newEdge = ContourEdge(contourAdjuster.contour, segmentIndex()).block()
val newEdge = ContourEdge(contourAdjuster.contour, segmentIndex()).block()
contourAdjuster.contour = newEdge.contour
contourAdjuster.updateSelection(newEdge.adjustments)
}
fun toLinear() = wrap { toLinear() }
fun toCubic() = wrap { toCubic() }
fun splitAt(t: Double) = wrap { splitAt(t) }
/**
* split edge in [numberOfParts] parts of equal length
*/
fun splitIn(numberOfParts: Int) = wrap { splitIn(numberOfParts) }
fun moveBy(translation: Vector2, updateTangents: Boolean = true) = wrap { movedBy(translation, updateTangents) }
fun rotate(rotationInDegrees: Double, anchorT: Double = 0.5, updateTangents: Boolean = true) =
wrap { rotatedBy(rotationInDegrees, anchorT, updateTangents) }
fun scale(scaleFactor: Double, anchorT: Double = 0.5, updateTangents: Boolean = true) =
wrap { scaledBy(scaleFactor, anchorT, updateTangents = true) }
fun replaceWith(t:Double, updateTangents: Boolean = true) = wrap { replacedWith(t, updateTangents) }
fun replaceWith(t: Double, updateTangents: Boolean = true) = wrap { replacedWith(t, updateTangents) }
fun replaceWith(openContour: ShapeContour) = wrap { replacedWith(openContour) }
fun sub(t0:Double, t1: Double, updateTangents: Boolean = true) {
fun sub(t0: Double, t1: Double, updateTangents: Boolean = true) {
contourAdjuster.contour =
ContourEdge(contourAdjuster.contour, segmentIndex())
.subbed(t0, t1)