Upgrade to JDK 17. Add @JvmRecord annotations
This commit is contained in:
@@ -12,6 +12,7 @@ import org.openrndr.math.Vector3
|
||||
import org.openrndr.math.YPolarity
|
||||
import org.openrndr.math.transforms.*
|
||||
import org.openrndr.shape.*
|
||||
import kotlin.jvm.JvmRecord
|
||||
|
||||
/**
|
||||
* Used internally to define [ClipMode]s.
|
||||
@@ -71,12 +72,14 @@ private data class CompositionDrawStyle(
|
||||
/**
|
||||
* Data structure containing intersection information.
|
||||
*/
|
||||
@JvmRecord
|
||||
data class ShapeNodeIntersection(val node: ShapeNode, val intersection: ContourIntersection)
|
||||
|
||||
/**
|
||||
* Data structure containing information about a point
|
||||
* in a [ShapeContour] closest to some other 2D point.
|
||||
*/
|
||||
@JvmRecord
|
||||
data class ShapeNodeNearestContour(val node: ShapeNode, val point: ContourPoint, val distanceDirection: Vector2, val distance: Double)
|
||||
|
||||
/**
|
||||
|
||||
@@ -7,6 +7,7 @@ import org.openrndr.extra.composition.AttributeOrPropertyKey.*
|
||||
import org.openrndr.extra.composition.Inheritance.*
|
||||
import org.openrndr.math.*
|
||||
import org.openrndr.shape.Rectangle
|
||||
import kotlin.jvm.JvmRecord
|
||||
import kotlin.reflect.*
|
||||
|
||||
enum class Inheritance {
|
||||
@@ -216,8 +217,10 @@ enum class MeetOrSlice {
|
||||
SLICE
|
||||
}
|
||||
|
||||
@JvmRecord
|
||||
data class AspectRatio(val align: Align, val meetOrSlice: MeetOrSlice) : AttributeOrPropertyValue {
|
||||
override val value = this
|
||||
override val value: AspectRatio
|
||||
get() = this
|
||||
|
||||
companion object {
|
||||
val DEFAULT = AspectRatio(Align.X_MID_Y_MID, MeetOrSlice.MEET)
|
||||
@@ -267,6 +270,7 @@ sealed interface ViewBox : AttributeOrPropertyValue {
|
||||
}
|
||||
}
|
||||
|
||||
@JvmRecord
|
||||
private data class PropertyBehavior(val inherit: Inheritance, val initial: AttributeOrPropertyValue)
|
||||
|
||||
private object PropertyBehaviors {
|
||||
|
||||
Reference in New Issue
Block a user