From bce61c0fb0885a30c0bc0ce860425128d70e2ef0 Mon Sep 17 00:00:00 2001 From: darksnake Date: Tue, 5 Dec 2023 18:50:26 +0300 Subject: [PATCH 1/6] Html input events --- build.gradle.kts | 2 +- .../kscience/visionforge/ControlVision.kt | 9 +++++- .../kscience/visionforge/VisionClient.kt | 2 +- .../kscience/visionforge/html/VisionOfHtml.kt | 21 +++++++++++++- .../visionforge/ElementVisionRenderer.kt | 22 +++++++++++---- .../kscience/visionforge/JsVisionClient.kt | 5 ++-- .../kscience/visionforge/inputRenderers.kt | 28 +++++++++++-------- 7 files changed, 67 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b578696d..1a9de8d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ val fxVersion by extra("11") allprojects { group = "space.kscience" - version = "0.3.0-dev-17" + version = "0.3.0-dev-18" } subprojects { diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt index e0d44930..20525b90 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt @@ -11,6 +11,7 @@ import kotlinx.serialization.Serializable import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.MetaRepr import space.kscience.dataforge.meta.MutableMeta +import space.kscience.dataforge.meta.Value @Serializable @SerialName("control") @@ -60,4 +61,10 @@ public fun ClickControl.onClick(scope: CoroutineScope, block: suspend VisionClic @Serializable @SerialName("control.valueChange") -public class VisionValueChangeEvent(override val meta: Meta) : VisionControlEvent() \ No newline at end of file +public class VisionValueChangeEvent(override val meta: Meta) : VisionControlEvent() { + + public val value: Value? get() = meta.value +} + +public fun VisionValueChangeEvent(value: Value?): VisionValueChangeEvent = + VisionValueChangeEvent(Meta { this.value = value }) diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt index 20974f0c..e337fea0 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt @@ -34,7 +34,7 @@ public fun VisionClient.notifyPropertyChanged(visionName: Name, propertyName: St notifyPropertyChanged(visionName, propertyName.parseAsName(true), Meta(item)) } -public fun VisionClient.sendEvent(targetName: Name, payload: MetaRepr): Unit { +public fun VisionClient.sendMetaEvent(targetName: Name, payload: MetaRepr): Unit { context.launch { sendEvent(targetName, VisionMetaEvent(payload.toMeta())) } diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt index 9cc223e5..5e597702 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt @@ -1,13 +1,19 @@ package space.kscience.visionforge.html +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.SharedFlow import kotlinx.html.InputType import kotlinx.html.TagConsumer import kotlinx.html.stream.createHTML import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import kotlinx.serialization.Transient import space.kscience.dataforge.meta.* import space.kscience.dataforge.names.asName import space.kscience.visionforge.AbstractVision +import space.kscience.visionforge.ControlVision +import space.kscience.visionforge.VisionControlEvent +import space.kscience.visionforge.VisionValueChangeEvent @Serializable @@ -53,10 +59,23 @@ public enum class InputFeedbackMode { public open class VisionOfHtmlInput( public val inputType: String, public val feedbackMode: InputFeedbackMode = InputFeedbackMode.ONCHANGE, -) : VisionOfHtml() { +) : VisionOfHtml(), ControlVision { public var value: Value? by properties.value() public var disabled: Boolean by properties.boolean { false } public var fieldName: String? by properties.string() + + @Transient + private val mutableControlEventFlow = MutableSharedFlow() + + override val controlEventFlow: SharedFlow + get() = mutableControlEventFlow + + override fun dispatchControlEvent(event: VisionControlEvent) { + if(event is VisionValueChangeEvent){ + this.value = event.value + } + mutableControlEventFlow.tryEmit(event) + } } @Suppress("UnusedReceiverParameter") diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/ElementVisionRenderer.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/ElementVisionRenderer.kt index 8e1254d9..f67172e5 100644 --- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/ElementVisionRenderer.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/ElementVisionRenderer.kt @@ -34,7 +34,13 @@ public interface ElementVisionRenderer : Named { * Display the [vision] inside a given [element] replacing its current content. * @param meta additional parameters for rendering container */ - public fun render(element: Element, name: Name, vision: Vision, meta: Meta = Meta.EMPTY) + public fun render( + element: Element, + client: VisionClient, + name: Name, + vision: Vision, + meta: Meta = Meta.EMPTY, + ) public companion object { public const val TYPE: String = "elementVisionRenderer" @@ -49,7 +55,7 @@ public interface ElementVisionRenderer : Named { public class SingleTypeVisionRenderer( public val kClass: KClass, private val acceptRating: Int = ElementVisionRenderer.DEFAULT_RATING, - private val renderFunction: TagConsumer.(name: Name, vision: T, meta: Meta) -> Unit, + private val renderFunction: TagConsumer.(name: Name, client: VisionClient, vision: T, meta: Meta) -> Unit, ) : ElementVisionRenderer { @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class) @@ -60,15 +66,21 @@ public class SingleTypeVisionRenderer( override fun rateVision(vision: Vision): Int = if (vision::class == kClass) acceptRating else ElementVisionRenderer.ZERO_RATING - override fun render(element: Element, name: Name, vision: Vision, meta: Meta) { + override fun render( + element: Element, + client: VisionClient, + name: Name, + vision: Vision, + meta: Meta, + ) { element.clear() element.append { - renderFunction(name, kClass.cast(vision), meta) + renderFunction(name, client, kClass.cast(vision), meta) } } } public inline fun ElementVisionRenderer( acceptRating: Int = ElementVisionRenderer.DEFAULT_RATING, - noinline renderFunction: TagConsumer.(name: Name, vision: T, meta: Meta) -> Unit, + noinline renderFunction: TagConsumer.(name: Name, client: VisionClient, vision: T, meta: Meta) -> Unit, ): ElementVisionRenderer = SingleTypeVisionRenderer(T::class, acceptRating, renderFunction) diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt index c7ada5fe..c24ab493 100644 --- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt @@ -94,8 +94,9 @@ public class JsVisionClient : AbstractPlugin(), VisionClient { private fun renderVision(element: Element, name: Name, vision: Vision, outputMeta: Meta) { vision.setAsRoot(visionManager) - val renderer = findRendererFor(vision) ?: error("Could not find renderer for ${vision::class}") - renderer.render(element, name, vision, outputMeta) + val renderer: ElementVisionRenderer = + findRendererFor(vision) ?: error("Could not find renderer for ${vision::class}") + renderer.render(element, this, name, vision, outputMeta) } private fun startVisionUpdate(element: Element, visionName: Name, vision: Vision, outputMeta: Meta) { diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt index e1410752..f17ac78f 100644 --- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt @@ -40,7 +40,7 @@ private fun HTMLInputElement.subscribeToInput(inputVision: VisionOfHtmlInput) { } internal val htmlVisionRenderer: ElementVisionRenderer = - ElementVisionRenderer { _, vision, _ -> + ElementVisionRenderer { _, _, vision, _ -> div {}.also { div -> div.subscribeToVision(vision) vision.useProperty(VisionOfPlainHtml::content) { @@ -50,12 +50,14 @@ internal val htmlVisionRenderer: ElementVisionRenderer = } internal val inputVisionRenderer: ElementVisionRenderer = - ElementVisionRenderer(acceptRating = ElementVisionRenderer.DEFAULT_RATING - 1) { _, vision, _ -> + ElementVisionRenderer( + acceptRating = ElementVisionRenderer.DEFAULT_RATING - 1 + ) { name, client, vision, _ -> input { type = InputType.text }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { - vision.value = htmlInputElement.value.asValue() + client.sendEvent(name, VisionValueChangeEvent(htmlInputElement.value.asValue())) } @@ -74,12 +76,12 @@ internal val inputVisionRenderer: ElementVisionRenderer = } internal val checkboxVisionRenderer: ElementVisionRenderer = - ElementVisionRenderer { _, vision, _ -> + ElementVisionRenderer { name, client, vision, _ -> input { type = InputType.checkBox }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { - vision.checked = htmlInputElement.checked + client.sendEvent(name, VisionValueChangeEvent(htmlInputElement.checked.asValue())) } @@ -98,12 +100,12 @@ internal val checkboxVisionRenderer: ElementVisionRenderer = } internal val textVisionRenderer: ElementVisionRenderer = - ElementVisionRenderer { _, vision, _ -> + ElementVisionRenderer { name, client, vision, _ -> input { type = InputType.text }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { - vision.text = htmlInputElement.value + client.sendEvent(name, VisionValueChangeEvent(htmlInputElement.value.asValue())) } @@ -122,13 +124,15 @@ internal val textVisionRenderer: ElementVisionRenderer = } internal val numberVisionRenderer: ElementVisionRenderer = - ElementVisionRenderer { _, vision, _ -> + ElementVisionRenderer { name, client, vision, _ -> input { type = InputType.text }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { - htmlInputElement.value.toDoubleOrNull()?.let { vision.number = it } + htmlInputElement.value.toDoubleOrNull()?.let { + client.sendEvent(name, VisionValueChangeEvent(it.asValue())) + } } when (vision.feedbackMode) { @@ -145,7 +149,7 @@ internal val numberVisionRenderer: ElementVisionRenderer = } internal val rangeVisionRenderer: ElementVisionRenderer = - ElementVisionRenderer { _, vision, _ -> + ElementVisionRenderer { name, client, vision, _ -> input { type = InputType.text min = vision.min.toString() @@ -154,7 +158,9 @@ internal val rangeVisionRenderer: ElementVisionRenderer = }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { - htmlInputElement.value.toDoubleOrNull()?.let { vision.number = it } + htmlInputElement.value.toDoubleOrNull()?.let { + client.sendEvent(name, VisionValueChangeEvent(it.asValue())) + } } when (vision.feedbackMode) { From 05b87857f421df90bd4232311ae2b2f6e2a20aca Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 6 Dec 2023 23:01:22 +0300 Subject: [PATCH 2/6] Add input listeners --- .../ThreeWithControlsPlugin.kt | 7 +++-- .../kscience/visionforge/inputRenderers.kt | 28 ++++++++++++++----- .../visionforge/markup/MarkupPlugin.kt | 2 +- .../kscience/visionforge/plotly/plotlyJs.kt | 7 ++--- .../visionforge/tables/TableVisionJsPlugin.kt | 3 +- .../visionforge/solid/three/ThreePlugin.kt | 2 +- 6 files changed, 31 insertions(+), 18 deletions(-) diff --git a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt b/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt index 94259b2f..a2223692 100644 --- a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt +++ b/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt @@ -13,6 +13,7 @@ import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.asName import space.kscience.visionforge.ElementVisionRenderer import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionClient import space.kscience.visionforge.react.render import space.kscience.visionforge.solid.Solid import space.kscience.visionforge.solid.specifications.Canvas3DOptions @@ -26,9 +27,9 @@ public class ThreeWithControlsPlugin : AbstractPlugin(), ElementVisionRenderer { override fun rateVision(vision: Vision): Int = if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING * 2 else ElementVisionRenderer.ZERO_RATING - override fun render(element: Element, name: Name, vision: Vision, meta: Meta) { - if(meta["controls.enabled"].boolean == false){ - three.render(element, name, vision, meta) + override fun render(element: Element, client: VisionClient, name: Name, vision: Vision, meta: Meta) { + if (meta["controls.enabled"].boolean == false) { + three.render(element, client, name, vision, meta) } else { space.kscience.visionforge.react.createRoot(element).render { child(ThreeCanvasWithControls) { diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt index f17ac78f..a43a99f1 100644 --- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt @@ -1,8 +1,11 @@ package space.kscience.visionforge import kotlinx.browser.document +import kotlinx.coroutines.launch +import kotlinx.dom.clear import kotlinx.html.InputType import kotlinx.html.div +import kotlinx.html.dom.append import kotlinx.html.js.input import org.w3c.dom.HTMLElement import org.w3c.dom.HTMLFormElement @@ -13,6 +16,7 @@ import org.w3c.xhr.FormData import space.kscience.dataforge.context.debug import space.kscience.dataforge.context.logger import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.Name import space.kscience.visionforge.html.* /** @@ -27,6 +31,12 @@ private fun HTMLElement.subscribeToVision(vision: VisionOfHtml) { } +private fun VisionClient.sendInputEvent(name: Name, value: Value?) { + context.launch { + sendEvent(name, VisionValueChangeEvent(value)) + } +} + /** * Subscribes the HTML input element to a given vision. * @@ -44,6 +54,10 @@ internal val htmlVisionRenderer: ElementVisionRenderer = div {}.also { div -> div.subscribeToVision(vision) vision.useProperty(VisionOfPlainHtml::content) { + div.clear() + div.append { + + } div.textContent = it } } @@ -57,7 +71,7 @@ internal val inputVisionRenderer: ElementVisionRenderer = type = InputType.text }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { - client.sendEvent(name, VisionValueChangeEvent(htmlInputElement.value.asValue())) + client.sendInputEvent(name, htmlInputElement.value.asValue()) } @@ -81,7 +95,7 @@ internal val checkboxVisionRenderer: ElementVisionRenderer = type = InputType.checkBox }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { - client.sendEvent(name, VisionValueChangeEvent(htmlInputElement.checked.asValue())) + client.sendInputEvent(name, htmlInputElement.value.asValue()) } @@ -105,7 +119,7 @@ internal val textVisionRenderer: ElementVisionRenderer = type = InputType.text }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { - client.sendEvent(name, VisionValueChangeEvent(htmlInputElement.value.asValue())) + client.sendInputEvent(name, htmlInputElement.value.asValue()) } @@ -131,7 +145,7 @@ internal val numberVisionRenderer: ElementVisionRenderer = val onEvent: (Event) -> Unit = { htmlInputElement.value.toDoubleOrNull()?.let { - client.sendEvent(name, VisionValueChangeEvent(it.asValue())) + client.sendInputEvent(name, htmlInputElement.value.asValue()) } } @@ -159,7 +173,7 @@ internal val rangeVisionRenderer: ElementVisionRenderer = val onEvent: (Event) -> Unit = { htmlInputElement.value.toDoubleOrNull()?.let { - client.sendEvent(name, VisionValueChangeEvent(it.asValue())) + client.sendInputEvent(name, htmlInputElement.value.asValue()) } } @@ -200,7 +214,7 @@ internal fun FormData.toMeta(): Meta { } internal val formVisionRenderer: ElementVisionRenderer = - ElementVisionRenderer { _, vision, _ -> + ElementVisionRenderer { name, client, vision, _ -> val form = document.getElementById(vision.formId) as? HTMLFormElement ?: error("An element with id = '${vision.formId} is not a form") @@ -220,7 +234,7 @@ internal val formVisionRenderer: ElementVisionRenderer = form.onsubmit = { event -> event.preventDefault() val formData = FormData(form).toMeta() - vision.values = formData + client.sendMetaEvent(name, formData) console.info("Sent: ${formData.toMap()}") false } diff --git a/visionforge-markdown/src/jsMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt b/visionforge-markdown/src/jsMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt index ef700466..0d5e0431 100644 --- a/visionforge-markdown/src/jsMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt +++ b/visionforge-markdown/src/jsMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt @@ -27,7 +27,7 @@ public actual class MarkupPlugin : VisionPlugin(), ElementVisionRenderer { else -> ElementVisionRenderer.ZERO_RATING } - override fun render(element: Element, name: Name, vision: Vision, meta: Meta) { + override fun render(element: Element, client: VisionClient, name: Name, vision: Vision, meta: Meta) { require(vision is VisionOfMarkup) { "The vision is not a markup vision" } val div = document.createElement("div") val flavour = when (vision.format) { diff --git a/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt b/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt index 074be6dc..99a0795e 100644 --- a/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt +++ b/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt @@ -10,10 +10,7 @@ import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.asName import space.kscience.plotly.PlotlyConfig import space.kscience.plotly.plot -import space.kscience.visionforge.ElementVisionRenderer -import space.kscience.visionforge.JsVisionClient -import space.kscience.visionforge.Vision -import space.kscience.visionforge.VisionPlugin +import space.kscience.visionforge.* public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer { public val visionClient: JsVisionClient by require(JsVisionClient) @@ -27,7 +24,7 @@ public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer { else -> ElementVisionRenderer.ZERO_RATING } - override fun render(element: Element, name: Name, vision: Vision, meta: Meta) { + override fun render(element: Element, client: VisionClient, name: Name, vision: Vision, meta: Meta) { val plot = (vision as? VisionOfPlotly)?.plot ?: error("VisionOfPlotly expected but ${vision::class} found") val config = PlotlyConfig.read(meta) element.plot(config, plot) diff --git a/visionforge-tables/src/jsMain/kotlin/space/kscience/visionforge/tables/TableVisionJsPlugin.kt b/visionforge-tables/src/jsMain/kotlin/space/kscience/visionforge/tables/TableVisionJsPlugin.kt index 75977d79..18170686 100644 --- a/visionforge-tables/src/jsMain/kotlin/space/kscience/visionforge/tables/TableVisionJsPlugin.kt +++ b/visionforge-tables/src/jsMain/kotlin/space/kscience/visionforge/tables/TableVisionJsPlugin.kt @@ -14,6 +14,7 @@ import space.kscience.dataforge.names.asName import space.kscience.visionforge.ElementVisionRenderer import space.kscience.visionforge.JsVisionClient import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionClient import tabulator.Tabulator import tabulator.TabulatorFull @@ -34,7 +35,7 @@ public class TableVisionJsPlugin : AbstractPlugin(), ElementVisionRenderer { else -> ElementVisionRenderer.ZERO_RATING } - override fun render(element: Element, name: Name, vision: Vision, meta: Meta) { + override fun render(element: Element, client: VisionClient, name: Name, vision: Vision, meta: Meta) { val table: VisionOfTable = (vision as? VisionOfTable) ?: error("VisionOfTable expected but ${vision::class} found") diff --git a/visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt b/visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt index 7051f887..84552dd4 100644 --- a/visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt +++ b/visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt @@ -150,7 +150,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer { render(vision) } - override fun render(element: Element, name: Name, vision: Vision, meta: Meta) { + override fun render(element: Element, client: VisionClient, name: Name, vision: Vision, meta: Meta) { renderSolid( element, vision as? Solid ?: error("Solid expected but ${vision::class} found"), From f40bed7bb9a47edfbbb6da1758b476bf55e29284 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 10 Dec 2023 17:06:58 +0300 Subject: [PATCH 3/6] Implement and test input elements --- .../src/jvmMain/kotlin/controlVision.kt | 59 +++++++++ .../kscience/visionforge/ControlVision.kt | 45 +++++-- .../space/kscience/visionforge/Vision.kt | 2 +- .../kscience/visionforge/VisionClient.kt | 8 -- .../kscience/visionforge/VisionManager.kt | 2 + .../kscience/visionforge/html/VisionOfHtml.kt | 64 ++++++---- .../visionforge/html/VisionOfHtmlForm.kt | 21 +++- .../kscience/visionforge/JsVisionClient.kt | 7 +- .../kscience/visionforge/formRenderers.kt | 90 ++++++++++++++ .../kscience/visionforge/inputRenderers.kt | 116 +++++------------- 10 files changed, 278 insertions(+), 136 deletions(-) create mode 100644 demo/playground/src/jvmMain/kotlin/controlVision.kt create mode 100644 visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/formRenderers.kt diff --git a/demo/playground/src/jvmMain/kotlin/controlVision.kt b/demo/playground/src/jvmMain/kotlin/controlVision.kt new file mode 100644 index 00000000..f7a9c753 --- /dev/null +++ b/demo/playground/src/jvmMain/kotlin/controlVision.kt @@ -0,0 +1,59 @@ +package space.kscience.visionforge.examples + +import kotlinx.html.p +import space.kscience.visionforge.VisionControlEvent +import space.kscience.visionforge.html.* +import space.kscience.visionforge.onClick + + +fun main() = serve { + + val events = ArrayDeque(10) + + val html = VisionOfPlainHtml() + + fun pushEvent(event: VisionControlEvent) { + events.addFirst(event) + if (events.size >= 10) { + events.removeLast() + } + html.content { + events.forEach { event -> + p { + text(event.toString()) + } + } + } + } + + vision { + htmlCheckBox { + checked = true + onValueChange(context) { + pushEvent(this) + } + } + } + + vision { + htmlRangeField(1, 10) { + numberValue = 4 + onValueChange(context) { + pushEvent(this) + } + } + } + + + vision { + button("Click me"){ + onClick(context){ + pushEvent(this) + } + } + } + + + + vision(html) +} \ No newline at end of file diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt index 20525b90..fec77548 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt @@ -8,14 +8,13 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import space.kscience.dataforge.meta.Meta -import space.kscience.dataforge.meta.MetaRepr -import space.kscience.dataforge.meta.MutableMeta -import space.kscience.dataforge.meta.Value +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.parseAsName @Serializable @SerialName("control") -public abstract class VisionControlEvent : VisionEvent, MetaRepr { +public sealed class VisionControlEvent : VisionEvent, MetaRepr { public abstract val meta: Meta override fun toMeta(): Meta = meta @@ -24,30 +23,41 @@ public abstract class VisionControlEvent : VisionEvent, MetaRepr { public interface ControlVision : Vision { public val controlEventFlow: SharedFlow - public fun dispatchControlEvent(event: VisionControlEvent) + public suspend fun dispatchControlEvent(event: VisionControlEvent) - override fun receiveEvent(event: VisionEvent) { + override suspend fun receiveEvent(event: VisionEvent) { if (event is VisionControlEvent) { dispatchControlEvent(event) } else super.receiveEvent(event) } } + /** * @param payload The optional payload associated with the click event. */ @Serializable @SerialName("control.click") -public class VisionClickEvent(public val payload: Meta = Meta.EMPTY) : VisionControlEvent() { - override val meta: Meta get() = Meta { ::payload.name put payload } +public class VisionClickEvent(override val meta: Meta) : VisionControlEvent() { + public val payload: Meta? by meta.node() + public val name: Name? get() = meta["name"].string?.parseAsName() + + override fun toString(): String = meta.toString() } +public fun VisionClickEvent(payload: Meta = Meta.EMPTY, name: Name? = null): VisionClickEvent = VisionClickEvent( + Meta { + VisionClickEvent::payload.name put payload + VisionClickEvent::name.name put name.toString() + } +) + public interface ClickControl : ControlVision { /** * Create and dispatch a click event */ - public fun click(builder: MutableMeta.() -> Unit = {}) { + public suspend fun click(builder: MutableMeta.() -> Unit = {}) { dispatchControlEvent(VisionClickEvent(Meta(builder))) } } @@ -64,7 +74,18 @@ public fun ClickControl.onClick(scope: CoroutineScope, block: suspend VisionClic public class VisionValueChangeEvent(override val meta: Meta) : VisionControlEvent() { public val value: Value? get() = meta.value + + /** + * The name of a control that fired the event + */ + public val name: Name? get() = meta["name"]?.string?.parseAsName() + + override fun toString(): String = meta.toString() } -public fun VisionValueChangeEvent(value: Value?): VisionValueChangeEvent = - VisionValueChangeEvent(Meta { this.value = value }) +public fun VisionValueChangeEvent(value: Value?, name: Name? = null): VisionValueChangeEvent = VisionValueChangeEvent( + Meta { + this.value = value + name?.let { set("name", it.toString()) } + } +) diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt index 78f917a9..ece71edd 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt @@ -50,7 +50,7 @@ public interface Vision : Described { /** * Receive and process a generic [VisionEvent]. */ - public fun receiveEvent(event: VisionEvent) { + public suspend fun receiveEvent(event: VisionEvent) { if(event is VisionChange) update(event) else manager?.logger?.warn { "Undispatched event: $event" } } diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt index e337fea0..7a62de7d 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt @@ -1,9 +1,7 @@ package space.kscience.visionforge -import kotlinx.coroutines.launch import space.kscience.dataforge.context.Plugin import space.kscience.dataforge.meta.Meta -import space.kscience.dataforge.meta.MetaRepr import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.parseAsName @@ -32,10 +30,4 @@ public fun VisionClient.notifyPropertyChanged(visionName: Name, propertyName: St public fun VisionClient.notifyPropertyChanged(visionName: Name, propertyName: String, item: Boolean) { notifyPropertyChanged(visionName, propertyName.parseAsName(true), Meta(item)) -} - -public fun VisionClient.sendMetaEvent(targetName: Name, payload: MetaRepr): Unit { - context.launch { - sendEvent(targetName, VisionMetaEvent(payload.toMeta())) - } } \ No newline at end of file diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt index 8799a73f..2d765a35 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt @@ -69,12 +69,14 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta), MutableVisionCont defaultDeserializer { SimpleVisionGroup.serializer() } subclass(NullVision.serializer()) subclass(SimpleVisionGroup.serializer()) + subclass(VisionOfPlainHtml.serializer()) subclass(VisionOfHtmlInput.serializer()) subclass(VisionOfNumberField.serializer()) subclass(VisionOfTextField.serializer()) subclass(VisionOfCheckbox.serializer()) subclass(VisionOfRangeField.serializer()) subclass(VisionOfHtmlForm.serializer()) + subclass(VisionOfHtmlButton.serializer()) } } diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt index 5e597702..0738ddc6 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt @@ -1,9 +1,11 @@ package space.kscience.visionforge.html -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.* +import kotlinx.html.DIV import kotlinx.html.InputType -import kotlinx.html.TagConsumer +import kotlinx.html.div import kotlinx.html.stream.createHTML import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -27,8 +29,10 @@ public class VisionOfPlainHtml : VisionOfHtml() { public var content: String? by properties.string() } -public inline fun VisionOfPlainHtml.content(block: TagConsumer<*>.() -> Unit) { - content = createHTML().apply(block).finalize() +public fun VisionOfPlainHtml.content(block: DIV.() -> Unit) { + content = createHTML().apply { + div(block = block) + }.finalize() } @Suppress("UnusedReceiverParameter") @@ -54,15 +58,7 @@ public enum class InputFeedbackMode { NONE } -@Serializable -@SerialName("html.input") -public open class VisionOfHtmlInput( - public val inputType: String, - public val feedbackMode: InputFeedbackMode = InputFeedbackMode.ONCHANGE, -) : VisionOfHtml(), ControlVision { - public var value: Value? by properties.value() - public var disabled: Boolean by properties.boolean { false } - public var fieldName: String? by properties.string() +public abstract class VisionOfHtmlControl: VisionOfHtml(), ControlVision{ @Transient private val mutableControlEventFlow = MutableSharedFlow() @@ -70,14 +66,32 @@ public open class VisionOfHtmlInput( override val controlEventFlow: SharedFlow get() = mutableControlEventFlow - override fun dispatchControlEvent(event: VisionControlEvent) { - if(event is VisionValueChangeEvent){ - this.value = event.value - } - mutableControlEventFlow.tryEmit(event) + override suspend fun dispatchControlEvent(event: VisionControlEvent) { + mutableControlEventFlow.emit(event) } } + +@Serializable +@SerialName("html.input") +public open class VisionOfHtmlInput( + public val inputType: String, + public val feedbackMode: InputFeedbackMode = InputFeedbackMode.ONCHANGE, +) : VisionOfHtmlControl() { + public var value: Value? by properties.value() + public var disabled: Boolean by properties.boolean { false } + public var fieldName: String? by properties.string() + +} + +/** + * Trigger [callback] on each value change + */ +public fun VisionOfHtmlInput.onValueChange( + scope: CoroutineScope = manager?.context ?: error("Coroutine context is not resolved for $this"), + callback: suspend VisionValueChangeEvent.() -> Unit, +): Job = controlEventFlow.filterIsInstance().onEach(callback).launchIn(scope) + @Suppress("UnusedReceiverParameter") public inline fun VisionOutput.htmlInput( inputType: String, @@ -110,7 +124,7 @@ public inline fun VisionOutput.htmlCheckBox( @Serializable @SerialName("html.number") public class VisionOfNumberField : VisionOfHtmlInput(InputType.number.realValue) { - public var number: Number? by properties.number(key = VisionOfHtmlInput::value.name.asName()) + public var numberValue: Number? by properties.number(key = VisionOfHtmlInput::value.name.asName()) } @Suppress("UnusedReceiverParameter") @@ -125,14 +139,14 @@ public class VisionOfRangeField( public val max: Double, public val step: Double = 1.0, ) : VisionOfHtmlInput(InputType.range.realValue) { - public var number: Number? by properties.number(key = VisionOfHtmlInput::value.name.asName()) + public var numberValue: Number? by properties.number(key = VisionOfHtmlInput::value.name.asName()) } @Suppress("UnusedReceiverParameter") public inline fun VisionOutput.htmlRangeField( - min: Double, - max: Double, - step: Double = 1.0, + min: Number, + max: Number, + step: Number = 1.0, block: VisionOfRangeField.() -> Unit = {}, -): VisionOfRangeField = VisionOfRangeField(min, max, step).apply(block) +): VisionOfRangeField = VisionOfRangeField(min.toDouble(), max.toDouble(), step.toDouble()).apply(block) diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtmlForm.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtmlForm.kt index e56af874..c128ec6f 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtmlForm.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtmlForm.kt @@ -8,6 +8,8 @@ import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.node +import space.kscience.dataforge.meta.string +import space.kscience.visionforge.ClickControl /** * @param formId an id of the element in rendered DOM, this form is bound to @@ -16,7 +18,7 @@ import space.kscience.dataforge.meta.node @SerialName("html.form") public class VisionOfHtmlForm( public val formId: String, -) : VisionOfHtml() { +) : VisionOfHtmlControl() { public var values: Meta? by properties.node() } @@ -26,4 +28,21 @@ public fun TagConsumer.bindForm( ): R = form { this.id = visionOfForm.formId builder() +} + + +@Serializable +@SerialName("html.button") +public class VisionOfHtmlButton : VisionOfHtmlControl(), ClickControl { + public var label: String? by properties.string() +} + + +@Suppress("UnusedReceiverParameter") +public inline fun VisionOutput.button( + text: String, + block: VisionOfHtmlButton.() -> Unit = {}, +): VisionOfHtmlButton = VisionOfHtmlButton().apply { + label = text + block() } \ No newline at end of file diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt index c24ab493..e0dc975a 100644 --- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt @@ -135,7 +135,9 @@ public class JsVisionClient : AbstractPlugin(), VisionClient { } logger.debug { "Got $event for output with name $visionName" } - vision.receiveEvent(event) + context.launch { + vision.receiveEvent(event) + } } else { logger.error { "WebSocket message data is not a string" } } @@ -262,7 +264,8 @@ public class JsVisionClient : AbstractPlugin(), VisionClient { numberVisionRenderer, textVisionRenderer, rangeVisionRenderer, - formVisionRenderer + formVisionRenderer, + buttonVisionRenderer ).associateByName() } else super.content(target) diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/formRenderers.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/formRenderers.kt new file mode 100644 index 00000000..6a360af8 --- /dev/null +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/formRenderers.kt @@ -0,0 +1,90 @@ +package space.kscience.visionforge + +import kotlinx.browser.document +import kotlinx.coroutines.launch +import kotlinx.html.ButtonType +import kotlinx.html.js.button +import org.w3c.dom.HTMLFormElement +import org.w3c.dom.HTMLInputElement +import org.w3c.dom.get +import org.w3c.xhr.FormData +import space.kscience.dataforge.context.debug +import space.kscience.dataforge.context.logger +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.Name +import space.kscience.visionforge.html.VisionOfHtmlButton +import space.kscience.visionforge.html.VisionOfHtmlForm + + +internal fun FormData.toMeta(): Meta { + @Suppress("UNUSED_VARIABLE") val formData = this + //val res = js("Object.fromEntries(formData);") + val `object` = js("{}") + //language=JavaScript + js( + """ + formData.forEach(function(value, key){ + // Reflect.has in favor of: object.hasOwnProperty(key) + if(!Reflect.has(object, key)){ + object[key] = value; + return; + } + if(!Array.isArray(object[key])){ + object[key] = [object[key]]; + } + object[key].push(value); + }); + """ + ) + return DynamicMeta(`object`) +} + + +public fun VisionClient.sendMetaEvent(targetName: Name, payload: MetaRepr): Unit { + context.launch { + sendEvent(targetName, VisionMetaEvent(payload.toMeta())) + } +} + +internal val formVisionRenderer: ElementVisionRenderer = + ElementVisionRenderer { name, client, vision, _ -> + + val form = document.getElementById(vision.formId) as? HTMLFormElement + ?: error("An element with id = '${vision.formId} is not a form") + + form.subscribeToVision(vision) + + vision.manager?.logger?.debug { "Adding hooks to form with id = '$vision.formId'" } + + vision.useProperty(VisionOfHtmlForm::values) { values -> + vision.manager?.logger?.debug { "Updating form '${vision.formId}' with values $values" } + val inputs = form.getElementsByTagName("input") + values?.valueSequence()?.forEach { (token, value) -> + (inputs[token.toString()] as? HTMLInputElement)?.value = value.toString() + } + } + + form.onsubmit = { event -> + event.preventDefault() + val formData = FormData(form).toMeta() + client.sendMetaEvent(name, formData) + console.info("Sent: ${formData.toMap()}") + false + } + } + +internal val buttonVisionRenderer: ElementVisionRenderer = + ElementVisionRenderer { name, client, vision, _ -> + button(type = ButtonType.button).also { button -> + button.subscribeToVision(vision) + button.onclick = { + client.context.launch { + client.sendEvent(name, VisionClickEvent(name = name)) + } + } + vision.useProperty(VisionOfHtmlButton::label) { + button.innerHTML = it ?: "" + } + + } + } diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt index a43a99f1..4112370a 100644 --- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt @@ -1,21 +1,17 @@ package space.kscience.visionforge -import kotlinx.browser.document import kotlinx.coroutines.launch import kotlinx.dom.clear import kotlinx.html.InputType import kotlinx.html.div -import kotlinx.html.dom.append import kotlinx.html.js.input import org.w3c.dom.HTMLElement -import org.w3c.dom.HTMLFormElement import org.w3c.dom.HTMLInputElement import org.w3c.dom.events.Event -import org.w3c.dom.get -import org.w3c.xhr.FormData -import space.kscience.dataforge.context.debug -import space.kscience.dataforge.context.logger -import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.Value +import space.kscience.dataforge.meta.asValue +import space.kscience.dataforge.meta.double +import space.kscience.dataforge.meta.string import space.kscience.dataforge.names.Name import space.kscience.visionforge.html.* @@ -24,7 +20,7 @@ import space.kscience.visionforge.html.* * * @param vision The vision to subscribe to. */ -private fun HTMLElement.subscribeToVision(vision: VisionOfHtml) { +internal fun HTMLElement.subscribeToVision(vision: VisionOfHtml) { vision.useProperty(VisionOfHtml::classes) { classList.value = classes.joinToString(separator = " ") } @@ -33,7 +29,7 @@ private fun HTMLElement.subscribeToVision(vision: VisionOfHtml) { private fun VisionClient.sendInputEvent(name: Name, value: Value?) { context.launch { - sendEvent(name, VisionValueChangeEvent(value)) + sendEvent(name, VisionValueChangeEvent(value, name)) } } @@ -51,43 +47,39 @@ private fun HTMLInputElement.subscribeToInput(inputVision: VisionOfHtmlInput) { internal val htmlVisionRenderer: ElementVisionRenderer = ElementVisionRenderer { _, _, vision, _ -> - div {}.also { div -> + div().also { div -> div.subscribeToVision(vision) vision.useProperty(VisionOfPlainHtml::content) { div.clear() - div.append { - - } - div.textContent = it + if (it != null) div.innerHTML = it } } } -internal val inputVisionRenderer: ElementVisionRenderer = - ElementVisionRenderer( - acceptRating = ElementVisionRenderer.DEFAULT_RATING - 1 - ) { name, client, vision, _ -> - input { - type = InputType.text - }.also { htmlInputElement -> - val onEvent: (Event) -> Unit = { - client.sendInputEvent(name, htmlInputElement.value.asValue()) - } +internal val inputVisionRenderer: ElementVisionRenderer = ElementVisionRenderer( + acceptRating = ElementVisionRenderer.DEFAULT_RATING - 1 +) { name, client, vision, _ -> + input { + type = InputType.text + }.also { htmlInputElement -> + val onEvent: (Event) -> Unit = { + client.sendInputEvent(name, htmlInputElement.value.asValue()) + } - when (vision.feedbackMode) { - InputFeedbackMode.ONCHANGE -> htmlInputElement.onchange = onEvent + when (vision.feedbackMode) { + InputFeedbackMode.ONCHANGE -> htmlInputElement.onchange = onEvent - InputFeedbackMode.ONINPUT -> htmlInputElement.oninput = onEvent - InputFeedbackMode.NONE -> {} - } + InputFeedbackMode.ONINPUT -> htmlInputElement.oninput = onEvent + InputFeedbackMode.NONE -> {} + } - htmlInputElement.subscribeToInput(vision) - vision.useProperty(VisionOfHtmlInput::value) { - htmlInputElement.value = it?.string ?: "" - } + htmlInputElement.subscribeToInput(vision) + vision.useProperty(VisionOfHtmlInput::value) { + htmlInputElement.value = it?.string ?: "" } } +} internal val checkboxVisionRenderer: ElementVisionRenderer = ElementVisionRenderer { name, client, vision, _ -> @@ -95,7 +87,7 @@ internal val checkboxVisionRenderer: ElementVisionRenderer = type = InputType.checkBox }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { - client.sendInputEvent(name, htmlInputElement.value.asValue()) + client.sendInputEvent(name, htmlInputElement.checked.asValue()) } @@ -140,7 +132,7 @@ internal val textVisionRenderer: ElementVisionRenderer = internal val numberVisionRenderer: ElementVisionRenderer = ElementVisionRenderer { name, client, vision, _ -> input { - type = InputType.text + type = InputType.number }.also { htmlInputElement -> val onEvent: (Event) -> Unit = { @@ -165,7 +157,7 @@ internal val numberVisionRenderer: ElementVisionRenderer = internal val rangeVisionRenderer: ElementVisionRenderer = ElementVisionRenderer { name, client, vision, _ -> input { - type = InputType.text + type = InputType.range min = vision.min.toString() max = vision.max.toString() step = vision.step.toString() @@ -189,53 +181,3 @@ internal val rangeVisionRenderer: ElementVisionRenderer = } } } - -internal fun FormData.toMeta(): Meta { - @Suppress("UNUSED_VARIABLE") val formData = this - //val res = js("Object.fromEntries(formData);") - val `object` = js("{}") - //language=JavaScript - js( - """ - formData.forEach(function(value, key){ - // Reflect.has in favor of: object.hasOwnProperty(key) - if(!Reflect.has(object, key)){ - object[key] = value; - return; - } - if(!Array.isArray(object[key])){ - object[key] = [object[key]]; - } - object[key].push(value); - }); - """ - ) - return DynamicMeta(`object`) -} - -internal val formVisionRenderer: ElementVisionRenderer = - ElementVisionRenderer { name, client, vision, _ -> - - val form = document.getElementById(vision.formId) as? HTMLFormElement - ?: error("An element with id = '${vision.formId} is not a form") - - form.subscribeToVision(vision) - - vision.manager?.logger?.debug { "Adding hooks to form with id = '$vision.formId'" } - - vision.useProperty(VisionOfHtmlForm::values) { values -> - vision.manager?.logger?.debug { "Updating form '${vision.formId}' with values $values" } - val inputs = form.getElementsByTagName("input") - values?.valueSequence()?.forEach { (token, value) -> - (inputs[token.toString()] as? HTMLInputElement)?.value = value.toString() - } - } - - form.onsubmit = { event -> - event.preventDefault() - val formData = FormData(form).toMeta() - client.sendMetaEvent(name, formData) - console.info("Sent: ${formData.toMap()}") - false - } - } \ No newline at end of file From 9c2db6d32110bd26732fc8d13c385209c181f16a Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 11 Dec 2023 22:57:23 +0300 Subject: [PATCH 4/6] Allow custom events --- visionforge-core/build.gradle.kts | 4 ++-- .../space/kscience/visionforge/ControlVision.kt | 8 ++++---- .../space/kscience/visionforge/VisionEvent.kt | 11 ++++++++--- .../space/kscience/visionforge/VisionManager.kt | 14 +++++++++++--- .../space/kscience/visionforge/JsVisionClient.kt | 12 ++++-------- .../kscience/visionforge/server/VisionServer.kt | 12 ++++-------- 6 files changed, 33 insertions(+), 28 deletions(-) diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts index f2cac4c6..bc7103b9 100644 --- a/visionforge-core/build.gradle.kts +++ b/visionforge-core/build.gradle.kts @@ -8,11 +8,11 @@ kscience { jvm() js() native() +// wasm() useCoroutines() - dependencies { + commonMain { api("space.kscience:dataforge-context:$dataforgeVersion") api(spclibs.kotlinx.html) -// api("org.jetbrains.kotlin-wrappers:kotlin-css") } jsMain { api("org.jetbrains.kotlin-wrappers:kotlin-extensions") diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt index fec77548..dc27662f 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt @@ -12,12 +12,12 @@ import space.kscience.dataforge.meta.* import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.parseAsName -@Serializable -@SerialName("control") -public sealed class VisionControlEvent : VisionEvent, MetaRepr { +public abstract class VisionControlEvent : VisionEvent, MetaRepr { public abstract val meta: Meta override fun toMeta(): Meta = meta + + override fun toString(): String = toMeta().toString() } public interface ControlVision : Vision { @@ -42,7 +42,7 @@ public class VisionClickEvent(override val meta: Meta) : VisionControlEvent() { public val payload: Meta? by meta.node() public val name: Name? get() = meta["name"].string?.parseAsName() - override fun toString(): String = meta.toString() + override fun toString(): String = meta.toString() } public fun VisionClickEvent(payload: Meta = Meta.EMPTY, name: Name? = null): VisionClickEvent = VisionClickEvent( diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionEvent.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionEvent.kt index de0b2643..e0f5beca 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionEvent.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionEvent.kt @@ -3,13 +3,13 @@ package space.kscience.visionforge import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaRepr import space.kscience.dataforge.names.Name /** * An event propagated from client to a server */ -@Serializable -public sealed interface VisionEvent { +public interface VisionEvent { public companion object { public val CLICK_EVENT_KEY: Name get() = Name.of("events", "click", "payload") } @@ -20,4 +20,9 @@ public sealed interface VisionEvent { */ @Serializable @SerialName("meta") -public class VisionMetaEvent(public val meta: Meta) : VisionEvent \ No newline at end of file +public class VisionMetaEvent(public val meta: Meta) : VisionEvent, MetaRepr { + override fun toMeta(): Meta = meta + + override fun toString(): String = toMeta().toString() + +} \ No newline at end of file diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt index 2d765a35..9b5a21ac 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt @@ -30,10 +30,11 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta), MutableVisionCont } } - public val jsonFormat: Json - get() = Json(defaultJson) { + public val jsonFormat: Json by lazy { + Json(defaultJson) { serializersModule = this@VisionManager.serializersModule } + } public fun decodeFromString(string: String): Vision = jsonFormat.decodeFromString(visionSerializer, string) @@ -78,6 +79,13 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta), MutableVisionCont subclass(VisionOfHtmlForm.serializer()) subclass(VisionOfHtmlButton.serializer()) } + + polymorphic(VisionEvent::class) { + subclass(VisionChange.serializer()) + subclass(VisionMetaEvent.serializer()) + subclass(VisionClickEvent.serializer()) + subclass(VisionValueChangeEvent.serializer()) + } } @OptIn(ExperimentalSerializationApi::class) @@ -107,7 +115,7 @@ public abstract class VisionPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(met /** * Fetch a [VisionManager] from this plugin or create a child plugin with a [VisionManager] */ -public val Context.visionManager: VisionManager get() = request(VisionManager ) +public val Context.visionManager: VisionManager get() = request(VisionManager) public fun Vision.encodeToString(): String = manager?.encodeToString(this) ?: error("Orphan vision could not be encoded") diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt index e0dc975a..45af671c 100644 --- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/JsVisionClient.kt @@ -12,6 +12,7 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock +import kotlinx.serialization.encodeToString import org.w3c.dom.* import org.w3c.dom.url.URL import space.kscience.dataforge.context.* @@ -81,9 +82,7 @@ public class JsVisionClient : AbstractPlugin(), VisionClient { } } - private val eventCollector by lazy { - MutableSharedFlow>(meta["feedback.eventCache"].int ?: 100) - } + private val eventCollector = MutableSharedFlow>(meta["feedback.eventCache"].int ?: 100) /** * Send a custom feedback event @@ -122,10 +121,7 @@ public class JsVisionClient : AbstractPlugin(), VisionClient { onmessage = { messageEvent -> val stringData: String? = messageEvent.data as? String if (stringData != null) { - val event: VisionEvent = visionManager.jsonFormat.decodeFromString( - VisionEvent.serializer(), - stringData - ) + val event: VisionEvent = visionManager.jsonFormat.decodeFromString(stringData) // If change contains root vision replacement, do it if (event is VisionChange) { @@ -154,7 +150,7 @@ public class JsVisionClient : AbstractPlugin(), VisionClient { feedbackJob = visionManager.context.launch { //launch a separate coroutine to send events to the backend eventCollector.filter { it.first == visionName }.onEach { - send(visionManager.jsonFormat.encodeToString(VisionEvent.serializer(), it.second)) + send(visionManager.jsonFormat.encodeToString(it.second)) }.launchIn(this) //aggregate atomic changes diff --git a/visionforge-server/src/main/kotlin/space/kscience/visionforge/server/VisionServer.kt b/visionforge-server/src/main/kotlin/space/kscience/visionforge/server/VisionServer.kt index 3c5e397a..d89bf1c0 100644 --- a/visionforge-server/src/main/kotlin/space/kscience/visionforge/server/VisionServer.kt +++ b/visionforge-server/src/main/kotlin/space/kscience/visionforge/server/VisionServer.kt @@ -20,6 +20,7 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.html.* +import kotlinx.serialization.encodeToString import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.ContextAware import space.kscience.dataforge.meta.* @@ -97,9 +98,7 @@ public fun Application.serveVisionData( for (frame in incoming) { val data = frame.data.decodeToString() application.log.debug("Received event for $name: \n$data") - val event = configuration.visionManager.jsonFormat.decodeFromString( - VisionEvent.serializer(), data - ) + val event: VisionEvent = configuration.visionManager.jsonFormat.decodeFromString(data) vision.receiveEvent(event) } @@ -108,10 +107,7 @@ public fun Application.serveVisionData( try { withContext(configuration.context.coroutineContext) { vision.flowChanges(configuration.updateInterval.milliseconds).onEach { event -> - val json = configuration.visionManager.jsonFormat.encodeToString( - VisionEvent.serializer(), - event - ) + val json = configuration.visionManager.jsonFormat.encodeToString(event) application.log.debug("Sending update for $name: \n$json") outgoing.send(Frame.Text(json)) }.collect() @@ -155,7 +151,7 @@ public fun Application.visionPage( headers: Collection, connector: EngineConnectorConfig? = null, visionFragment: HtmlVisionFragment, -){ +) { require(WebSockets) val collector: MutableMap = mutableMapOf() From 0c9d849e976913d3da2411e485161c0e427838ab Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 12 Dec 2023 09:17:14 +0300 Subject: [PATCH 5/6] 0.3.0-RC --- README.md | 126 +-- build.gradle.kts | 3 +- cern-root-loader/api/cern-root-loader.api | 249 +++-- demo/gdml/api/gdml.api | 18 - demo/muon-monitor/api/muon-monitor.api | 22 +- demo/playground/api/playground.api | 42 +- demo/sat-demo/api/sat-demo.api | 5 + demo/sat-demo/build.gradle.kts | 7 +- .../kotlin/ru/mipt/npm/sat/geometry.kt | 0 .../kotlin/ru/mipt/npm/sat/satServer.kt | 0 .../kotlin/ru/mipt/npm/sat/static.kt | 0 .../resources/css/styles.css | 0 demo/solid-showcase/api/solid-showcase.api | 36 +- visionforge-core/README.md | 15 +- visionforge-core/api/visionforge-core.api | 863 +++++++++++------ visionforge-gdml/README.md | 15 +- visionforge-gdml/api/visionforge-gdml.api | 5 +- visionforge-jupyter/README.md | 19 +- .../api/visionforge-jupyter.api | 54 ++ .../api/visionforge-jupyter-common.api | 8 + visionforge-markdown/README.md | 15 +- .../api/visionforge-markdown.api | 23 +- visionforge-plotly/README.md | 15 +- visionforge-plotly/api/visionforge-plotly.api | 18 +- visionforge-server/README.md | 15 +- visionforge-server/api/visionforge-server.api | 58 +- visionforge-server/build.gradle.kts | 5 +- .../visionforge/server/VisionServer.kt | 0 .../server/applicationExtensions.kt | 0 visionforge-solid/README.md | 15 +- visionforge-solid/api/visionforge-solid.api | 914 +++++++++++------- visionforge-tables/README.md | 15 +- visionforge-threejs/README.md | 15 +- .../visionforge-threejs-server/README.md | 15 +- .../api/visionforge-threejs-server.api | 6 +- 35 files changed, 1584 insertions(+), 1032 deletions(-) rename demo/sat-demo/src/{main => jvmMain}/kotlin/ru/mipt/npm/sat/geometry.kt (100%) rename demo/sat-demo/src/{main => jvmMain}/kotlin/ru/mipt/npm/sat/satServer.kt (100%) rename demo/sat-demo/src/{main => jvmMain}/kotlin/ru/mipt/npm/sat/static.kt (100%) rename demo/sat-demo/src/{main => jvmMain}/resources/css/styles.css (100%) create mode 100644 visionforge-jupyter/api/visionforge-jupyter.api create mode 100644 visionforge-jupyter/visionforge-jupyter-common/api/visionforge-jupyter-common.api rename visionforge-server/src/{main => jvmMain}/kotlin/space/kscience/visionforge/server/VisionServer.kt (100%) rename visionforge-server/src/{main => jvmMain}/kotlin/space/kscience/visionforge/server/applicationExtensions.kt (100%) diff --git a/README.md b/README.md index eeeaab9e..f8fb04fe 100644 --- a/README.md +++ b/README.md @@ -61,157 +61,104 @@ To learn more about DataForge, please consult the following URLs: ## Modules contained in this repository -
-* ### [cern-root-loader](cern-root-loader) -> +### [cern-root-loader](cern-root-loader) > > **Maturity**: EXPERIMENTAL -
-* ### [demo](demo) -> +### [demo](demo) > > **Maturity**: EXPERIMENTAL -
-* ### [jupyter](jupyter) -> +### [ui](ui) > > **Maturity**: EXPERIMENTAL -
-* ### [ui](ui) -> -> -> **Maturity**: EXPERIMENTAL -
- -* ### [visionforge-core](visionforge-core) -> +### [visionforge-core](visionforge-core) > > **Maturity**: DEVELOPMENT -
-* ### [visionforge-fx](visionforge-fx) -> -> -> **Maturity**: PROTOTYPE -
- -* ### [visionforge-gdml](visionforge-gdml) -> +### [visionforge-gdml](visionforge-gdml) > > **Maturity**: EXPERIMENTAL -
-* ### [visionforge-markdown](visionforge-markdown) -> +### [visionforge-jupyter](visionforge-jupyter) +> Common visionforge jupyter module > > **Maturity**: EXPERIMENTAL -
-* ### [visionforge-plotly](visionforge-plotly) -> +### [visionforge-markdown](visionforge-markdown) > > **Maturity**: EXPERIMENTAL -
-* ### [visionforge-server](visionforge-server) -> +### [visionforge-plotly](visionforge-plotly) > > **Maturity**: EXPERIMENTAL -
-* ### [visionforge-solid](visionforge-solid) -> +### [visionforge-server](visionforge-server) +> +> **Maturity**: EXPERIMENTAL + +### [visionforge-solid](visionforge-solid) > > **Maturity**: DEVELOPMENT -
-* ### [visionforge-tables](visionforge-tables) -> +### [visionforge-tables](visionforge-tables) > > **Maturity**: PROTOTYPE -
-* ### [visionforge-threejs](visionforge-threejs) -> +### [visionforge-threejs](visionforge-threejs) > > **Maturity**: EXPERIMENTAL -
-* ### [gdml](demo/gdml) -> +### [demo/gdml](demo/gdml) > > **Maturity**: EXPERIMENTAL -
-* ### [js-playground](demo/js-playground) -> +### [demo/js-playground](demo/js-playground) > > **Maturity**: EXPERIMENTAL -
-* ### [muon-monitor](demo/muon-monitor) -> +### [demo/muon-monitor](demo/muon-monitor) > > **Maturity**: EXPERIMENTAL -
-* ### [playground](demo/playground) -> +### [demo/playground](demo/playground) > > **Maturity**: EXPERIMENTAL -
-* ### [plotly-fx](demo/plotly-fx) -> +### [demo/sat-demo](demo/sat-demo) > > **Maturity**: EXPERIMENTAL -
-* ### [sat-demo](demo/sat-demo) -> +### [demo/solid-showcase](demo/solid-showcase) > > **Maturity**: EXPERIMENTAL -
-* ### [solid-showcase](demo/solid-showcase) -> +### [ui/bootstrap](ui/bootstrap) > > **Maturity**: EXPERIMENTAL -
-* ### [visionforge-jupyter-gdml](jupyter/visionforge-jupyter-gdml) -> +### [ui/compose](ui/compose) > > **Maturity**: EXPERIMENTAL -
-* ### [bootstrap](ui/bootstrap) -> +### [ui/react](ui/react) > > **Maturity**: EXPERIMENTAL -
-* ### [react](ui/react) -> +### [ui/ring](ui/ring) > > **Maturity**: EXPERIMENTAL -
-* ### [ring](ui/ring) -> +### [visionforge-jupyter/visionforge-jupyter-common](visionforge-jupyter/visionforge-jupyter-common) +> Jupyter api artifact including all common modules > > **Maturity**: EXPERIMENTAL -
-* ### [visionforge-threejs-server](visionforge-threejs/visionforge-threejs-server) -> +### [visionforge-threejs/visionforge-threejs-server](visionforge-threejs/visionforge-threejs-server) > > **Maturity**: EXPERIMENTAL -
**Class diagram:** @@ -283,6 +230,21 @@ Visualization example for geometry defined as GDML file. ![](docs/images/gdml-demo.png) +## Stability and documentation + +VisionForge is a modular library. Different modules provide different features with different API stability guarantees. All core modules are released with the same version, but with different API change policy. The features are described in module definitions below. The module stability could have the following levels: + +* **PROTOTYPE**. On this level there are no compatibility guarantees. All methods and classes form those modules could break any moment. You can still use it, but be sure to fix the specific version. +* **EXPERIMENTAL**. The general API is decided, but some changes could be made. Volatile API is marked + with `@DFExperimental` or other stability warning annotations. +* **DEVELOPMENT**. API breaking generally follows semantic versioning ideology. There could be changes in minor + versions, but not in patch versions. API is protected with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool. +* **STABLE**. The API stabilized. Breaking changes are allowed only in major releases. + +Additionally, one should note that the VisionForge Json format impacts the reproducibility of stored vision fragments. There should not be any breaks of the format between major releases. All problems should be reported. + +The documentation for the project is a work in progress. Please report any issues with missing, vague or wrong information. The contributions into documentation are quite welcome. + ## Thanks and references The original three.js bindings were made by [Lars Ivar Hatledal](https://github.com/markaren), but the project is discontinued right now. diff --git a/build.gradle.kts b/build.gradle.kts index 1a9de8d2..57e42d2b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,11 +8,10 @@ plugins { } val dataforgeVersion by extra("0.7.1") -val fxVersion by extra("11") allprojects { group = "space.kscience" - version = "0.3.0-dev-18" + version = "0.3.0-RC" } subprojects { diff --git a/cern-root-loader/api/cern-root-loader.api b/cern-root-loader/api/cern-root-loader.api index 2788976b..7150af55 100644 --- a/cern-root-loader/api/cern-root-loader.api +++ b/cern-root-loader/api/cern-root-loader.api @@ -1,3 +1,77 @@ +public final class ru/mipt/npm/root/BMN { + public static final field INSTANCE Lru/mipt/npm/root/BMN; + public final fun getJson ()Lkotlinx/serialization/json/Json; + public final fun readEventJson (Ljava/lang/String;)Lru/mipt/npm/root/BmnEventContainer; +} + +public final class ru/mipt/npm/root/BMNKt { + public static final fun toVector (Lru/mipt/npm/root/FairTrackParam;)Lspace/kscience/visionforge/solid/Float32Vector3D; +} + +public final class ru/mipt/npm/root/BmnEventContainer { + public fun (Ljava/util/List;Ljava/util/List;)V + public final fun getBmnGlobalTracks ()Ljava/util/List; + public final fun getCbmTracks ()Ljava/util/List; +} + +public final class ru/mipt/npm/root/BmnGlobalTrack { + public static final field Companion Lru/mipt/npm/root/BmnGlobalTrack$Companion; + public fun (Lru/mipt/npm/root/FairTrackParam;Lru/mipt/npm/root/FairTrackParam;)V + public final fun component1 ()Lru/mipt/npm/root/FairTrackParam; + public final fun component2 ()Lru/mipt/npm/root/FairTrackParam; + public final fun copy (Lru/mipt/npm/root/FairTrackParam;Lru/mipt/npm/root/FairTrackParam;)Lru/mipt/npm/root/BmnGlobalTrack; + public static synthetic fun copy$default (Lru/mipt/npm/root/BmnGlobalTrack;Lru/mipt/npm/root/FairTrackParam;Lru/mipt/npm/root/FairTrackParam;ILjava/lang/Object;)Lru/mipt/npm/root/BmnGlobalTrack; + public fun equals (Ljava/lang/Object;)Z + public final fun getFParamFirst ()Lru/mipt/npm/root/FairTrackParam; + public final fun getFParamLast ()Lru/mipt/npm/root/FairTrackParam; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class ru/mipt/npm/root/BmnGlobalTrack$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lru/mipt/npm/root/BmnGlobalTrack$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/BmnGlobalTrack; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lru/mipt/npm/root/BmnGlobalTrack;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class ru/mipt/npm/root/BmnGlobalTrack$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public final class ru/mipt/npm/root/CbmStsTrack { + public static final field Companion Lru/mipt/npm/root/CbmStsTrack$Companion; + public fun (Lru/mipt/npm/root/FairTrackParam;Lru/mipt/npm/root/FairTrackParam;)V + public final fun component1 ()Lru/mipt/npm/root/FairTrackParam; + public final fun component2 ()Lru/mipt/npm/root/FairTrackParam; + public final fun copy (Lru/mipt/npm/root/FairTrackParam;Lru/mipt/npm/root/FairTrackParam;)Lru/mipt/npm/root/CbmStsTrack; + public static synthetic fun copy$default (Lru/mipt/npm/root/CbmStsTrack;Lru/mipt/npm/root/FairTrackParam;Lru/mipt/npm/root/FairTrackParam;ILjava/lang/Object;)Lru/mipt/npm/root/CbmStsTrack; + public fun equals (Ljava/lang/Object;)Z + public final fun getFParamFirst ()Lru/mipt/npm/root/FairTrackParam; + public final fun getFParamLast ()Lru/mipt/npm/root/FairTrackParam; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class ru/mipt/npm/root/CbmStsTrack$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lru/mipt/npm/root/CbmStsTrack$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/CbmStsTrack; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lru/mipt/npm/root/CbmStsTrack;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class ru/mipt/npm/root/CbmStsTrack$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + public final class ru/mipt/npm/root/DGeoBoolNode : ru/mipt/npm/root/DObject { public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V public final fun getFLeft ()Lru/mipt/npm/root/DGeoShape; @@ -6,6 +80,28 @@ public final class ru/mipt/npm/root/DGeoBoolNode : ru/mipt/npm/root/DObject { public final fun getFRightMat ()Lru/mipt/npm/root/DGeoMatrix; } +public class ru/mipt/npm/root/DGeoCombiTrans : ru/mipt/npm/root/DGeoMatrix { + public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V + public final fun getFRotation ()Lru/mipt/npm/root/DGeoRotation; + public final fun getFTranslation ()[D +} + +public final class ru/mipt/npm/root/DGeoGenTrans : ru/mipt/npm/root/DGeoCombiTrans { + public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V + public final fun getFScale ()[D +} + +public final class ru/mipt/npm/root/DGeoHMatrix : ru/mipt/npm/root/DGeoMatrix { + public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V + public final fun getFRotation ()Lru/mipt/npm/root/DGeoRotation; + public final fun getFScale ()[D + public final fun getFTranslation ()[D +} + +public final class ru/mipt/npm/root/DGeoIdentity : ru/mipt/npm/root/DGeoMatrix { + public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V +} + public final class ru/mipt/npm/root/DGeoManager : ru/mipt/npm/root/DNamed { public static final field Companion Lru/mipt/npm/root/DGeoManager$Companion; public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V @@ -23,8 +119,8 @@ public final class ru/mipt/npm/root/DGeoMaterial : ru/mipt/npm/root/DNamed { public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V } -public class ru/mipt/npm/root/DGeoMatrix : ru/mipt/npm/root/DNamed { - public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V +public abstract class ru/mipt/npm/root/DGeoMatrix : ru/mipt/npm/root/DNamed { + public synthetic fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;Lkotlin/jvm/internal/DefaultConstructorMarker;)V } public final class ru/mipt/npm/root/DGeoMedium : ru/mipt/npm/root/DNamed { @@ -38,7 +134,12 @@ public final class ru/mipt/npm/root/DGeoNode : ru/mipt/npm/root/DNamed { public final fun getFVolume ()Lru/mipt/npm/root/DGeoVolume; } -public class ru/mipt/npm/root/DGeoScale : ru/mipt/npm/root/DGeoMatrix { +public final class ru/mipt/npm/root/DGeoRotation : ru/mipt/npm/root/DGeoMatrix { + public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V + public final fun getFRotationMatrix ()[D +} + +public final class ru/mipt/npm/root/DGeoScale : ru/mipt/npm/root/DGeoMatrix { public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V public final fun getFScale ()[D public final fun getX ()D @@ -53,6 +154,11 @@ public final class ru/mipt/npm/root/DGeoShape : ru/mipt/npm/root/DNamed { public final fun getFDZ ()D } +public final class ru/mipt/npm/root/DGeoTranslation : ru/mipt/npm/root/DGeoMatrix { + public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V + public final fun getFTranslation ()[D +} + public final class ru/mipt/npm/root/DGeoVolume : ru/mipt/npm/root/DNamed, space/kscience/dataforge/misc/Named { public fun (Lspace/kscience/dataforge/meta/Meta;Lru/mipt/npm/root/DObjectCache;)V public final fun getFFillColor ()Ljava/lang/Integer; @@ -94,7 +200,45 @@ public final class ru/mipt/npm/root/DObjectKt { } public final class ru/mipt/npm/root/DRootToSolidKt { - public static final fun toSolid (Lru/mipt/npm/root/DGeoManager;)Lspace/kscience/visionforge/solid/SolidGroup; + public static final fun rootGeo (Lspace/kscience/visionforge/MutableVisionContainer;Lru/mipt/npm/root/DGeoManager;Ljava/lang/String;IZ)Lspace/kscience/visionforge/solid/SolidGroup; + public static synthetic fun rootGeo$default (Lspace/kscience/visionforge/MutableVisionContainer;Lru/mipt/npm/root/DGeoManager;Ljava/lang/String;IZILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidGroup; +} + +public final class ru/mipt/npm/root/FairTrackParam { + public static final field Companion Lru/mipt/npm/root/FairTrackParam$Companion; + public fun (DDDDDD)V + public final fun component1 ()D + public final fun component2 ()D + public final fun component3 ()D + public final fun component4 ()D + public final fun component5 ()D + public final fun component6 ()D + public final fun copy (DDDDDD)Lru/mipt/npm/root/FairTrackParam; + public static synthetic fun copy$default (Lru/mipt/npm/root/FairTrackParam;DDDDDDILjava/lang/Object;)Lru/mipt/npm/root/FairTrackParam; + public fun equals (Ljava/lang/Object;)Z + public final fun getFQp ()D + public final fun getFTx ()D + public final fun getFTy ()D + public final fun getFX ()D + public final fun getFY ()D + public final fun getFZ ()D + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class ru/mipt/npm/root/FairTrackParam$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lru/mipt/npm/root/FairTrackParam$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/FairTrackParam; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lru/mipt/npm/root/FairTrackParam;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class ru/mipt/npm/root/FairTrackParam$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class ru/mipt/npm/root/RootColors { @@ -108,7 +252,7 @@ public final class ru/mipt/npm/root/serialization/JsonToRootKt { } public final class ru/mipt/npm/root/serialization/RootToSolidKt { - public static final fun toSolid (Lru/mipt/npm/root/serialization/TGeoManager;)Lspace/kscience/visionforge/solid/SolidGroup; + public static final fun rootGeo (Lspace/kscience/visionforge/MutableVisionContainer;Lru/mipt/npm/root/serialization/TGeoManager;)Lspace/kscience/visionforge/solid/SolidGroup; } public class ru/mipt/npm/root/serialization/TGeoBBox : ru/mipt/npm/root/serialization/TGeoShape { @@ -119,12 +263,11 @@ public class ru/mipt/npm/root/serialization/TGeoBBox : ru/mipt/npm/root/serializ public final fun getFDY ()D public final fun getFDZ ()D public final fun getFOrigin ()[D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoBBox;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoBBox;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoBBox$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoBBox$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoBBox; @@ -145,7 +288,7 @@ public abstract class ru/mipt/npm/root/serialization/TGeoBoolNode : ru/mipt/npm/ public final fun getFLeftMat ()Lru/mipt/npm/root/serialization/TGeoMatrix; public abstract fun getFRight ()Lru/mipt/npm/root/serialization/TGeoShape; public final fun getFRightMat ()Lru/mipt/npm/root/serialization/TGeoMatrix; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoBoolNode;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoBoolNode;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoBoolNode$Companion { @@ -154,17 +297,14 @@ public final class ru/mipt/npm/root/serialization/TGeoBoolNode$Companion { public final class ru/mipt/npm/root/serialization/TGeoCombiTrans : ru/mipt/npm/root/serialization/TGeoMatrix { public static final field Companion Lru/mipt/npm/root/serialization/TGeoCombiTrans$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;[DLru/mipt/npm/root/serialization/TGeoRotation;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun ([DLru/mipt/npm/root/serialization/TGeoRotation;)V public synthetic fun ([DLru/mipt/npm/root/serialization/TGeoRotation;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFRotation ()Lru/mipt/npm/root/serialization/TGeoRotation; public final fun getFTranslation ()[D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoCombiTrans;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoCombiTrans$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoCombiTrans$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoCombiTrans; @@ -180,15 +320,12 @@ public final class ru/mipt/npm/root/serialization/TGeoCombiTrans$Companion { public final class ru/mipt/npm/root/serialization/TGeoCompositeShape : ru/mipt/npm/root/serialization/TGeoBBox { public static final field Companion Lru/mipt/npm/root/serialization/TGeoCompositeShape$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlin/UInt;IDDD[DLru/mipt/npm/root/serialization/TGeoBoolNode;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Lru/mipt/npm/root/serialization/TGeoBoolNode;)V public final fun getFNode ()Lru/mipt/npm/root/serialization/TGeoBoolNode; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoCompositeShape;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoCompositeShape$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoCompositeShape$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoCompositeShape; @@ -204,17 +341,14 @@ public final class ru/mipt/npm/root/serialization/TGeoCompositeShape$Companion { public final class ru/mipt/npm/root/serialization/TGeoHMatrix : ru/mipt/npm/root/serialization/TGeoMatrix { public static final field Companion Lru/mipt/npm/root/serialization/TGeoHMatrix$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;[D[D[DLkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun ([D[D[D)V public final fun getFRotationMatrix ()[D public final fun getFScale ()[D public final fun getFTranslation ()[D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoHMatrix;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoHMatrix$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoHMatrix$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoHMatrix; @@ -231,13 +365,10 @@ public final class ru/mipt/npm/root/serialization/TGeoHMatrix$Companion { public final class ru/mipt/npm/root/serialization/TGeoIdentity : ru/mipt/npm/root/serialization/TGeoMatrix { public static final field Companion Lru/mipt/npm/root/serialization/TGeoIdentity$Companion; public fun ()V - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoIdentity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoIdentity$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoIdentity$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoIdentity; @@ -253,16 +384,13 @@ public final class ru/mipt/npm/root/serialization/TGeoIdentity$Companion { public final class ru/mipt/npm/root/serialization/TGeoIntersection : ru/mipt/npm/root/serialization/TGeoBoolNode { public static final field Companion Lru/mipt/npm/root/serialization/TGeoIntersection$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Lru/mipt/npm/root/serialization/TGeoMatrix;Lru/mipt/npm/root/serialization/TGeoMatrix;Lru/mipt/npm/root/serialization/TGeoShape;Lru/mipt/npm/root/serialization/TGeoShape;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Lru/mipt/npm/root/serialization/TGeoShape;Lru/mipt/npm/root/serialization/TGeoShape;)V public fun getFLeft ()Lru/mipt/npm/root/serialization/TGeoShape; public fun getFRight ()Lru/mipt/npm/root/serialization/TGeoShape; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoIntersection;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoIntersection$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoIntersection$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoIntersection; @@ -279,17 +407,14 @@ public final class ru/mipt/npm/root/serialization/TGeoIntersection$Companion { public final class ru/mipt/npm/root/serialization/TGeoManager : ru/mipt/npm/root/serialization/TNamed { public static final field Companion Lru/mipt/npm/root/serialization/TGeoManager$Companion; public fun ()V - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lru/mipt/npm/root/serialization/TObjArray;Lru/mipt/npm/root/serialization/TObjArray;Lru/mipt/npm/root/serialization/TObjArray;Lru/mipt/npm/root/serialization/TObjArray;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFMatrices ()Lru/mipt/npm/root/serialization/TObjArray; public final fun getFNodes ()Lru/mipt/npm/root/serialization/TObjArray; public final fun getFShapes ()Lru/mipt/npm/root/serialization/TObjArray; public final fun getFVolumes ()Lru/mipt/npm/root/serialization/TObjArray; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoManager;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoManager$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoManager$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoManager; @@ -307,12 +432,11 @@ public class ru/mipt/npm/root/serialization/TGeoMaterial : ru/mipt/npm/root/seri public static final field Companion Lru/mipt/npm/root/serialization/TGeoMaterial$Companion; public fun ()V public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoMaterial;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoMaterial;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoMaterial$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoMaterial$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoMaterial; @@ -329,7 +453,7 @@ public final class ru/mipt/npm/root/serialization/TGeoMaterial$Companion { public abstract class ru/mipt/npm/root/serialization/TGeoMatrix : ru/mipt/npm/root/serialization/TNamed { public static final field Companion Lru/mipt/npm/root/serialization/TGeoMatrix$Companion; public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoMatrix;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoMatrix;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoMatrix$Companion { @@ -338,17 +462,14 @@ public final class ru/mipt/npm/root/serialization/TGeoMatrix$Companion { public final class ru/mipt/npm/root/serialization/TGeoMedium : ru/mipt/npm/root/serialization/TNamed { public static final field Companion Lru/mipt/npm/root/serialization/TGeoMedium$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;ILru/mipt/npm/root/serialization/TGeoMaterial;[DLkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (ILru/mipt/npm/root/serialization/TGeoMaterial;[D)V public final fun getFId ()I public final fun getFMaterial ()Lru/mipt/npm/root/serialization/TGeoMaterial; public final fun getFParams ()[D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoMedium;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoMedium$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoMedium$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoMedium; @@ -365,13 +486,10 @@ public final class ru/mipt/npm/root/serialization/TGeoMedium$Companion { public final class ru/mipt/npm/root/serialization/TGeoMixture : ru/mipt/npm/root/serialization/TGeoMaterial { public static final field Companion Lru/mipt/npm/root/serialization/TGeoMixture$Companion; public fun ()V - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoMixture;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoMixture$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoMixture$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoMixture; @@ -394,12 +512,11 @@ public class ru/mipt/npm/root/serialization/TGeoNode : ru/mipt/npm/root/serializ public final fun getFNumber ()I public final fun getFOverlaps ()[I public final fun getFVolume ()Lru/mipt/npm/root/serialization/TGeoVolume; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoNode;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoNode;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoNode$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoNode$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoNode; @@ -416,14 +533,11 @@ public final class ru/mipt/npm/root/serialization/TGeoNode$Companion { public final class ru/mipt/npm/root/serialization/TGeoNodeMatrix : ru/mipt/npm/root/serialization/TGeoNode { public static final field Companion Lru/mipt/npm/root/serialization/TGeoNodeMatrix$Companion; public fun ()V - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlin/UInt;Lru/mipt/npm/root/serialization/TGeoVolume;II[ILru/mipt/npm/root/serialization/TGeoMatrix;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFMatrix ()Lru/mipt/npm/root/serialization/TGeoMatrix; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoNodeMatrix;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoNodeMatrix$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoNodeMatrix$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoNodeMatrix; @@ -440,14 +554,11 @@ public final class ru/mipt/npm/root/serialization/TGeoNodeMatrix$Companion { public final class ru/mipt/npm/root/serialization/TGeoNodeOffset : ru/mipt/npm/root/serialization/TGeoNode { public static final field Companion Lru/mipt/npm/root/serialization/TGeoNodeOffset$Companion; public fun ()V - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlin/UInt;Lru/mipt/npm/root/serialization/TGeoVolume;II[IDLkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFOffset ()D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoNodeOffset;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoNodeOffset$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoNodeOffset$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoNodeOffset; @@ -471,12 +582,11 @@ public class ru/mipt/npm/root/serialization/TGeoPcon : ru/mipt/npm/root/serializ public final fun getFRmax ()[D public final fun getFRmin ()[D public final fun getFZ ()[D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoPcon;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoPcon;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoPcon$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoPcon$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoPcon; @@ -495,12 +605,11 @@ public class ru/mipt/npm/root/serialization/TGeoPgon : ru/mipt/npm/root/serializ public fun ()V public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlin/UInt;IDDD[DIDD[D[D[DILkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFNedges ()I - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoPgon;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoPgon;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoPgon$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoPgon$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoPgon; @@ -516,15 +625,12 @@ public final class ru/mipt/npm/root/serialization/TGeoPgon$Companion { public final class ru/mipt/npm/root/serialization/TGeoRotation : ru/mipt/npm/root/serialization/TGeoMatrix { public static final field Companion Lru/mipt/npm/root/serialization/TGeoRotation$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;[DLkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun ([D)V public final fun getFRotationMatrix ()[D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoRotation;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoRotation$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoRotation$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoRotation; @@ -543,7 +649,7 @@ public abstract class ru/mipt/npm/root/serialization/TGeoShape : ru/mipt/npm/roo public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlin/UInt;ILkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFShapeBits-pVg5ArA ()I public final fun getFShapeId ()I - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoShape;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoShape;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoShape$Companion { @@ -552,17 +658,14 @@ public final class ru/mipt/npm/root/serialization/TGeoShape$Companion { public final class ru/mipt/npm/root/serialization/TGeoShapeAssembly : ru/mipt/npm/root/serialization/TGeoBBox { public static final field Companion Lru/mipt/npm/root/serialization/TGeoShapeAssembly$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlin/UInt;IDDD[DLru/mipt/npm/root/serialization/TGeoVolumeAssembly;ZLkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Lru/mipt/npm/root/serialization/TGeoVolumeAssembly;Z)V public synthetic fun (Lru/mipt/npm/root/serialization/TGeoVolumeAssembly;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFBBoxOK ()Z public final fun getFVolume ()Lru/mipt/npm/root/serialization/TGeoVolumeAssembly; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoShapeAssembly;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoShapeAssembly$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoShapeAssembly$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoShapeAssembly; @@ -583,16 +686,13 @@ public final class ru/mipt/npm/root/serialization/TGeoShapeRef : ru/mipt/npm/roo public final class ru/mipt/npm/root/serialization/TGeoSubtraction : ru/mipt/npm/root/serialization/TGeoBoolNode { public static final field Companion Lru/mipt/npm/root/serialization/TGeoSubtraction$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Lru/mipt/npm/root/serialization/TGeoMatrix;Lru/mipt/npm/root/serialization/TGeoMatrix;Lru/mipt/npm/root/serialization/TGeoShape;Lru/mipt/npm/root/serialization/TGeoShape;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Lru/mipt/npm/root/serialization/TGeoShape;Lru/mipt/npm/root/serialization/TGeoShape;)V public fun getFLeft ()Lru/mipt/npm/root/serialization/TGeoShape; public fun getFRight ()Lru/mipt/npm/root/serialization/TGeoShape; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoSubtraction;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoSubtraction$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoSubtraction$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoSubtraction; @@ -608,15 +708,12 @@ public final class ru/mipt/npm/root/serialization/TGeoSubtraction$Companion { public final class ru/mipt/npm/root/serialization/TGeoTranslation : ru/mipt/npm/root/serialization/TGeoMatrix { public static final field Companion Lru/mipt/npm/root/serialization/TGeoTranslation$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;[DLkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun ([D)V public final fun getFTranslation ()[D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoTranslation;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoTranslation$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoTranslation$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoTranslation; @@ -637,12 +734,11 @@ public class ru/mipt/npm/root/serialization/TGeoTube : ru/mipt/npm/root/serializ public final fun getFDz ()D public final fun getFRmax ()D public final fun getFRmin ()D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoTube;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoTube;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoTube$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoTube$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoTube; @@ -659,7 +755,6 @@ public final class ru/mipt/npm/root/serialization/TGeoTube$Companion { public final class ru/mipt/npm/root/serialization/TGeoTubeSeg : ru/mipt/npm/root/serialization/TGeoTube { public static final field Companion Lru/mipt/npm/root/serialization/TGeoTubeSeg$Companion; public fun (DDDDDDDDD)V - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlin/UInt;IDDD[DDDDDDDDDDDDDLkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFC1 ()D public final fun getFC2 ()D public final fun getFCdfi ()D @@ -669,12 +764,10 @@ public final class ru/mipt/npm/root/serialization/TGeoTubeSeg : ru/mipt/npm/root public final fun getFS1 ()D public final fun getFS2 ()D public final fun getFSm ()D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoTubeSeg;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoTubeSeg$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoTubeSeg$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoTubeSeg; @@ -690,16 +783,13 @@ public final class ru/mipt/npm/root/serialization/TGeoTubeSeg$Companion { public final class ru/mipt/npm/root/serialization/TGeoUnion : ru/mipt/npm/root/serialization/TGeoBoolNode { public static final field Companion Lru/mipt/npm/root/serialization/TGeoUnion$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Lru/mipt/npm/root/serialization/TGeoMatrix;Lru/mipt/npm/root/serialization/TGeoMatrix;Lru/mipt/npm/root/serialization/TGeoShape;Lru/mipt/npm/root/serialization/TGeoShape;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Lru/mipt/npm/root/serialization/TGeoShape;Lru/mipt/npm/root/serialization/TGeoShape;)V public fun getFLeft ()Lru/mipt/npm/root/serialization/TGeoShape; public fun getFRight ()Lru/mipt/npm/root/serialization/TGeoShape; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoUnion;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoUnion$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoUnion$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoUnion; @@ -729,12 +819,11 @@ public class ru/mipt/npm/root/serialization/TGeoVolume : ru/mipt/npm/root/serial public final fun getFNumber ()I public final fun getFRefCount ()I public final fun getFShape ()Lru/mipt/npm/root/serialization/TGeoShape; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoVolume;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoVolume;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoVolume$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoVolume; @@ -752,12 +841,11 @@ public class ru/mipt/npm/root/serialization/TGeoVolumeAssembly : ru/mipt/npm/roo public static final field Companion Lru/mipt/npm/root/serialization/TGeoVolumeAssembly$Companion; public fun ()V public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlin/UInt;ILjava/lang/Integer;Lkotlin/UInt;Ljava/lang/Integer;Ljava/lang/Integer;Lru/mipt/npm/root/serialization/TObjArray;Lru/mipt/npm/root/serialization/TGeoShape;Lru/mipt/npm/root/serialization/TGeoMedium;IIILkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoVolumeAssembly;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TGeoVolumeAssembly;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoVolumeAssembly$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoVolumeAssembly$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoVolumeAssembly; @@ -784,7 +872,6 @@ public final class ru/mipt/npm/root/serialization/TGeoVolumeRef : ru/mipt/npm/ro public final class ru/mipt/npm/root/serialization/TGeoXtru : ru/mipt/npm/root/serialization/TGeoBBox { public static final field Companion Lru/mipt/npm/root/serialization/TGeoXtru$Companion; public fun (IID[D[D[D[D[D[D)V - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlin/UInt;IDDD[DIID[D[D[D[D[D[DLkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFNvert ()I public final fun getFNz ()I public final fun getFScale ()[D @@ -794,12 +881,10 @@ public final class ru/mipt/npm/root/serialization/TGeoXtru : ru/mipt/npm/root/se public final fun getFY0 ()[D public final fun getFZ ()[D public final fun getFZcurrent ()D - public static final fun write$Self (Lru/mipt/npm/root/serialization/TGeoXtru;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TGeoXtru$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TGeoXtru$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TGeoXtru; @@ -815,15 +900,12 @@ public final class ru/mipt/npm/root/serialization/TGeoXtru$Companion { public final class ru/mipt/npm/root/serialization/THashList : ru/mipt/npm/root/serialization/TObject { public static final field Companion Lru/mipt/npm/root/serialization/THashList$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Ljava/util/List;)V public final fun getArr ()Ljava/util/List; - public static final fun write$Self (Lru/mipt/npm/root/serialization/THashList;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/THashList$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/THashList$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/THashList; @@ -839,15 +921,12 @@ public final class ru/mipt/npm/root/serialization/THashList$Companion { public final class ru/mipt/npm/root/serialization/TList : ru/mipt/npm/root/serialization/TObject { public static final field Companion Lru/mipt/npm/root/serialization/TList$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Ljava/util/List;)V public final fun getArr ()Ljava/util/List; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TList;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TList$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TList$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TList; @@ -867,12 +946,11 @@ public class ru/mipt/npm/root/serialization/TNamed : ru/mipt/npm/root/serializat public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFName ()Ljava/lang/String; public final fun getFTitle ()Ljava/lang/String; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TNamed;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TNamed;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TNamed$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/root/serialization/TNamed$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/root/serialization/TNamed; @@ -888,14 +966,11 @@ public final class ru/mipt/npm/root/serialization/TNamed$Companion { public final class ru/mipt/npm/root/serialization/TObjArray : ru/mipt/npm/root/serialization/TObject { public static final field Companion Lru/mipt/npm/root/serialization/TObjArray$Companion; - public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Ljava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Ljava/util/List;)V public final fun getArr ()Ljava/util/List; - public static final fun write$Self (Lru/mipt/npm/root/serialization/TObjArray;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;Lkotlinx/serialization/KSerializer;)V } public final class ru/mipt/npm/root/serialization/TObjArray$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public synthetic fun (Lkotlinx/serialization/KSerializer;)V public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; @@ -917,7 +992,7 @@ public abstract class ru/mipt/npm/root/serialization/TObject { public synthetic fun (ILkotlin/UInt;Lkotlin/UInt;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getFBits-pVg5ArA ()I public final fun getFUniqueID-pVg5ArA ()I - public static final fun write$Self (Lru/mipt/npm/root/serialization/TObject;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lru/mipt/npm/root/serialization/TObject;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/root/serialization/TObject$Companion { diff --git a/demo/gdml/api/gdml.api b/demo/gdml/api/gdml.api index 480385c3..1dba1ad6 100644 --- a/demo/gdml/api/gdml.api +++ b/demo/gdml/api/gdml.api @@ -1,21 +1,3 @@ -public final class space/kscience/visionforge/gdml/demo/GDMLDemoApp : tornadofx/App { - public fun ()V -} - -public final class space/kscience/visionforge/gdml/demo/GDMLView : tornadofx/View { - public static final field Companion Lspace/kscience/visionforge/gdml/demo/GDMLView$Companion; - public fun ()V - public fun getRoot ()Ljavafx/scene/Parent; -} - -public final class space/kscience/visionforge/gdml/demo/GDMLView$Companion { -} - -public final class space/kscience/visionforge/gdml/demo/GdmlFxDemoAppKt { - public static final fun main ()V - public static synthetic fun main ([Ljava/lang/String;)V -} - public final class space/kscience/visionforge/gdml/demo/ReadFileKt { public static final fun readFile (Lspace/kscience/visionforge/VisionManager;Ljava/io/File;)Lspace/kscience/visionforge/Vision; public static final fun readFile (Lspace/kscience/visionforge/VisionManager;Ljava/lang/String;)Lspace/kscience/visionforge/Vision; diff --git a/demo/muon-monitor/api/muon-monitor.api b/demo/muon-monitor/api/muon-monitor.api index da3a84ed..c0b6c4d8 100644 --- a/demo/muon-monitor/api/muon-monitor.api +++ b/demo/muon-monitor/api/muon-monitor.api @@ -1,6 +1,5 @@ public final class ru/mipt/npm/muon/monitor/Event { public static final field Companion Lru/mipt/npm/muon/monitor/Event$Companion; - public synthetic fun (IILjava/util/List;Ljava/util/Collection;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (ILjava/util/List;Ljava/util/Collection;)V public final fun component1 ()I public final fun component2 ()Ljava/util/List; @@ -13,12 +12,10 @@ public final class ru/mipt/npm/muon/monitor/Event { public final fun getTrack ()Ljava/util/List; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lru/mipt/npm/muon/monitor/Event;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class ru/mipt/npm/muon/monitor/Event$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lru/mipt/npm/muon/monitor/Event$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lru/mipt/npm/muon/monitor/Event; @@ -40,7 +37,6 @@ public final class ru/mipt/npm/muon/monitor/Model { public final fun getRoot ()Lspace/kscience/visionforge/solid/SolidGroup; public final fun getTracks ()Lspace/kscience/visionforge/solid/SolidGroup; public final fun reset ()V - public final fun setTracks (Lspace/kscience/visionforge/solid/SolidGroup;)V } public final class ru/mipt/npm/muon/monitor/Monitor { @@ -61,9 +57,9 @@ public final class ru/mipt/npm/muon/monitor/ReadResourceKt { } public final class ru/mipt/npm/muon/monitor/SC1 { - public fun (Ljava/lang/String;Lspace/kscience/visionforge/solid/Point3D;FFF)V - public synthetic fun (Ljava/lang/String;Lspace/kscience/visionforge/solid/Point3D;FFFILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun getCenter ()Lspace/kscience/visionforge/solid/Point3D; + public fun (Ljava/lang/String;Lspace/kscience/visionforge/solid/Float32Vector3D;FFF)V + public synthetic fun (Ljava/lang/String;Lspace/kscience/visionforge/solid/Float32Vector3D;FFFILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun getCenter ()Lspace/kscience/visionforge/solid/Float32Vector3D; public final fun getName ()Ljava/lang/String; public final fun getXSize ()F public final fun getYSize ()F @@ -71,8 +67,8 @@ public final class ru/mipt/npm/muon/monitor/SC1 { } public final class ru/mipt/npm/muon/monitor/SC16 { - public fun (Ljava/lang/String;Lspace/kscience/visionforge/solid/Point3D;)V - public final fun getCenter ()Lspace/kscience/visionforge/solid/Point3D; + public fun (Ljava/lang/String;Lspace/kscience/visionforge/solid/Float32Vector3D;)V + public final fun getCenter ()Lspace/kscience/visionforge/solid/Float32Vector3D; public final fun getName ()Ljava/lang/String; public final fun getPixels ()Ljava/util/Collection; } @@ -80,8 +76,8 @@ public final class ru/mipt/npm/muon/monitor/SC16 { public final class ru/mipt/npm/muon/monitor/server/MMServerKt { public static final fun main ()V public static synthetic fun main ([Ljava/lang/String;)V - public static final fun module (Lio/ktor/application/Application;Lspace/kscience/dataforge/context/Context;)V - public static synthetic fun module$default (Lio/ktor/application/Application;Lspace/kscience/dataforge/context/Context;ILjava/lang/Object;)V + public static final fun module (Lio/ktor/server/application/Application;Lspace/kscience/dataforge/context/Context;)V + public static synthetic fun module$default (Lio/ktor/server/application/Application;Lspace/kscience/dataforge/context/Context;ILjava/lang/Object;)V } public final class ru/mipt/npm/muon/monitor/sim/Cos2TrackGenerator : ru/mipt/npm/muon/monitor/sim/TrackGenerator { @@ -112,8 +108,8 @@ public final class ru/mipt/npm/muon/monitor/sim/LineKt { public static final fun getY (Lorg/apache/commons/math3/geometry/euclidean/threed/Line;)D public static final fun makeTrack (DDDD)Lorg/apache/commons/math3/geometry/euclidean/threed/Line; public static final fun makeTrack (Lorg/apache/commons/math3/geometry/euclidean/threed/Vector3D;Lorg/apache/commons/math3/geometry/euclidean/threed/Vector3D;)Lorg/apache/commons/math3/geometry/euclidean/threed/Line; - public static final fun toPoint (Lorg/apache/commons/math3/geometry/euclidean/threed/Vector3D;)Lspace/kscience/visionforge/solid/Point3D; - public static final fun toPoints (Lorg/apache/commons/math3/geometry/euclidean/threed/Line;)Ljava/util/List; + public static final fun toKMathVector (Lorg/apache/commons/math3/geometry/euclidean/threed/Vector3D;)Lspace/kscience/visionforge/solid/Float32Vector3D; + public static final fun toKMathVectors (Lorg/apache/commons/math3/geometry/euclidean/threed/Line;)Ljava/util/List; } public final class ru/mipt/npm/muon/monitor/sim/MonitorKt { diff --git a/demo/playground/api/playground.api b/demo/playground/api/playground.api index 7a050caa..ca5e1cc5 100644 --- a/demo/playground/api/playground.api +++ b/demo/playground/api/playground.api @@ -3,6 +3,31 @@ public final class space/kscience/visionforge/examples/AllThingsDemoKt { public static synthetic fun main ([Ljava/lang/String;)V } +public final class space/kscience/visionforge/examples/AntennaKt { + public static final fun main ()V + public static synthetic fun main ([Ljava/lang/String;)V +} + +public final class space/kscience/visionforge/examples/AxesKt { + public static final fun main ()V + public static synthetic fun main ([Ljava/lang/String;)V +} + +public final class space/kscience/visionforge/examples/BmnDemoKt { + public static final fun main ()V + public static synthetic fun main ([Ljava/lang/String;)V +} + +public final class space/kscience/visionforge/examples/ControlVisionKt { + public static final fun main ()V + public static synthetic fun main ([Ljava/lang/String;)V +} + +public final class space/kscience/visionforge/examples/ExtrudedKt { + public static final fun main ()V + public static synthetic fun main ([Ljava/lang/String;)V +} + public final class space/kscience/visionforge/examples/FormServerKt { public static final fun main ()V public static synthetic fun main ([Ljava/lang/String;)V @@ -38,17 +63,24 @@ public final class space/kscience/visionforge/examples/RandomSpheresKt { public static synthetic fun main ([Ljava/lang/String;)V } -public final class space/kscience/visionforge/examples/RootParserKt { +public final class space/kscience/visionforge/examples/ServerExtensionsKt { + public static final fun makeVisionFile (Ljava/nio/file/Path;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;ZLspace/kscience/visionforge/html/HtmlVisionFragment;)V + public static synthetic fun makeVisionFile$default (Ljava/nio/file/Path;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;ZLspace/kscience/visionforge/html/HtmlVisionFragment;ILjava/lang/Object;)V + public static final fun serve (Ljava/lang/String;ZLspace/kscience/visionforge/html/HtmlVisionFragment;)V + public static synthetic fun serve$default (Ljava/lang/String;ZLspace/kscience/visionforge/html/HtmlVisionFragment;ILjava/lang/Object;)V +} + +public final class space/kscience/visionforge/examples/ShapesKt { public static final fun main ()V public static synthetic fun main ([Ljava/lang/String;)V } -public final class space/kscience/visionforge/examples/ServerExtensionsKt { - public static final fun makeVisionFile (Ljava/nio/file/Path;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;ZLkotlin/jvm/functions/Function1;)V - public static synthetic fun makeVisionFile$default (Ljava/nio/file/Path;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V +public final class space/kscience/visionforge/examples/SimpleCubeKt { + public static final fun main ()V + public static synthetic fun main ([Ljava/lang/String;)V } -public final class space/kscience/visionforge/examples/SimpleCubeKt { +public final class space/kscience/visionforge/examples/SurfaceKt { public static final fun main ()V public static synthetic fun main ([Ljava/lang/String;)V } diff --git a/demo/sat-demo/api/sat-demo.api b/demo/sat-demo/api/sat-demo.api index 00e5cedd..2fdc412b 100644 --- a/demo/sat-demo/api/sat-demo.api +++ b/demo/sat-demo/api/sat-demo.api @@ -3,3 +3,8 @@ public final class ru/mipt/npm/sat/SatServerKt { public static synthetic fun main ([Ljava/lang/String;)V } +public final class ru/mipt/npm/sat/StaticKt { + public static final fun main ()V + public static synthetic fun main ([Ljava/lang/String;)V +} + diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts index 5e881b63..6cf37859 100644 --- a/demo/sat-demo/build.gradle.kts +++ b/demo/sat-demo/build.gradle.kts @@ -1,5 +1,6 @@ plugins { - id("space.kscience.gradle.jvm") + id("space.kscience.gradle.mpp") + alias(spclibs.plugins.ktor) application } @@ -8,8 +9,8 @@ kscience { // useSerialization { // json() // } - useKtor() - dependencies{ + jvm() + jvmMain{ implementation("io.ktor:ktor-server-cio") implementation(projects.visionforgeThreejs.visionforgeThreejsServer) implementation(spclibs.logback.classic) diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/geometry.kt similarity index 100% rename from demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt rename to demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/geometry.kt diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt similarity index 100% rename from demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt rename to demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/static.kt b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/static.kt similarity index 100% rename from demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/static.kt rename to demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/static.kt diff --git a/demo/sat-demo/src/main/resources/css/styles.css b/demo/sat-demo/src/jvmMain/resources/css/styles.css similarity index 100% rename from demo/sat-demo/src/main/resources/css/styles.css rename to demo/sat-demo/src/jvmMain/resources/css/styles.css diff --git a/demo/solid-showcase/api/solid-showcase.api b/demo/solid-showcase/api/solid-showcase.api index 4cc47c7d..8b5b3a52 100644 --- a/demo/solid-showcase/api/solid-showcase.api +++ b/demo/solid-showcase/api/solid-showcase.api @@ -1,20 +1,3 @@ -public final class space/kscience/visionforge/demo/MetaEditorDemo : tornadofx/View { - public fun ()V - public final fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; - public final fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta; - public synthetic fun getRoot ()Ljavafx/scene/Parent; - public fun getRoot ()Ljavafx/scene/control/SplitPane; -} - -public final class space/kscience/visionforge/demo/MetaEditorDemoApp : tornadofx/App { - public fun ()V -} - -public final class space/kscience/visionforge/demo/MetaEditorDemoKt { - public static final fun main ()V - public static synthetic fun main ([Ljava/lang/String;)V -} - public final class space/kscience/visionforge/solid/demo/DemoKt { public static final fun demo (Lspace/kscience/visionforge/solid/demo/VisionLayout;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public static synthetic fun demo$default (Lspace/kscience/visionforge/solid/demo/VisionLayout;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V @@ -23,25 +6,8 @@ public final class space/kscience/visionforge/solid/demo/DemoKt { public static final fun showcaseCSG (Lspace/kscience/visionforge/solid/demo/VisionLayout;)V } -public final class space/kscience/visionforge/solid/demo/FXDemoApp : tornadofx/App { - public fun ()V - public final fun getView ()Lspace/kscience/visionforge/solid/demo/FXDemoGrid; - public fun start (Ljavafx/stage/Stage;)V -} - -public final class space/kscience/visionforge/solid/demo/FXDemoAppKt { - public static final fun main ()V - public static synthetic fun main ([Ljava/lang/String;)V -} - -public final class space/kscience/visionforge/solid/demo/FXDemoGrid : tornadofx/View, space/kscience/visionforge/solid/demo/VisionLayout { - public fun ()V - public fun getRoot ()Ljavafx/scene/Parent; - public synthetic fun render (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;)V - public fun render (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/dataforge/meta/Meta;)V -} - public abstract interface class space/kscience/visionforge/solid/demo/VisionLayout { + public abstract fun getSolids ()Lspace/kscience/visionforge/solid/Solids; public abstract fun render (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;)V public static synthetic fun render$default (Lspace/kscience/visionforge/solid/demo/VisionLayout;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;ILjava/lang/Object;)V } diff --git a/visionforge-core/README.md b/visionforge-core/README.md index 2f9e6889..5c5b493b 100644 --- a/visionforge-core/README.md +++ b/visionforge-core/README.md @@ -6,19 +6,8 @@ ## Artifact: -The Maven coordinates of this project are `space.kscience:visionforge-core:0.2.0`. +The Maven coordinates of this project are `space.kscience:visionforge-core:0.3.0-rc`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation 'space.kscience:visionforge-core:0.2.0' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { @@ -27,6 +16,6 @@ repositories { } dependencies { - implementation("space.kscience:visionforge-core:0.2.0") + implementation("space.kscience:visionforge-core:0.3.0-rc") } ``` diff --git a/visionforge-core/api/visionforge-core.api b/visionforge-core/api/visionforge-core.api index f9099a99..0cd2b904 100644 --- a/visionforge-core/api/visionforge-core.api +++ b/visionforge-core/api/visionforge-core.api @@ -1,3 +1,62 @@ +public abstract class space/kscience/visionforge/AbstractVision : space/kscience/visionforge/Vision { + public static final field Companion Lspace/kscience/visionforge/AbstractVision$Companion; + public fun ()V + public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V + public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + public fun getParent ()Lspace/kscience/visionforge/Vision; + public final fun getProperties ()Lspace/kscience/visionforge/MutableVisionProperties; + protected final fun getPropertiesInternal ()Lspace/kscience/dataforge/meta/MutableMeta; + public fun setParent (Lspace/kscience/visionforge/Vision;)V + protected final fun setPropertiesInternal (Lspace/kscience/dataforge/meta/MutableMeta;)V + public static final synthetic fun write$Self (Lspace/kscience/visionforge/AbstractVision;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V +} + +public final class space/kscience/visionforge/AbstractVision$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public abstract class space/kscience/visionforge/AbstractVisionGroup : space/kscience/visionforge/AbstractVision, space/kscience/visionforge/MutableVisionGroup { + public static final field Companion Lspace/kscience/visionforge/AbstractVisionGroup$Companion; + public fun ()V + public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/util/Map;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V + public abstract fun createGroup ()Lspace/kscience/visionforge/AbstractVisionGroup; + public fun getChildren ()Lspace/kscience/visionforge/MutableVisionChildren; + public synthetic fun getChildren ()Lspace/kscience/visionforge/VisionChildren; + protected final fun getChildrenInternal ()Ljava/util/Map; + protected final fun setChildrenInternal (Ljava/util/Map;)V + public static final synthetic fun write$Self (Lspace/kscience/visionforge/AbstractVisionGroup;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V +} + +public final class space/kscience/visionforge/AbstractVisionGroup$Companion { + public final fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + public final fun serializer ()Lkotlinx/serialization/KSerializer; + public final fun updateProperties (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;)V + public static synthetic fun updateProperties$default (Lspace/kscience/visionforge/AbstractVisionGroup$Companion;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)V +} + +public abstract class space/kscience/visionforge/AbstractVisionProperties : space/kscience/visionforge/MutableVisionProperties { + public fun (Lspace/kscience/visionforge/Vision;)V + public synthetic fun getChanges ()Lkotlinx/coroutines/flow/Flow; + public fun getChanges ()Lkotlinx/coroutines/flow/SharedFlow; + protected final fun getChangesInternal ()Lkotlinx/coroutines/flow/MutableSharedFlow; + public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + protected final fun getOrCreateProperties ()Lspace/kscience/dataforge/meta/MutableMeta; + public fun getOwn ()Lspace/kscience/dataforge/meta/Meta; + protected abstract fun getProperties ()Lspace/kscience/dataforge/meta/MutableMeta; + public fun getValue (Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Value; + public final fun getVision ()Lspace/kscience/visionforge/Vision; + public fun invalidate (Lspace/kscience/dataforge/names/Name;)V + public fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;Z)V + protected abstract fun setProperties (Lspace/kscience/dataforge/meta/MutableMeta;)V + public fun setValue (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Value;Z)V +} + +public abstract interface class space/kscience/visionforge/ClickControl : space/kscience/visionforge/ControlVision { + public fun click (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun click$default (Lspace/kscience/visionforge/ClickControl;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; + public static synthetic fun click$suspendImpl (Lspace/kscience/visionforge/ClickControl;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + public final class space/kscience/visionforge/Colors { public static final field BLUE_KEY Ljava/lang/String; public static final field GREEN_KEY Ljava/lang/String; @@ -156,68 +215,134 @@ public final class space/kscience/visionforge/Colors { public final fun rgbToString-8NGXxBw (BBB)Ljava/lang/String; } -public final class space/kscience/visionforge/ComputedVisionPropertiesKt { - public static final fun computeProperties (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/meta/Meta; - public static synthetic fun computeProperties$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Meta; - public static final fun computeProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/values/Value; - public static synthetic fun computeProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/values/Value; - public static final fun computePropertyNode (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/meta/Meta; - public static synthetic fun computePropertyNode$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Meta; - public static final fun computePropertyValues (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/values/MutableValueProvider; - public static synthetic fun computePropertyValues$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/values/MutableValueProvider; +public abstract interface class space/kscience/visionforge/ControlVision : space/kscience/visionforge/Vision { + public abstract fun dispatchControlEvent (Lspace/kscience/visionforge/VisionControlEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public abstract fun getControlEventFlow ()Lkotlinx/coroutines/flow/SharedFlow; + public fun receiveEvent (Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun receiveEvent$suspendImpl (Lspace/kscience/visionforge/ControlVision;Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } -public final class space/kscience/visionforge/HtmlExportKt { - public static final fun makeFile (Lspace/kscience/visionforge/html/Page;Ljava/nio/file/Path;Lkotlin/jvm/functions/Function1;)Ljava/nio/file/Path; - public static synthetic fun makeFile$default (Lspace/kscience/visionforge/html/Page;Ljava/nio/file/Path;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/nio/file/Path; - public static final fun show (Lspace/kscience/visionforge/html/Page;Ljava/nio/file/Path;)V - public static synthetic fun show$default (Lspace/kscience/visionforge/html/Page;Ljava/nio/file/Path;ILjava/lang/Object;)V +public final class space/kscience/visionforge/ControlVisionKt { + public static final fun VisionClickEvent (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionClickEvent; + public static synthetic fun VisionClickEvent$default (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionClickEvent; + public static final fun VisionValueChangeEvent (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionValueChangeEvent; + public static synthetic fun VisionValueChangeEvent$default (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionValueChangeEvent; + public static final fun onClick (Lspace/kscience/visionforge/ClickControl;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job; } -public abstract interface class space/kscience/visionforge/MutableVisionGroup : space/kscience/visionforge/VisionContainerBuilder, space/kscience/visionforge/VisionGroup { - public abstract fun onStructureChanged (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)V - public abstract fun removeStructureListener (Ljava/lang/Object;)V +public final class space/kscience/visionforge/FlowPropertyKt { + public static final fun flowProperty (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lkotlinx/coroutines/flow/Flow; + public static final fun flowProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lkotlinx/coroutines/flow/Flow; + public static synthetic fun flowProperty$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow; + public static synthetic fun flowProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow; + public static final fun flowPropertyValue (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lkotlinx/coroutines/flow/Flow; + public static final fun flowPropertyValue (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lkotlinx/coroutines/flow/Flow; + public static synthetic fun flowPropertyValue$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow; + public static synthetic fun flowPropertyValue$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow; } -public class space/kscience/visionforge/SimpleVisionPropertyContainer : space/kscience/dataforge/meta/Configurable, space/kscience/visionforge/VisionPropertyContainer { - public fun (Lspace/kscience/dataforge/meta/ObservableMutableMeta;)V - public synthetic fun getMeta ()Lspace/kscience/dataforge/meta/MutableMeta; - public fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta; - public fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value; +public abstract interface class space/kscience/visionforge/MutableVisionChildren : space/kscience/visionforge/MutableVisionContainer, space/kscience/visionforge/VisionChildren { + public abstract fun clear ()V + public abstract fun getParent ()Lspace/kscience/visionforge/MutableVisionGroup; + public abstract fun set (Lspace/kscience/dataforge/names/NameToken;Lspace/kscience/visionforge/Vision;)V + public fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V +} + +public abstract interface class space/kscience/visionforge/MutableVisionContainer { + public abstract fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V +} + +public abstract interface class space/kscience/visionforge/MutableVisionGroup : space/kscience/visionforge/VisionGroup { + public abstract fun createGroup ()Lspace/kscience/visionforge/MutableVisionGroup; + public abstract fun getChildren ()Lspace/kscience/visionforge/MutableVisionChildren; + public fun update (Lspace/kscience/visionforge/VisionChange;)V +} + +public abstract interface class space/kscience/visionforge/MutableVisionProperties : space/kscience/dataforge/meta/MutableMetaProvider, space/kscience/visionforge/VisionProperties { + public synthetic fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/Meta; + public fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/MutableMeta; + public synthetic fun get (Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Meta; + public fun get (Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/MutableMeta; + public fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V + public abstract fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;Z)V + public fun setValue (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Value;)V + public abstract fun setValue (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Value;Z)V +} + +public final class space/kscience/visionforge/NullVision : space/kscience/visionforge/Vision { + public static final field INSTANCE Lspace/kscience/visionforge/NullVision; + public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + public fun getParent ()Lspace/kscience/visionforge/Vision; + public fun getProperties ()Lspace/kscience/visionforge/MutableVisionProperties; + public final fun serializer ()Lkotlinx/serialization/KSerializer; + public fun setParent (Lspace/kscience/visionforge/Vision;)V +} + +public final class space/kscience/visionforge/RootVision : space/kscience/visionforge/AbstractVisionGroup { + public fun (Lspace/kscience/visionforge/VisionManager;)V + public synthetic fun createGroup ()Lspace/kscience/visionforge/AbstractVisionGroup; + public synthetic fun createGroup ()Lspace/kscience/visionforge/MutableVisionGroup; + public fun createGroup ()Lspace/kscience/visionforge/SimpleVisionGroup; + public fun getManager ()Lspace/kscience/visionforge/VisionManager; +} + +public final class space/kscience/visionforge/SimpleVisionGroup : space/kscience/visionforge/AbstractVisionGroup, space/kscience/visionforge/MutableVisionContainer { + public static final field Companion Lspace/kscience/visionforge/SimpleVisionGroup$Companion; + public fun ()V + public synthetic fun createGroup ()Lspace/kscience/visionforge/AbstractVisionGroup; + public synthetic fun createGroup ()Lspace/kscience/visionforge/MutableVisionGroup; + public fun createGroup ()Lspace/kscience/visionforge/SimpleVisionGroup; + public fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V +} + +public final class space/kscience/visionforge/SimpleVisionGroup$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/SimpleVisionGroup$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/SimpleVisionGroup; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/SimpleVisionGroup;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/SimpleVisionGroup$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class space/kscience/visionforge/StyleReference { - public fun (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;)V + public fun (Lspace/kscience/visionforge/Vision;Ljava/lang/String;)V public final fun getName ()Ljava/lang/String; - public final fun getOwner ()Lspace/kscience/visionforge/VisionGroup; + public final fun getOwner ()Lspace/kscience/visionforge/Vision; } public final class space/kscience/visionforge/StyleReferenceKt { - public static final fun style (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadOnlyProperty; - public static final fun style (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/dataforge/meta/Specification;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun style$default (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun style$default (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/dataforge/meta/Specification;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun useStyle (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/StyleReference;)V + public static final fun style (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadOnlyProperty; + public static final fun style (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Specification;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun style$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun style$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Specification;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun useStyle (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/StyleReference;Z)V + public static synthetic fun useStyle$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/StyleReference;ZILjava/lang/Object;)V } public final class space/kscience/visionforge/StyleSheet { public static final field Companion Lspace/kscience/visionforge/StyleSheet$Companion; - public static final synthetic fun box-impl (Lspace/kscience/visionforge/VisionGroup;)Lspace/kscience/visionforge/StyleSheet; - public static fun constructor-impl (Lspace/kscience/visionforge/VisionGroup;)Lspace/kscience/visionforge/VisionGroup; - public static final fun define-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V + public static final synthetic fun box-impl (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/StyleSheet; + public static fun constructor-impl (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/Vision; + public static final fun define-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V public fun equals (Ljava/lang/Object;)Z - public static fun equals-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/Object;)Z - public static final fun equals-impl0 (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/visionforge/VisionGroup;)Z - public static final fun get-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;)Lspace/kscience/dataforge/meta/Meta; - public static final fun getItems-impl (Lspace/kscience/visionforge/VisionGroup;)Ljava/util/Map; + public static fun equals-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/Object;)Z + public static final fun equals-impl0 (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/Vision;)Z + public static final fun get-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/String;)Lspace/kscience/dataforge/meta/Meta; + public static final fun getItems-impl (Lspace/kscience/visionforge/Vision;)Ljava/util/Map; public fun hashCode ()I - public static fun hashCode-impl (Lspace/kscience/visionforge/VisionGroup;)I - public static final fun invoke-impl (Lspace/kscience/visionforge/VisionGroup;Lkotlin/jvm/functions/Function1;)V - public static final fun set-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static final fun set-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V + public static fun hashCode-impl (Lspace/kscience/visionforge/Vision;)I + public static final fun invoke-impl (Lspace/kscience/visionforge/Vision;Lkotlin/jvm/functions/Function1;)V + public static final fun set-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V public fun toString ()Ljava/lang/String; - public static fun toString-impl (Lspace/kscience/visionforge/VisionGroup;)Ljava/lang/String; - public final synthetic fun unbox-impl ()Lspace/kscience/visionforge/VisionGroup; + public static fun toString-impl (Lspace/kscience/visionforge/Vision;)Ljava/lang/String; + public final synthetic fun unbox-impl ()Lspace/kscience/visionforge/Vision; + public static final fun update-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V } public final class space/kscience/visionforge/StyleSheet$Companion { @@ -227,99 +352,69 @@ public final class space/kscience/visionforge/StyleSheet$Companion { public final class space/kscience/visionforge/StyleSheetKt { public static final fun getStyle (Lspace/kscience/visionforge/Vision;Ljava/lang/String;)Lspace/kscience/dataforge/meta/Meta; public static final fun getStyleNodes (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;)Ljava/util/List; - public static final fun getStyleProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/values/Value; - public static final fun getStyleSheet (Lspace/kscience/visionforge/VisionGroup;)Lspace/kscience/visionforge/VisionGroup; + public static final fun getStyleProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/Meta; + public static final fun getStyleSheet (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/Vision; public static final fun getStyles (Lspace/kscience/visionforge/Vision;)Ljava/util/List; public static final fun setStyles (Lspace/kscience/visionforge/Vision;Ljava/util/List;)V - public static final fun useStyle (Lspace/kscience/visionforge/Vision;Ljava/lang/String;)V + public static final fun useStyle (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Z)V + public static synthetic fun useStyle$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;ZILjava/lang/Object;)V } -public abstract interface class space/kscience/visionforge/Vision : space/kscience/dataforge/meta/Configurable, space/kscience/dataforge/meta/descriptors/Described { +public final class space/kscience/visionforge/UsePropertyKt { + public static final fun onPropertyChange (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/Job; + public static synthetic fun onPropertyChange$default (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lkotlinx/coroutines/Job; + public static final fun useProperty (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job; + public static final fun useProperty (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job; + public static final fun useProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job; + public static synthetic fun useProperty$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job; + public static synthetic fun useProperty$default (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job; + public static synthetic fun useProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job; +} + +public abstract interface class space/kscience/visionforge/Vision : space/kscience/dataforge/meta/descriptors/Described { public static final field Companion Lspace/kscience/visionforge/Vision$Companion; + public static final field STYLE_TARGET Ljava/lang/String; public static final field TYPE Ljava/lang/String; public abstract fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; public fun getManager ()Lspace/kscience/visionforge/VisionManager; - public abstract fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta; - public abstract fun getParent ()Lspace/kscience/visionforge/VisionGroup; - public abstract fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value; - public static synthetic fun getProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value; - public abstract fun invalidateProperty (Lspace/kscience/dataforge/names/Name;)V - public abstract fun setParent (Lspace/kscience/visionforge/VisionGroup;)V - public abstract fun update (Lspace/kscience/visionforge/VisionChange;)V + public abstract fun getParent ()Lspace/kscience/visionforge/Vision; + public abstract fun getProperties ()Lspace/kscience/visionforge/MutableVisionProperties; + public fun receiveEvent (Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun receiveEvent$suspendImpl (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public abstract fun setParent (Lspace/kscience/visionforge/Vision;)V + public fun update (Lspace/kscience/visionforge/VisionChange;)V } public final class space/kscience/visionforge/Vision$Companion { + public static final field STYLE_TARGET Ljava/lang/String; public static final field TYPE Ljava/lang/String; public final fun getSTYLE_KEY ()Lspace/kscience/dataforge/names/Name; public final fun getVISIBLE_KEY ()Lspace/kscience/dataforge/names/Name; } -public class space/kscience/visionforge/VisionBase : space/kscience/visionforge/Vision { - public static final field Companion Lspace/kscience/visionforge/VisionBase$Companion; - public fun ()V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public fun (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/dataforge/meta/MutableMeta;)V - public synthetic fun (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/dataforge/meta/MutableMeta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; - public synthetic fun getMeta ()Lspace/kscience/dataforge/meta/MutableMeta; - public final fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta; - protected final fun getOrCreateProperties ()Lspace/kscience/dataforge/meta/MutableMeta; - public fun getParent ()Lspace/kscience/visionforge/VisionGroup; - protected final fun getProperties ()Lspace/kscience/dataforge/meta/MutableMeta; - public fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value; - public fun invalidateProperty (Lspace/kscience/dataforge/names/Name;)V - public fun setParent (Lspace/kscience/visionforge/VisionGroup;)V - protected final fun setProperties (Lspace/kscience/dataforge/meta/MutableMeta;)V - public fun update (Lspace/kscience/visionforge/VisionChange;)V - public static final fun write$Self (Lspace/kscience/visionforge/VisionBase;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V -} - -public final class space/kscience/visionforge/VisionBase$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lspace/kscience/visionforge/VisionBase$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/VisionBase; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/VisionBase;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class space/kscience/visionforge/VisionBase$Companion { - public final fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; - public final fun serializer ()Lkotlinx/serialization/KSerializer; - public final fun updateProperties (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V -} - public abstract interface annotation class space/kscience/visionforge/VisionBuilder : java/lang/annotation/Annotation { } -public final class space/kscience/visionforge/VisionChange { +public final class space/kscience/visionforge/VisionChange : space/kscience/visionforge/VisionEvent { public static final field Companion Lspace/kscience/visionforge/VisionChange$Companion; public fun ()V - public synthetic fun (IZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public fun (ZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;)V - public synthetic fun (ZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Z - public final fun component2 ()Lspace/kscience/visionforge/Vision; - public final fun component3 ()Lspace/kscience/dataforge/meta/Meta; - public final fun component4 ()Ljava/util/Map; - public final fun copy (ZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;)Lspace/kscience/visionforge/VisionChange; - public static synthetic fun copy$default (Lspace/kscience/visionforge/VisionChange;ZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionChange; + public fun (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;)V + public synthetic fun (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Lspace/kscience/visionforge/Vision; + public final fun component2 ()Lspace/kscience/dataforge/meta/Meta; + public final fun component3 ()Ljava/util/Map; + public final fun copy (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;)Lspace/kscience/visionforge/VisionChange; + public static synthetic fun copy$default (Lspace/kscience/visionforge/VisionChange;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionChange; public fun equals (Ljava/lang/Object;)Z public final fun getChildren ()Ljava/util/Map; - public final fun getDelete ()Z public final fun getProperties ()Lspace/kscience/dataforge/meta/Meta; public final fun getVision ()Lspace/kscience/visionforge/Vision; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lspace/kscience/visionforge/VisionChange;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/VisionChange$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/VisionChange$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/VisionChange; @@ -333,36 +428,98 @@ public final class space/kscience/visionforge/VisionChange$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class space/kscience/visionforge/VisionChangeBuilder : space/kscience/visionforge/VisionContainerBuilder { +public final class space/kscience/visionforge/VisionChangeBuilder : space/kscience/visionforge/MutableVisionContainer { public fun ()V - public final fun deepCopy ()Lspace/kscience/visionforge/VisionChange; + public final fun deepCopy (Lspace/kscience/visionforge/VisionManager;)Lspace/kscience/visionforge/VisionChange; + public final fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionChangeBuilder; public final fun isEmpty ()Z public final fun propertyChanged (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V - public fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V + public fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V + public final fun toJsonString (Lspace/kscience/visionforge/VisionManager;)Ljava/lang/String; } public final class space/kscience/visionforge/VisionChangeKt { - public static final fun VisionChange (Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/VisionChange; - public static final fun flowChanges-HG0u8IE (Lspace/kscience/visionforge/Vision;J)Lkotlinx/coroutines/flow/Flow; + public static final fun VisionChange (Lspace/kscience/visionforge/VisionManager;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/VisionChange; + public static final fun flowChanges-8Mi8wO0 (Lspace/kscience/visionforge/Vision;JZ)Lkotlinx/coroutines/flow/Flow; + public static synthetic fun flowChanges-8Mi8wO0$default (Lspace/kscience/visionforge/Vision;JZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow; +} + +public abstract interface class space/kscience/visionforge/VisionChildren : space/kscience/visionforge/VisionContainer { + public static final field Companion Lspace/kscience/visionforge/VisionChildren$Companion; + public static final field STATIC_TOKEN_BODY Ljava/lang/String; + public abstract fun get (Lspace/kscience/dataforge/names/NameToken;)Lspace/kscience/visionforge/Vision; + public abstract fun getChanges ()Lkotlinx/coroutines/flow/Flow; + public fun getChild (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision; + public abstract fun getKeys ()Ljava/util/Set; + public abstract fun getParent ()Lspace/kscience/visionforge/Vision; + public fun getValues ()Ljava/lang/Iterable; +} + +public final class space/kscience/visionforge/VisionChildren$Companion { + public static final field STATIC_TOKEN_BODY Ljava/lang/String; + public final fun empty (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/VisionChildren; +} + +public final class space/kscience/visionforge/VisionClickEvent : space/kscience/visionforge/VisionControlEvent { + public static final field Companion Lspace/kscience/visionforge/VisionClickEvent$Companion; + public fun (Lspace/kscience/dataforge/meta/Meta;)V + public fun getMeta ()Lspace/kscience/dataforge/meta/Meta; + public final fun getName ()Lspace/kscience/dataforge/names/Name; + public final fun getPayload ()Lspace/kscience/dataforge/meta/Meta; + public fun toString ()Ljava/lang/String; +} + +public final class space/kscience/visionforge/VisionClickEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/VisionClickEvent$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/VisionClickEvent; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/VisionClickEvent;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/VisionClickEvent$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public abstract interface class space/kscience/visionforge/VisionClient : space/kscience/dataforge/context/Plugin { + public abstract fun getVisionManager ()Lspace/kscience/visionforge/VisionManager; + public abstract fun notifyPropertyChanged (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V + public abstract fun sendEvent (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + +public final class space/kscience/visionforge/VisionClientKt { + public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Ljava/lang/Number;)V + public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Ljava/lang/String;)V + public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V + public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Z)V } public abstract interface class space/kscience/visionforge/VisionContainer { - public abstract fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision; + public abstract fun getChild (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision; } -public abstract interface class space/kscience/visionforge/VisionContainerBuilder { - public abstract fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V +public final class space/kscience/visionforge/VisionContainerKt { + public static final fun asSequence (Lspace/kscience/visionforge/VisionChildren;)Lkotlin/sequences/Sequence; + public static final fun forEach (Lspace/kscience/visionforge/VisionChildren;Lkotlin/jvm/functions/Function2;)V + public static final fun get (Lspace/kscience/visionforge/VisionChildren;Ljava/lang/String;)Lspace/kscience/visionforge/Vision; + public static final fun get (Lspace/kscience/visionforge/VisionChildren;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision; + public static final fun getChild (Lspace/kscience/visionforge/VisionContainer;Ljava/lang/String;)Lspace/kscience/visionforge/Vision; + public static final fun isEmpty (Lspace/kscience/visionforge/VisionChildren;)Z + public static final fun iterator (Lspace/kscience/visionforge/VisionChildren;)Ljava/util/Iterator; + public static final fun set (Lspace/kscience/visionforge/MutableVisionChildren;Ljava/lang/String;Lspace/kscience/visionforge/Vision;)V + public static final fun set (Lspace/kscience/visionforge/MutableVisionChildren;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V + public static final fun setChild (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lspace/kscience/visionforge/Vision;)V + public static final fun static (Lspace/kscience/visionforge/MutableVisionChildren;Lspace/kscience/visionforge/Vision;)V } -public final class space/kscience/visionforge/VisionDelegatesKt { - public static final fun numberProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZ)Lkotlin/properties/ReadWriteProperty; - public static final fun numberProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZLkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun numberProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun numberProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun propertyValue (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZ)Lkotlin/properties/ReadWriteProperty; - public static final fun propertyValue (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun propertyValue$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun propertyValue$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; +public abstract class space/kscience/visionforge/VisionControlEvent : space/kscience/dataforge/meta/MetaRepr, space/kscience/visionforge/VisionEvent { + public fun ()V + public abstract fun getMeta ()Lspace/kscience/dataforge/meta/Meta; + public fun toMeta ()Lspace/kscience/dataforge/meta/Meta; + public fun toString ()Ljava/lang/String; } public final class space/kscience/visionforge/VisionDescriptorKt { @@ -382,82 +539,35 @@ public final class space/kscience/visionforge/VisionDescriptorKt { public static final fun setWidgetType (Lspace/kscience/dataforge/meta/descriptors/MetaDescriptorBuilder;Ljava/lang/String;)V } -public abstract interface class space/kscience/visionforge/VisionGroup : space/kscience/dataforge/provider/Provider, space/kscience/visionforge/Vision, space/kscience/visionforge/VisionContainer { - public static final field Companion Lspace/kscience/visionforge/VisionGroup$Companion; - public static final field STYLE_TARGET Ljava/lang/String; - public fun content (Ljava/lang/String;)Ljava/util/Map; - public fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision; - public abstract fun getChildren ()Ljava/util/Map; - public fun getDefaultTarget ()Ljava/lang/String; +public abstract interface class space/kscience/visionforge/VisionEvent { + public static final field Companion Lspace/kscience/visionforge/VisionEvent$Companion; } -public final class space/kscience/visionforge/VisionGroup$Companion { - public static final field STYLE_TARGET Ljava/lang/String; +public final class space/kscience/visionforge/VisionEvent$Companion { + public final fun getCLICK_EVENT_KEY ()Lspace/kscience/dataforge/names/Name; } -public class space/kscience/visionforge/VisionGroupBase : space/kscience/visionforge/VisionBase, space/kscience/visionforge/MutableVisionGroup { - public static final field Companion Lspace/kscience/visionforge/VisionGroupBase$Companion; - public fun ()V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/util/Map;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public fun (Ljava/util/Map;)V - public synthetic fun (Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - protected fun addStatic (Lspace/kscience/visionforge/Vision;)V - protected final fun childrenChanged (Lspace/kscience/dataforge/names/Name;)V - protected fun createGroup ()Lspace/kscience/visionforge/VisionGroupBase; - public fun getChildren ()Ljava/util/Map; - protected final fun getChildrenInternal ()Ljava/util/Map; - public fun invalidateProperty (Lspace/kscience/dataforge/names/Name;)V - public fun onStructureChanged (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)V - public fun removeStructureListener (Ljava/lang/Object;)V - public fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V +public abstract interface class space/kscience/visionforge/VisionGroup : space/kscience/visionforge/Vision { + public abstract fun getChildren ()Lspace/kscience/visionforge/VisionChildren; public fun update (Lspace/kscience/visionforge/VisionChange;)V - public static final fun write$Self (Lspace/kscience/visionforge/VisionGroupBase;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V -} - -public final class space/kscience/visionforge/VisionGroupBase$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lspace/kscience/visionforge/VisionGroupBase$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/VisionGroupBase; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/VisionGroupBase;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class space/kscience/visionforge/VisionGroupBase$Companion { - public final fun serializer ()Lkotlinx/serialization/KSerializer; -} - -public final class space/kscience/visionforge/VisionGroupBaseKt { - public static final fun setAsRoot (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/VisionManager;)V } public final class space/kscience/visionforge/VisionGroupKt { - public static final fun get (Lspace/kscience/visionforge/VisionContainer;Ljava/lang/String;)Lspace/kscience/visionforge/Vision; - public static final fun getStructureChanges (Lspace/kscience/visionforge/MutableVisionGroup;)Lkotlinx/coroutines/flow/Flow; - public static final fun isEmpty (Lspace/kscience/visionforge/VisionGroup;)Z - public static final fun iterator (Lspace/kscience/visionforge/VisionGroup;)Ljava/util/Iterator; - public static final fun removeAll (Lspace/kscience/visionforge/MutableVisionGroup;)V - public static final fun set (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lspace/kscience/visionforge/Vision;)V - public static final fun set (Lspace/kscience/visionforge/VisionContainerBuilder;Lspace/kscience/dataforge/names/NameToken;Lspace/kscience/visionforge/Vision;)V + public static final fun getChildren (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/VisionChildren; + public static final fun group (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/SimpleVisionGroup; + public static final fun group (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/SimpleVisionGroup; + public static synthetic fun group$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/SimpleVisionGroup; + public static synthetic fun group$default (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/SimpleVisionGroup; } public final class space/kscience/visionforge/VisionKt { - public static final fun getPropertyChanges (Lspace/kscience/visionforge/Vision;)Lkotlinx/coroutines/flow/Flow; - public static final fun getProperty (Lspace/kscience/visionforge/Vision;Ljava/lang/String;ZZZ)Lspace/kscience/dataforge/values/Value; - public static synthetic fun getProperty$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value; public static final fun getVisible (Lspace/kscience/visionforge/Vision;)Ljava/lang/Boolean; - public static final fun onPropertyChange (Lspace/kscience/visionforge/Vision;Lkotlin/jvm/functions/Function2;)V - public static final fun setProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Object;)V - public static final fun setPropertyNode (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Object;)V + public static final fun onPropertyChange (Lspace/kscience/visionforge/Vision;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job; + public static synthetic fun onPropertyChange$default (Lspace/kscience/visionforge/Vision;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job; public static final fun setVisible (Lspace/kscience/visionforge/Vision;Ljava/lang/Boolean;)V - public static final fun useProperty (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)V - public static synthetic fun useProperty$default (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V } -public final class space/kscience/visionforge/VisionManager : space/kscience/dataforge/context/AbstractPlugin { +public final class space/kscience/visionforge/VisionManager : space/kscience/dataforge/context/AbstractPlugin, space/kscience/visionforge/MutableVisionContainer { public static final field Companion Lspace/kscience/visionforge/VisionManager$Companion; public static final field VISION_SERIALIZER_MODULE_TARGET Ljava/lang/String; public fun (Lspace/kscience/dataforge/meta/Meta;)V @@ -473,19 +583,43 @@ public final class space/kscience/visionforge/VisionManager : space/kscience/dat public final fun getJsonFormat ()Lkotlinx/serialization/json/Json; public final fun getSerializersModule ()Lkotlinx/serialization/modules/SerializersModule; public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; + public fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V } public final class space/kscience/visionforge/VisionManager$Companion : space/kscience/dataforge/context/PluginFactory { + public synthetic fun build (Lspace/kscience/dataforge/context/Context;Lspace/kscience/dataforge/meta/Meta;)Ljava/lang/Object; + public fun build (Lspace/kscience/dataforge/context/Context;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/visionforge/VisionManager; public final fun getDefaultJson ()Lkotlinx/serialization/json/Json; public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; - public fun getType ()Lkotlin/reflect/KClass; - public synthetic fun invoke (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;)Ljava/lang/Object; - public fun invoke (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;)Lspace/kscience/visionforge/VisionManager; } public final class space/kscience/visionforge/VisionManagerKt { public static final fun encodeToString (Lspace/kscience/visionforge/Vision;)Ljava/lang/String; public static final fun getVisionManager (Lspace/kscience/dataforge/context/Context;)Lspace/kscience/visionforge/VisionManager; + public static final fun setAsRoot (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/VisionManager;)V +} + +public final class space/kscience/visionforge/VisionMetaEvent : space/kscience/dataforge/meta/MetaRepr, space/kscience/visionforge/VisionEvent { + public static final field Companion Lspace/kscience/visionforge/VisionMetaEvent$Companion; + public fun (Lspace/kscience/dataforge/meta/Meta;)V + public final fun getMeta ()Lspace/kscience/dataforge/meta/Meta; + public fun toMeta ()Lspace/kscience/dataforge/meta/Meta; + public fun toString ()Ljava/lang/String; +} + +public final class space/kscience/visionforge/VisionMetaEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/VisionMetaEvent$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/VisionMetaEvent; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/VisionMetaEvent;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/VisionMetaEvent$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; } public abstract class space/kscience/visionforge/VisionPlugin : space/kscience/dataforge/context/AbstractPlugin { @@ -497,69 +631,123 @@ public abstract class space/kscience/visionforge/VisionPlugin : space/kscience/d protected abstract fun getVisionSerializersModule ()Lkotlinx/serialization/modules/SerializersModule; } -public abstract interface class space/kscience/visionforge/VisionPropertyContainer { - public abstract fun getMeta ()Lspace/kscience/dataforge/meta/MutableMeta; - public abstract fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value; - public static synthetic fun getProperty$default (Lspace/kscience/visionforge/VisionPropertyContainer;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value; +public abstract interface class space/kscience/visionforge/VisionProperties : space/kscience/dataforge/meta/MetaProvider { + public fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/Meta; + public abstract fun get (Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Meta; + public static synthetic fun get$default (Lspace/kscience/visionforge/VisionProperties;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Meta; + public abstract fun getChanges ()Lkotlinx/coroutines/flow/Flow; + public abstract fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + public abstract fun getOwn ()Lspace/kscience/dataforge/meta/Meta; + public fun getValue (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/Value; + public abstract fun getValue (Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Value; + public static synthetic fun getValue$default (Lspace/kscience/visionforge/VisionProperties;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Value; + public abstract fun invalidate (Lspace/kscience/dataforge/names/Name;)V } -public final class space/kscience/visionforge/html/HeadersKt { - public static final fun importScriptHeader (Lspace/kscience/visionforge/html/Page$Companion;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;Ljava/nio/file/Path;)Lkotlin/jvm/functions/Function1; - public static synthetic fun importScriptHeader$default (Lspace/kscience/visionforge/html/Page$Companion;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;Ljava/nio/file/Path;ILjava/lang/Object;)Lkotlin/jvm/functions/Function1; +public final class space/kscience/visionforge/VisionPropertiesKt { + public static final fun get (Lspace/kscience/visionforge/MutableVisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/MutableMeta; + public static final fun get (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Meta; + public static synthetic fun get$default (Lspace/kscience/visionforge/MutableVisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/MutableMeta; + public static synthetic fun get$default (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Meta; + public static final fun getValue (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Value; + public static synthetic fun getValue$default (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Value; + public static final fun invoke (Lspace/kscience/visionforge/MutableVisionProperties;Lkotlin/jvm/functions/Function1;)V + public static final fun remove (Lspace/kscience/visionforge/MutableVisionProperties;Ljava/lang/String;)V + public static final fun remove (Lspace/kscience/visionforge/MutableVisionProperties;Lspace/kscience/dataforge/names/Name;)V + public static final fun root (Lspace/kscience/visionforge/MutableVisionProperties;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/MutableMeta; + public static synthetic fun root$default (Lspace/kscience/visionforge/MutableVisionProperties;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/MutableMeta; } -public final class space/kscience/visionforge/html/HtmlFormFragment { - public final fun get (Ljava/lang/String;)Lspace/kscience/dataforge/meta/Meta; - public final fun getFormBody ()Lkotlin/jvm/functions/Function1; - public final fun getValues ()Lspace/kscience/dataforge/meta/Meta; - public final fun getVision ()Lspace/kscience/visionforge/html/VisionOfHtmlForm; -} - -public final class space/kscience/visionforge/html/HtmlFragmentKt { - public static final fun fragment (Lkotlinx/html/FlowContent;Lkotlin/jvm/functions/Function1;)V - public static final fun fragment (Lkotlinx/html/TagConsumer;Lkotlin/jvm/functions/Function1;)V - public static final fun plus (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function1; - public static final fun renderToString (Lkotlin/jvm/functions/Function1;)Ljava/lang/String; -} - -public final class space/kscience/visionforge/html/HtmlVisionRendererKt { - public static final fun HtmlVisionFragment (Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function1; - public static final fun visionFragment (Lkotlinx/html/FlowContent;Lspace/kscience/dataforge/context/Context;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ljava/util/Map; - public static final fun visionFragment (Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/context/Context;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ljava/util/Map; - public static synthetic fun visionFragment$default (Lkotlinx/html/FlowContent;Lspace/kscience/dataforge/context/Context;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/util/Map; - public static synthetic fun visionFragment$default (Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/context/Context;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/util/Map; -} - -public final class space/kscience/visionforge/html/Page { - public static final field Companion Lspace/kscience/visionforge/html/Page$Companion; - public fun (Lspace/kscience/dataforge/context/Context;Ljava/util/Map;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lspace/kscience/dataforge/context/Context;Ljava/util/Map;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Lspace/kscience/dataforge/context/Context; - public final fun component2 ()Ljava/util/Map; - public final fun component3 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lspace/kscience/dataforge/context/Context;Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/Page; - public static synthetic fun copy$default (Lspace/kscience/visionforge/html/Page;Lspace/kscience/dataforge/context/Context;Ljava/util/Map;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/Page; - public fun equals (Ljava/lang/Object;)Z - public final fun getContent ()Lkotlin/jvm/functions/Function1; - public final fun getContext ()Lspace/kscience/dataforge/context/Context; - public final fun getHeaders ()Ljava/util/Map; - public fun hashCode ()I - public final fun render (Lkotlinx/html/TagConsumer;)Ljava/lang/Object; +public final class space/kscience/visionforge/VisionValueChangeEvent : space/kscience/visionforge/VisionControlEvent { + public static final field Companion Lspace/kscience/visionforge/VisionValueChangeEvent$Companion; + public fun (Lspace/kscience/dataforge/meta/Meta;)V + public fun getMeta ()Lspace/kscience/dataforge/meta/Meta; + public final fun getName ()Lspace/kscience/dataforge/names/Name; + public final fun getValue ()Lspace/kscience/dataforge/meta/Value; public fun toString ()Ljava/lang/String; } -public final class space/kscience/visionforge/html/Page$Companion { - public final fun scriptHeader (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function1; - public static synthetic fun scriptHeader$default (Lspace/kscience/visionforge/html/Page$Companion;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/jvm/functions/Function1; - public final fun styleSheetHeader (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function1; - public static synthetic fun styleSheetHeader$default (Lspace/kscience/visionforge/html/Page$Companion;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/jvm/functions/Function1; - public final fun title (Ljava/lang/String;)Lkotlin/jvm/functions/Function1; +public final class space/kscience/visionforge/VisionValueChangeEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/VisionValueChangeEvent$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/VisionValueChangeEvent; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/VisionValueChangeEvent;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/VisionValueChangeEvent$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/html/HeadersKt { + public static final fun importScriptHeader (Lspace/kscience/visionforge/html/VisionPage$Companion;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;Ljava/nio/file/Path;Ljava/lang/ClassLoader;)Lspace/kscience/visionforge/html/HtmlFragment; + public static synthetic fun importScriptHeader$default (Lspace/kscience/visionforge/html/VisionPage$Companion;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;Ljava/nio/file/Path;Ljava/lang/ClassLoader;ILjava/lang/Object;)Lspace/kscience/visionforge/html/HtmlFragment; +} + +public final class space/kscience/visionforge/html/HtmlExportKt { + public static final fun makeFile (Lspace/kscience/visionforge/html/VisionPage;Ljava/nio/file/Path;Lkotlin/jvm/functions/Function1;)Ljava/nio/file/Path; + public static synthetic fun makeFile$default (Lspace/kscience/visionforge/html/VisionPage;Ljava/nio/file/Path;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/nio/file/Path; + public static final fun show (Lspace/kscience/visionforge/html/VisionPage;Ljava/nio/file/Path;)V + public static synthetic fun show$default (Lspace/kscience/visionforge/html/VisionPage;Ljava/nio/file/Path;ILjava/lang/Object;)V +} + +public abstract interface class space/kscience/visionforge/html/HtmlFragment { + public abstract fun append (Lkotlinx/html/TagConsumer;)V +} + +public final class space/kscience/visionforge/html/HtmlFragmentKt { + public static final fun appendFragment (Lkotlinx/html/FlowContent;Lspace/kscience/visionforge/html/HtmlFragment;)V + public static final fun appendFragment (Lkotlinx/html/TagConsumer;Lspace/kscience/visionforge/html/HtmlFragment;)V + public static final fun appendTo (Lspace/kscience/visionforge/html/HtmlFragment;Lkotlinx/html/TagConsumer;)V + public static final fun plus (Lspace/kscience/visionforge/html/HtmlFragment;Lspace/kscience/visionforge/html/HtmlFragment;)Lspace/kscience/visionforge/html/HtmlFragment; + public static final fun renderToString (Lspace/kscience/visionforge/html/HtmlFragment;)Ljava/lang/String; +} + +public abstract interface class space/kscience/visionforge/html/HtmlVisionContext : space/kscience/dataforge/context/ContextAware { + public fun generateId (Lspace/kscience/dataforge/names/Name;)Ljava/lang/String; + public abstract fun renderVision (Lkotlinx/html/DIV;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;)V +} + +public final class space/kscience/visionforge/html/HtmlVisionContextKt { + public static final fun vision (Lspace/kscience/visionforge/html/HtmlVisionContext;Lkotlinx/html/TagConsumer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; + public static final fun vision (Lspace/kscience/visionforge/html/HtmlVisionContext;Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; + public static synthetic fun vision$default (Lspace/kscience/visionforge/html/HtmlVisionContext;Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Object; +} + +public abstract interface class space/kscience/visionforge/html/HtmlVisionFragment { + public abstract fun append (Lspace/kscience/visionforge/html/VisionTagConsumer;)V +} + +public final class space/kscience/visionforge/html/HtmlVisionRendererKt { + public static final fun appendTo (Lspace/kscience/visionforge/html/HtmlVisionFragment;Lspace/kscience/visionforge/html/VisionTagConsumer;)V + public static final fun visionFragment (Lkotlinx/html/FlowContent;Lspace/kscience/visionforge/VisionManager;ZLjava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Lspace/kscience/visionforge/html/HtmlVisionFragment;)V + public static final fun visionFragment (Lkotlinx/html/TagConsumer;Lspace/kscience/visionforge/VisionManager;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lspace/kscience/visionforge/html/HtmlVisionFragment;)V + public static synthetic fun visionFragment$default (Lkotlinx/html/FlowContent;Lspace/kscience/visionforge/VisionManager;ZLjava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Lspace/kscience/visionforge/html/HtmlVisionFragment;ILjava/lang/Object;)V + public static synthetic fun visionFragment$default (Lkotlinx/html/TagConsumer;Lspace/kscience/visionforge/VisionManager;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lspace/kscience/visionforge/html/HtmlVisionFragment;ILjava/lang/Object;)V +} + +public final class space/kscience/visionforge/html/InputFeedbackMode : java/lang/Enum { + public static final field Companion Lspace/kscience/visionforge/html/InputFeedbackMode$Companion; + public static final field NONE Lspace/kscience/visionforge/html/InputFeedbackMode; + public static final field ONCHANGE Lspace/kscience/visionforge/html/InputFeedbackMode; + public static final field ONINPUT Lspace/kscience/visionforge/html/InputFeedbackMode; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public static fun valueOf (Ljava/lang/String;)Lspace/kscience/visionforge/html/InputFeedbackMode; + public static fun values ()[Lspace/kscience/visionforge/html/InputFeedbackMode; +} + +public final class space/kscience/visionforge/html/InputFeedbackMode$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class space/kscience/visionforge/html/ResourceLocation : java/lang/Enum { public static final field EMBED Lspace/kscience/visionforge/html/ResourceLocation; public static final field LOCAL Lspace/kscience/visionforge/html/ResourceLocation; public static final field SYSTEM Lspace/kscience/visionforge/html/ResourceLocation; + public static fun getEntries ()Lkotlin/enums/EnumEntries; public static fun valueOf (Ljava/lang/String;)Lspace/kscience/visionforge/html/ResourceLocation; public static fun values ()[Lspace/kscience/visionforge/html/ResourceLocation; } @@ -570,19 +758,12 @@ public abstract interface annotation class space/kscience/visionforge/html/Visio public final class space/kscience/visionforge/html/VisionOfCheckbox : space/kscience/visionforge/html/VisionOfHtmlInput { public static final field Companion Lspace/kscience/visionforge/html/VisionOfCheckbox$Companion; public fun ()V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public fun (Ljava/lang/String;Ljava/lang/String;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getChecked ()Ljava/lang/Boolean; - public final fun getLabel ()Ljava/lang/String; - public final fun getName ()Ljava/lang/String; public final fun setChecked (Ljava/lang/Boolean;)V - public static final fun write$Self (Lspace/kscience/visionforge/html/VisionOfCheckbox;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/html/VisionOfCheckbox$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/html/VisionOfCheckbox$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/html/VisionOfCheckbox; @@ -596,19 +777,57 @@ public final class space/kscience/visionforge/html/VisionOfCheckbox$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class space/kscience/visionforge/html/VisionOfHtmlForm : space/kscience/visionforge/html/VisionOfHtmlInput { +public abstract class space/kscience/visionforge/html/VisionOfHtml : space/kscience/visionforge/AbstractVision { + public static final field Companion Lspace/kscience/visionforge/html/VisionOfHtml$Companion; + public fun ()V + public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V + public final fun getClasses ()Ljava/util/List; + public final fun setClasses (Ljava/util/List;)V + public static final synthetic fun write$Self (Lspace/kscience/visionforge/html/VisionOfHtml;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V +} + +public final class space/kscience/visionforge/html/VisionOfHtml$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/html/VisionOfHtmlButton : space/kscience/visionforge/html/VisionOfHtmlControl, space/kscience/visionforge/ClickControl { + public static final field Companion Lspace/kscience/visionforge/html/VisionOfHtmlButton$Companion; + public fun ()V + public final fun getLabel ()Ljava/lang/String; + public final fun setLabel (Ljava/lang/String;)V +} + +public final class space/kscience/visionforge/html/VisionOfHtmlButton$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/html/VisionOfHtmlButton$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/html/VisionOfHtmlButton; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/html/VisionOfHtmlButton;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/html/VisionOfHtmlButton$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public abstract class space/kscience/visionforge/html/VisionOfHtmlControl : space/kscience/visionforge/html/VisionOfHtml, space/kscience/visionforge/ControlVision { + public fun ()V + public fun dispatchControlEvent (Lspace/kscience/visionforge/VisionControlEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public fun getControlEventFlow ()Lkotlinx/coroutines/flow/SharedFlow; +} + +public final class space/kscience/visionforge/html/VisionOfHtmlForm : space/kscience/visionforge/html/VisionOfHtmlControl { public static final field Companion Lspace/kscience/visionforge/html/VisionOfHtmlForm$Companion; - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Ljava/lang/String;)V public final fun getFormId ()Ljava/lang/String; public final fun getValues ()Lspace/kscience/dataforge/meta/Meta; public final fun setValues (Lspace/kscience/dataforge/meta/Meta;)V - public static final fun write$Self (Lspace/kscience/visionforge/html/VisionOfHtmlForm;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/html/VisionOfHtmlForm$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/html/VisionOfHtmlForm$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/html/VisionOfHtmlForm; @@ -623,41 +842,68 @@ public final class space/kscience/visionforge/html/VisionOfHtmlForm$Companion { } public final class space/kscience/visionforge/html/VisionOfHtmlFormKt { - public static final fun HtmlFormFragment (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/HtmlFormFragment; - public static synthetic fun HtmlFormFragment$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/HtmlFormFragment; - public static final fun formFragment (Lkotlinx/html/TagConsumer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionOfHtmlForm; - public static synthetic fun formFragment$default (Lkotlinx/html/TagConsumer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionOfHtmlForm; + public static final fun bindForm (Lkotlinx/html/TagConsumer;Lspace/kscience/visionforge/html/VisionOfHtmlForm;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; + public static final fun button (Lspace/kscience/visionforge/html/VisionOutput;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionOfHtmlButton; + public static synthetic fun button$default (Lspace/kscience/visionforge/html/VisionOutput;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionOfHtmlButton; } -public abstract class space/kscience/visionforge/html/VisionOfHtmlInput : space/kscience/visionforge/VisionBase { +public class space/kscience/visionforge/html/VisionOfHtmlInput : space/kscience/visionforge/html/VisionOfHtmlControl { public static final field Companion Lspace/kscience/visionforge/html/VisionOfHtmlInput$Companion; - public fun ()V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V + public synthetic fun (ILjava/lang/String;Lspace/kscience/visionforge/html/InputFeedbackMode;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V + public fun (Ljava/lang/String;Lspace/kscience/visionforge/html/InputFeedbackMode;)V + public synthetic fun (Ljava/lang/String;Lspace/kscience/visionforge/html/InputFeedbackMode;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getDisabled ()Z + public final fun getFeedbackMode ()Lspace/kscience/visionforge/html/InputFeedbackMode; + public final fun getFieldName ()Ljava/lang/String; + public final fun getInputType ()Ljava/lang/String; + public final fun getValue ()Lspace/kscience/dataforge/meta/Value; public final fun setDisabled (Z)V - public static final fun write$Self (Lspace/kscience/visionforge/html/VisionOfHtmlInput;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public final fun setFieldName (Ljava/lang/String;)V + public final fun setValue (Lspace/kscience/dataforge/meta/Value;)V + public static final synthetic fun write$Self (Lspace/kscience/visionforge/html/VisionOfHtmlInput;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V +} + +public final class space/kscience/visionforge/html/VisionOfHtmlInput$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/html/VisionOfHtmlInput$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/html/VisionOfHtmlInput; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/html/VisionOfHtmlInput;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } public final class space/kscience/visionforge/html/VisionOfHtmlInput$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } +public final class space/kscience/visionforge/html/VisionOfHtmlKt { + public static final fun content (Lspace/kscience/visionforge/html/VisionOfPlainHtml;Lkotlin/jvm/functions/Function1;)V + public static final fun html (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionOfPlainHtml; + public static final fun htmlCheckBox (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionOfCheckbox; + public static synthetic fun htmlCheckBox$default (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionOfCheckbox; + public static final fun htmlInput (Lspace/kscience/visionforge/html/VisionOutput;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionOfHtmlInput; + public static synthetic fun htmlInput$default (Lspace/kscience/visionforge/html/VisionOutput;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionOfHtmlInput; + public static final fun htmlNumberField (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionOfNumberField; + public static synthetic fun htmlNumberField$default (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionOfNumberField; + public static final fun htmlRangeField (Lspace/kscience/visionforge/html/VisionOutput;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionOfRangeField; + public static synthetic fun htmlRangeField$default (Lspace/kscience/visionforge/html/VisionOutput;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionOfRangeField; + public static final fun htmlTextField (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionOfTextField; + public static synthetic fun htmlTextField$default (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionOfTextField; + public static final fun onValueChange (Lspace/kscience/visionforge/html/VisionOfHtmlInput;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job; + public static synthetic fun onValueChange$default (Lspace/kscience/visionforge/html/VisionOfHtmlInput;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job; +} + public final class space/kscience/visionforge/html/VisionOfNumberField : space/kscience/visionforge/html/VisionOfHtmlInput { public static final field Companion Lspace/kscience/visionforge/html/VisionOfNumberField$Companion; public fun ()V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public fun (Ljava/lang/String;Ljava/lang/String;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun getLabel ()Ljava/lang/String; - public final fun getName ()Ljava/lang/String; - public final fun getValue ()Ljava/lang/Number; - public final fun setValue (Ljava/lang/Number;)V - public static final fun write$Self (Lspace/kscience/visionforge/html/VisionOfNumberField;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public final fun getNumberValue ()Ljava/lang/Number; + public final fun setNumberValue (Ljava/lang/Number;)V } public final class space/kscience/visionforge/html/VisionOfNumberField$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/html/VisionOfNumberField$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/html/VisionOfNumberField; @@ -671,24 +917,41 @@ public final class space/kscience/visionforge/html/VisionOfNumberField$Companion public final fun serializer ()Lkotlinx/serialization/KSerializer; } +public final class space/kscience/visionforge/html/VisionOfPlainHtml : space/kscience/visionforge/html/VisionOfHtml { + public static final field Companion Lspace/kscience/visionforge/html/VisionOfPlainHtml$Companion; + public fun ()V + public final fun getContent ()Ljava/lang/String; + public final fun setContent (Ljava/lang/String;)V +} + +public final class space/kscience/visionforge/html/VisionOfPlainHtml$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/html/VisionOfPlainHtml$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/html/VisionOfPlainHtml; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/html/VisionOfPlainHtml;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/html/VisionOfPlainHtml$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + public final class space/kscience/visionforge/html/VisionOfRangeField : space/kscience/visionforge/html/VisionOfHtmlInput { public static final field Companion Lspace/kscience/visionforge/html/VisionOfRangeField$Companion; - public fun (DDDLjava/lang/String;Ljava/lang/String;)V - public synthetic fun (DDDLjava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;DDDLjava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public final fun getLabel ()Ljava/lang/String; + public fun (DDD)V + public synthetic fun (DDDILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getMax ()D public final fun getMin ()D - public final fun getName ()Ljava/lang/String; + public final fun getNumberValue ()Ljava/lang/Number; public final fun getStep ()D - public final fun getValue ()Ljava/lang/Number; - public final fun setValue (Ljava/lang/Number;)V - public static final fun write$Self (Lspace/kscience/visionforge/html/VisionOfRangeField;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public final fun setNumberValue (Ljava/lang/Number;)V } public final class space/kscience/visionforge/html/VisionOfRangeField$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/html/VisionOfRangeField$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/html/VisionOfRangeField; @@ -705,19 +968,12 @@ public final class space/kscience/visionforge/html/VisionOfRangeField$Companion public final class space/kscience/visionforge/html/VisionOfTextField : space/kscience/visionforge/html/VisionOfHtmlInput { public static final field Companion Lspace/kscience/visionforge/html/VisionOfTextField$Companion; public fun ()V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public fun (Ljava/lang/String;Ljava/lang/String;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun getLabel ()Ljava/lang/String; - public final fun getName ()Ljava/lang/String; public final fun getText ()Ljava/lang/String; public final fun setText (Ljava/lang/String;)V - public static final fun write$Self (Lspace/kscience/visionforge/html/VisionOfTextField;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/html/VisionOfTextField$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/html/VisionOfTextField$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/html/VisionOfTextField; @@ -731,17 +987,43 @@ public final class space/kscience/visionforge/html/VisionOfTextField$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class space/kscience/visionforge/html/VisionOutput { +public final class space/kscience/visionforge/html/VisionOutput : space/kscience/dataforge/context/ContextAware { public fun (Lspace/kscience/dataforge/context/Context;Lspace/kscience/dataforge/names/Name;)V - public final fun getContext ()Lspace/kscience/dataforge/context/Context; + public fun getContext ()Lspace/kscience/dataforge/context/Context; public final fun getMeta ()Lspace/kscience/dataforge/meta/Meta; public final fun getName ()Lspace/kscience/dataforge/names/Name; + public final fun getVisionManager ()Lspace/kscience/visionforge/VisionManager; public final fun meta (Lkotlin/jvm/functions/Function1;)V public final fun requirePlugin (Lspace/kscience/dataforge/context/PluginFactory;)V public final fun setMeta (Lspace/kscience/dataforge/meta/Meta;)V } -public abstract class space/kscience/visionforge/html/VisionTagConsumer : kotlinx/html/TagConsumer { +public final class space/kscience/visionforge/html/VisionPage { + public static final field Companion Lspace/kscience/visionforge/html/VisionPage$Companion; + public fun (Lspace/kscience/visionforge/VisionManager;Ljava/util/Map;Lspace/kscience/visionforge/html/HtmlVisionFragment;)V + public synthetic fun (Lspace/kscience/visionforge/VisionManager;Ljava/util/Map;Lspace/kscience/visionforge/html/HtmlVisionFragment;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Lspace/kscience/visionforge/VisionManager; + public final fun component2 ()Ljava/util/Map; + public final fun component3 ()Lspace/kscience/visionforge/html/HtmlVisionFragment; + public final fun copy (Lspace/kscience/visionforge/VisionManager;Ljava/util/Map;Lspace/kscience/visionforge/html/HtmlVisionFragment;)Lspace/kscience/visionforge/html/VisionPage; + public static synthetic fun copy$default (Lspace/kscience/visionforge/html/VisionPage;Lspace/kscience/visionforge/VisionManager;Ljava/util/Map;Lspace/kscience/visionforge/html/HtmlVisionFragment;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionPage; + public fun equals (Ljava/lang/Object;)Z + public final fun getContent ()Lspace/kscience/visionforge/html/HtmlVisionFragment; + public final fun getPageHeaders ()Ljava/util/Map; + public final fun getVisionManager ()Lspace/kscience/visionforge/VisionManager; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class space/kscience/visionforge/html/VisionPage$Companion { + public final fun scriptHeader (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/HtmlFragment; + public static synthetic fun scriptHeader$default (Lspace/kscience/visionforge/html/VisionPage$Companion;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/HtmlFragment; + public final fun styleSheetHeader (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/HtmlFragment; + public static synthetic fun styleSheetHeader$default (Lspace/kscience/visionforge/html/VisionPage$Companion;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/HtmlFragment; + public final fun title (Ljava/lang/String;)Lspace/kscience/visionforge/html/HtmlFragment; +} + +public abstract class space/kscience/visionforge/html/VisionTagConsumer : kotlinx/html/TagConsumer, space/kscience/dataforge/context/ContextAware { public static final field AUTO_DATA_ATTRIBUTE Ljava/lang/String; public static final field Companion Lspace/kscience/visionforge/html/VisionTagConsumer$Companion; public static final field DEFAULT_ENDPOINT Ljava/lang/String; @@ -754,25 +1036,29 @@ public abstract class space/kscience/visionforge/html/VisionTagConsumer : kotlin public static final field OUTPUT_META_CLASS Ljava/lang/String; public static final field OUTPUT_NAME_ATTRIBUTE Ljava/lang/String; public static final field OUTPUT_RENDERED Ljava/lang/String; - public fun (Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/context/Context;Ljava/lang/String;)V - public synthetic fun (Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/context/Context;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lkotlinx/html/TagConsumer;Lspace/kscience/visionforge/VisionManager;Ljava/lang/String;)V + public synthetic fun (Lkotlinx/html/TagConsumer;Lspace/kscience/visionforge/VisionManager;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + protected final fun addVision (Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/VisionManager;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;)Ljava/lang/Object; + public static synthetic fun addVision$default (Lspace/kscience/visionforge/html/VisionTagConsumer;Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/VisionManager;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;ILjava/lang/Object;)Ljava/lang/Object; public fun finalize ()Ljava/lang/Object; - public final fun getContext ()Lspace/kscience/dataforge/context/Context; + public fun getContext ()Lspace/kscience/dataforge/context/Context; + public final fun getVisionManager ()Lspace/kscience/visionforge/VisionManager; public fun onTagAttributeChange (Lkotlinx/html/Tag;Ljava/lang/String;Ljava/lang/String;)V public fun onTagComment (Ljava/lang/CharSequence;)V public fun onTagContent (Ljava/lang/CharSequence;)V public fun onTagContentEntity (Lkotlinx/html/Entities;)V public fun onTagContentUnsafe (Lkotlin/jvm/functions/Function1;)V public fun onTagEnd (Lkotlinx/html/Tag;)V - public fun onTagError (Lkotlinx/html/Tag;Ljava/lang/Throwable;)V public fun onTagEvent (Lkotlinx/html/Tag;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public fun onTagStart (Lkotlinx/html/Tag;)V protected fun processResult (Ljava/lang/Object;)V protected abstract fun renderVision (Lkotlinx/html/DIV;Lspace/kscience/visionforge/VisionManager;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;)V public fun resolveId (Lspace/kscience/dataforge/names/Name;)Ljava/lang/String; public final fun vision (Lkotlinx/html/TagConsumer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; - public final fun vision (Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; + public fun vision (Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; + public fun vision (Lkotlinx/html/TagConsumer;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V public static synthetic fun vision$default (Lspace/kscience/visionforge/html/VisionTagConsumer;Lkotlinx/html/TagConsumer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Object; + public static synthetic fun vision$default (Lspace/kscience/visionforge/html/VisionTagConsumer;Lkotlinx/html/TagConsumer;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;ILjava/lang/Object;)V } public final class space/kscience/visionforge/html/VisionTagConsumer$Companion { @@ -806,7 +1092,8 @@ public abstract interface class space/kscience/visionforge/visitor/VisionVisitor public static final field Companion Lspace/kscience/visionforge/visitor/VisionVisitor$Companion; public fun skip (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)Z public abstract fun visit (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public fun visitChildren (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/VisionGroup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public fun visitChildren (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun visitChildren$suspendImpl (Lspace/kscience/visionforge/visitor/VisionVisitor;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } public final class space/kscience/visionforge/visitor/VisionVisitor$Companion { diff --git a/visionforge-gdml/README.md b/visionforge-gdml/README.md index 135a369e..a6429697 100644 --- a/visionforge-gdml/README.md +++ b/visionforge-gdml/README.md @@ -6,19 +6,8 @@ ## Artifact: -The Maven coordinates of this project are `space.kscience:visionforge-gdml:0.2.0`. +The Maven coordinates of this project are `space.kscience:visionforge-gdml:0.3.0-rc`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation 'space.kscience:visionforge-gdml:0.2.0' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { @@ -27,6 +16,6 @@ repositories { } dependencies { - implementation("space.kscience:visionforge-gdml:0.2.0") + implementation("space.kscience:visionforge-gdml:0.3.0-rc") } ``` diff --git a/visionforge-gdml/api/visionforge-gdml.api b/visionforge-gdml/api/visionforge-gdml.api index 1a73d170..6922b868 100644 --- a/visionforge-gdml/api/visionforge-gdml.api +++ b/visionforge-gdml/api/visionforge-gdml.api @@ -14,19 +14,21 @@ public final class space/kscience/visionforge/gdml/GdmlLoaderKt { public final class space/kscience/visionforge/gdml/GdmlLoaderOptions { public static final field Companion Lspace/kscience/visionforge/gdml/GdmlLoaderOptions$Companion; public fun ()V - public final fun configure (Lkotlin/jvm/functions/Function4;)V public final fun getAUnit ()Lspace/kscience/gdml/AUnit; public final fun getConfigurePaint ()Lkotlin/jvm/functions/Function3; public final fun getConfigureSolid ()Lkotlin/jvm/functions/Function4; public final fun getLUnit ()Lspace/kscience/gdml/LUnit; + public final fun getLight ()Lspace/kscience/visionforge/solid/LightSource; public final fun getSolidAction ()Lkotlin/jvm/functions/Function1; public final fun getVolumeAction ()Lkotlin/jvm/functions/Function1; public final fun paint (Lkotlin/jvm/functions/Function3;)V public final fun registerAndUseStyle (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public final fun setAUnit (Lspace/kscience/gdml/AUnit;)V public final fun setLUnit (Lspace/kscience/gdml/LUnit;)V + public final fun setLight (Lspace/kscience/visionforge/solid/LightSource;)V public final fun setSolidAction (Lkotlin/jvm/functions/Function1;)V public final fun setVolumeAction (Lkotlin/jvm/functions/Function1;)V + public final fun solids (Lkotlin/jvm/functions/Function4;)V public final fun transparent (Lspace/kscience/visionforge/solid/Solid;)V } @@ -34,6 +36,7 @@ public final class space/kscience/visionforge/gdml/GdmlLoaderOptions$Action : ja public static final field ADD Lspace/kscience/visionforge/gdml/GdmlLoaderOptions$Action; public static final field PROTOTYPE Lspace/kscience/visionforge/gdml/GdmlLoaderOptions$Action; public static final field REJECT Lspace/kscience/visionforge/gdml/GdmlLoaderOptions$Action; + public static fun getEntries ()Lkotlin/enums/EnumEntries; public static fun valueOf (Ljava/lang/String;)Lspace/kscience/visionforge/gdml/GdmlLoaderOptions$Action; public static fun values ()[Lspace/kscience/visionforge/gdml/GdmlLoaderOptions$Action; } diff --git a/visionforge-jupyter/README.md b/visionforge-jupyter/README.md index 433d3042..43df6bfd 100644 --- a/visionforge-jupyter/README.md +++ b/visionforge-jupyter/README.md @@ -1,4 +1,21 @@ -# Module jupyter +# Module visionforge-jupyter Common visionforge jupyter module +## Usage + +## Artifact: + +The Maven coordinates of this project are `space.kscience:visionforge-jupyter:0.3.0-rc`. + +**Gradle Kotlin DSL:** +```kotlin +repositories { + maven("https://repo.kotlin.link") + mavenCentral() +} + +dependencies { + implementation("space.kscience:visionforge-jupyter:0.3.0-rc") +} +``` diff --git a/visionforge-jupyter/api/visionforge-jupyter.api b/visionforge-jupyter/api/visionforge-jupyter.api new file mode 100644 index 00000000..019c5d4a --- /dev/null +++ b/visionforge-jupyter/api/visionforge-jupyter.api @@ -0,0 +1,54 @@ +public final class space/kscience/visionforge/jupyter/FormsKt { + public static final fun HtmlFormFragment (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/jupyter/HtmlFormFragment; + public static synthetic fun HtmlFormFragment$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/jupyter/HtmlFormFragment; + public static final fun form (Lspace/kscience/visionforge/jupyter/VisionForge;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/jupyter/HtmlFormFragment; + public static synthetic fun form$default (Lspace/kscience/visionforge/jupyter/VisionForge;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/jupyter/HtmlFormFragment; +} + +public final class space/kscience/visionforge/jupyter/HtmlFormFragment { + public final fun get (Ljava/lang/String;)Lspace/kscience/dataforge/meta/Meta; + public final fun getFormBody ()Lspace/kscience/visionforge/html/HtmlFragment; + public final fun getValues ()Lspace/kscience/dataforge/meta/Meta; + public final fun getVision ()Lspace/kscience/visionforge/html/VisionOfHtmlForm; +} + +public final class space/kscience/visionforge/jupyter/VisionForge : kotlinx/coroutines/CoroutineScope, space/kscience/dataforge/context/ContextAware { + public fun (Lspace/kscience/visionforge/VisionManager;Lorg/jetbrains/kotlinx/jupyter/api/Notebook;Lspace/kscience/dataforge/meta/Meta;)V + public synthetic fun (Lspace/kscience/visionforge/VisionManager;Lorg/jetbrains/kotlinx/jupyter/api/Notebook;Lspace/kscience/dataforge/meta/Meta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun form (Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/jupyter/HtmlFormFragment; + public final fun getConfiguration ()Lspace/kscience/dataforge/meta/ObservableMutableMeta; + public fun getContext ()Lspace/kscience/dataforge/context/Context; + public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext; + public final fun getNotebook ()Lorg/jetbrains/kotlinx/jupyter/api/Notebook; + public final fun getProperty (Ljava/lang/String;)Lspace/kscience/dataforge/meta/TypedMeta; + public final fun getVisionManager ()Lspace/kscience/visionforge/VisionManager; + public final fun isServerRunning ()Z + public final fun produceHtml (Ljava/lang/Boolean;Lspace/kscience/visionforge/html/HtmlVisionFragment;)Lorg/jetbrains/kotlinx/jupyter/api/MimeTypedResult; + public static synthetic fun produceHtml$default (Lspace/kscience/visionforge/jupyter/VisionForge;Ljava/lang/Boolean;Lspace/kscience/visionforge/html/HtmlVisionFragment;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/jupyter/api/MimeTypedResult; +} + +public final class space/kscience/visionforge/jupyter/VisionForgeCompatibility : java/lang/Enum { + public static final field DATALORE Lspace/kscience/visionforge/jupyter/VisionForgeCompatibility; + public static final field IDEA Lspace/kscience/visionforge/jupyter/VisionForgeCompatibility; + public static final field JUPYTER Lspace/kscience/visionforge/jupyter/VisionForgeCompatibility; + public static final field JUPYTER_LAB Lspace/kscience/visionforge/jupyter/VisionForgeCompatibility; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public static fun valueOf (Ljava/lang/String;)Lspace/kscience/visionforge/jupyter/VisionForgeCompatibility; + public static fun values ()[Lspace/kscience/visionforge/jupyter/VisionForgeCompatibility; +} + +public abstract class space/kscience/visionforge/jupyter/VisionForgeIntegration : org/jetbrains/kotlinx/jupyter/api/libraries/JupyterIntegration, space/kscience/dataforge/context/ContextAware { + public fun (Lspace/kscience/visionforge/VisionManager;)V + protected abstract fun afterLoaded (Lorg/jetbrains/kotlinx/jupyter/api/libraries/JupyterIntegration$Builder;Lspace/kscience/visionforge/jupyter/VisionForge;)V + public fun getContext ()Lspace/kscience/dataforge/context/Context; + public final fun getVisionManager ()Lspace/kscience/visionforge/VisionManager; + public final fun onLoaded (Lorg/jetbrains/kotlinx/jupyter/api/libraries/JupyterIntegration$Builder;)V +} + +public final class space/kscience/visionforge/jupyter/VisionForgeIntegrationKt { + public static final fun fragment (Lspace/kscience/visionforge/jupyter/VisionForge;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/jupyter/api/MimeTypedResult; + public static final fun html (Lspace/kscience/visionforge/jupyter/VisionForge;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/jupyter/api/MimeTypedResult; + public static final fun page (Lspace/kscience/visionforge/jupyter/VisionForge;Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionPage; + public static synthetic fun page$default (Lspace/kscience/visionforge/jupyter/VisionForge;Ljava/util/Map;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionPage; +} + diff --git a/visionforge-jupyter/visionforge-jupyter-common/api/visionforge-jupyter-common.api b/visionforge-jupyter/visionforge-jupyter-common/api/visionforge-jupyter-common.api new file mode 100644 index 00000000..7e1cbb84 --- /dev/null +++ b/visionforge-jupyter/visionforge-jupyter-common/api/visionforge-jupyter-common.api @@ -0,0 +1,8 @@ +public final class space/kscience/visionforge/jupyter/JupyterCommonIntegration : space/kscience/visionforge/jupyter/VisionForgeIntegration { + public static final field Companion Lspace/kscience/visionforge/jupyter/JupyterCommonIntegration$Companion; + public fun ()V +} + +public final class space/kscience/visionforge/jupyter/JupyterCommonIntegration$Companion { +} + diff --git a/visionforge-markdown/README.md b/visionforge-markdown/README.md index f43c742b..5e35ccf7 100644 --- a/visionforge-markdown/README.md +++ b/visionforge-markdown/README.md @@ -6,19 +6,8 @@ ## Artifact: -The Maven coordinates of this project are `space.kscience:visionforge-markdown:0.2.0`. +The Maven coordinates of this project are `space.kscience:visionforge-markdown:0.3.0-rc`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation 'space.kscience:visionforge-markdown:0.2.0' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { @@ -27,6 +16,6 @@ repositories { } dependencies { - implementation("space.kscience:visionforge-markdown:0.2.0") + implementation("space.kscience:visionforge-markdown:0.3.0-rc") } ``` diff --git a/visionforge-markdown/api/visionforge-markdown.api b/visionforge-markdown/api/visionforge-markdown.api index 08028532..f8e472cf 100644 --- a/visionforge-markdown/api/visionforge-markdown.api +++ b/visionforge-markdown/api/visionforge-markdown.api @@ -3,23 +3,36 @@ public final class space/kscience/visionforge/markup/MarkdownKt { public static synthetic fun markdown$default (Lkotlinx/html/TagConsumer;Lorg/intellij/markdown/flavours/MarkdownFlavourDescriptor;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Ljava/lang/Object; } -public final class space/kscience/visionforge/markup/VisionOfMarkup : space/kscience/visionforge/VisionBase { +public final class space/kscience/visionforge/markup/MarkupPlugin : space/kscience/visionforge/VisionPlugin { + public static final field Companion Lspace/kscience/visionforge/markup/MarkupPlugin$Companion; + public fun ()V + public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; +} + +public final class space/kscience/visionforge/markup/MarkupPlugin$Companion : space/kscience/dataforge/context/PluginFactory { + public synthetic fun build (Lspace/kscience/dataforge/context/Context;Lspace/kscience/dataforge/meta/Meta;)Ljava/lang/Object; + public fun build (Lspace/kscience/dataforge/context/Context;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/visionforge/markup/MarkupPlugin; + public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; +} + +public final class space/kscience/visionforge/markup/MarkupPluginKt { + public static final fun content (Lspace/kscience/visionforge/markup/VisionOfMarkup;Ljava/lang/String;)V +} + +public final class space/kscience/visionforge/markup/VisionOfMarkup : space/kscience/visionforge/AbstractVision { public static final field COMMONMARK_FORMAT Ljava/lang/String; public static final field Companion Lspace/kscience/visionforge/markup/VisionOfMarkup$Companion; public static final field GFM_FORMAT Ljava/lang/String; public fun ()V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Ljava/lang/String;)V public synthetic fun (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getContent ()Ljava/lang/String; public final fun getFormat ()Ljava/lang/String; public final fun setContent (Ljava/lang/String;)V - public static final fun write$Self (Lspace/kscience/visionforge/markup/VisionOfMarkup;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/markup/VisionOfMarkup$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/markup/VisionOfMarkup$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/markup/VisionOfMarkup; @@ -36,5 +49,7 @@ public final class space/kscience/visionforge/markup/VisionOfMarkup$Companion { public final class space/kscience/visionforge/markup/VisionOfMarkupKt { public static final fun content (Lspace/kscience/visionforge/markup/VisionOfMarkup;Lkotlin/jvm/functions/Function0;)V + public static final fun markdown (Lspace/kscience/visionforge/html/VisionOutput;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/markup/VisionOfMarkup; + public static synthetic fun markdown$default (Lspace/kscience/visionforge/html/VisionOutput;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/markup/VisionOfMarkup; } diff --git a/visionforge-plotly/README.md b/visionforge-plotly/README.md index f8a03891..83f3b06b 100644 --- a/visionforge-plotly/README.md +++ b/visionforge-plotly/README.md @@ -6,19 +6,8 @@ ## Artifact: -The Maven coordinates of this project are `space.kscience:visionforge-plotly:0.2.0`. +The Maven coordinates of this project are `space.kscience:visionforge-plotly:0.3.0-rc`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation 'space.kscience:visionforge-plotly:0.2.0' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { @@ -27,6 +16,6 @@ repositories { } dependencies { - implementation("space.kscience:visionforge-plotly:0.2.0") + implementation("space.kscience:visionforge-plotly:0.3.0-rc") } ``` diff --git a/visionforge-plotly/api/visionforge-plotly.api b/visionforge-plotly/api/visionforge-plotly.api index 273f3123..349fe8d5 100644 --- a/visionforge-plotly/api/visionforge-plotly.api +++ b/visionforge-plotly/api/visionforge-plotly.api @@ -5,23 +5,24 @@ public final class space/kscience/visionforge/plotly/PlotlyPlugin : space/kscien } public final class space/kscience/visionforge/plotly/PlotlyPlugin$Companion : space/kscience/dataforge/context/PluginFactory { + public synthetic fun build (Lspace/kscience/dataforge/context/Context;Lspace/kscience/dataforge/meta/Meta;)Ljava/lang/Object; + public fun build (Lspace/kscience/dataforge/context/Context;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/visionforge/plotly/PlotlyPlugin; public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; - public fun getType ()Lkotlin/reflect/KClass; - public synthetic fun invoke (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;)Ljava/lang/Object; - public fun invoke (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;)Lspace/kscience/visionforge/plotly/PlotlyPlugin; } -public final class space/kscience/visionforge/plotly/VisionOfPlotly : space/kscience/visionforge/VisionBase { +public final class space/kscience/visionforge/plotly/VisionOfPlotly : space/kscience/visionforge/Vision { public static final field Companion Lspace/kscience/visionforge/plotly/VisionOfPlotly$Companion; - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Lspace/kscience/plotly/Plot;)V + public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + public final fun getMeta ()Lspace/kscience/dataforge/meta/MutableMeta; + public fun getParent ()Lspace/kscience/visionforge/Vision; public final fun getPlot ()Lspace/kscience/plotly/Plot; - public static final fun write$Self (Lspace/kscience/visionforge/plotly/VisionOfPlotly;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public fun getProperties ()Lspace/kscience/visionforge/MutableVisionProperties; + public fun setParent (Lspace/kscience/visionforge/Vision;)V } public final class space/kscience/visionforge/plotly/VisionOfPlotly$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/plotly/VisionOfPlotly$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/plotly/VisionOfPlotly; @@ -37,6 +38,7 @@ public final class space/kscience/visionforge/plotly/VisionOfPlotly$Companion { public final class space/kscience/visionforge/plotly/VisionOfPlotlyKt { public static final fun asVision (Lspace/kscience/plotly/Plot;)Lspace/kscience/visionforge/plotly/VisionOfPlotly; - public static final fun plotly (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/plotly/VisionOfPlotly; + public static final fun plotly (Lspace/kscience/visionforge/html/VisionOutput;Lspace/kscience/plotly/PlotlyConfig;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/plotly/VisionOfPlotly; + public static synthetic fun plotly$default (Lspace/kscience/visionforge/html/VisionOutput;Lspace/kscience/plotly/PlotlyConfig;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/plotly/VisionOfPlotly; } diff --git a/visionforge-server/README.md b/visionforge-server/README.md index 0ac4c198..c51b38ae 100644 --- a/visionforge-server/README.md +++ b/visionforge-server/README.md @@ -6,19 +6,8 @@ ## Artifact: -The Maven coordinates of this project are `space.kscience:visionforge-server:0.2.0`. +The Maven coordinates of this project are `space.kscience:visionforge-server:0.3.0-rc`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation 'space.kscience:visionforge-server:0.2.0' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { @@ -27,6 +16,6 @@ repositories { } dependencies { - implementation("space.kscience:visionforge-server:0.2.0") + implementation("space.kscience:visionforge-server:0.3.0-rc") } ``` diff --git a/visionforge-server/api/visionforge-server.api b/visionforge-server/api/visionforge-server.api index 3446765b..5d52283f 100644 --- a/visionforge-server/api/visionforge-server.api +++ b/visionforge-server/api/visionforge-server.api @@ -1,36 +1,48 @@ -public final class space/kscience/visionforge/server/VisionServer : space/kscience/dataforge/meta/Configurable { - public static final field Companion Lspace/kscience/visionforge/server/VisionServer$Companion; +public final class space/kscience/visionforge/server/ApplicationExtensionsKt { + public static final fun EngineConnectorConfig (Ljava/lang/String;I)Lio/ktor/server/engine/EngineConnectorConfig; + public static final fun close (Lio/ktor/server/engine/ApplicationEngine;)V + public static final fun openInBrowser (Lio/ktor/server/engine/ApplicationEngine;)V + public static final fun require (Lio/ktor/util/pipeline/Pipeline;Lio/ktor/server/application/Plugin;)Ljava/lang/Object; +} + +public final class space/kscience/visionforge/server/VisionRoute : space/kscience/dataforge/context/ContextAware, space/kscience/dataforge/meta/Configurable { + public static final field Companion Lspace/kscience/visionforge/server/VisionRoute$Companion; public static final field DEFAULT_PAGE Ljava/lang/String; public static final field DEFAULT_PORT I - public final fun getApplication ()Lio/ktor/application/Application; - public final fun getCacheFragments ()Z - public final fun getDataEmbed ()Z - public final fun getDataFetch ()Z - public final fun getDataUpdate ()Z + public fun (Ljava/lang/String;Lspace/kscience/visionforge/VisionManager;Lspace/kscience/dataforge/meta/ObservableMutableMeta;)V + public synthetic fun (Ljava/lang/String;Lspace/kscience/visionforge/VisionManager;Lspace/kscience/dataforge/meta/ObservableMutableMeta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun getContext ()Lspace/kscience/dataforge/context/Context; + public final fun getDataMode ()Lspace/kscience/visionforge/server/VisionRoute$Mode; public synthetic fun getMeta ()Lspace/kscience/dataforge/meta/MutableMeta; public fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta; + public final fun getRoute ()Ljava/lang/String; public final fun getUpdateInterval ()J - public final fun page (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun page$default (Lspace/kscience/visionforge/server/VisionServer;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public final fun serveVisions (Ljava/lang/String;Ljava/util/Map;)V - public final fun serveVisionsFromFragment (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/String; - public final fun setCacheFragments (Z)V - public final fun setDataEmbed (Z)V - public final fun setDataFetch (Z)V - public final fun setDataUpdate (Z)V + public final fun getVisionManager ()Lspace/kscience/visionforge/VisionManager; + public final fun setDataMode (Lspace/kscience/visionforge/server/VisionRoute$Mode;)V public final fun setUpdateInterval (J)V } -public final class space/kscience/visionforge/server/VisionServer$Companion { +public final class space/kscience/visionforge/server/VisionRoute$Companion { public final fun getUPDATE_INTERVAL_KEY ()Lspace/kscience/dataforge/names/Name; } -public final class space/kscience/visionforge/server/VisionServerKt { - public static final fun close (Lio/ktor/server/engine/ApplicationEngine;)V - public static final fun openInBrowser (Lio/ktor/server/engine/ApplicationEngine;)V - public static final fun serve (Lspace/kscience/visionforge/VisionManager;Ljava/lang/String;ILkotlin/jvm/functions/Function1;)Lio/ktor/server/engine/ApplicationEngine; - public static synthetic fun serve$default (Lspace/kscience/visionforge/VisionManager;Ljava/lang/String;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lio/ktor/server/engine/ApplicationEngine; - public static final fun visionServer (Lio/ktor/application/Application;Lspace/kscience/visionforge/VisionManager;Lio/ktor/http/Url;Ljava/lang/String;)Lspace/kscience/visionforge/server/VisionServer; - public static synthetic fun visionServer$default (Lio/ktor/application/Application;Lspace/kscience/visionforge/VisionManager;Lio/ktor/http/Url;Ljava/lang/String;ILjava/lang/Object;)Lspace/kscience/visionforge/server/VisionServer; +public final class space/kscience/visionforge/server/VisionRoute$Mode : java/lang/Enum { + public static final field EMBED Lspace/kscience/visionforge/server/VisionRoute$Mode; + public static final field FETCH Lspace/kscience/visionforge/server/VisionRoute$Mode; + public static final field UPDATE Lspace/kscience/visionforge/server/VisionRoute$Mode; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public static fun valueOf (Ljava/lang/String;)Lspace/kscience/visionforge/server/VisionRoute$Mode; + public static fun values ()[Lspace/kscience/visionforge/server/VisionRoute$Mode; +} + +public final class space/kscience/visionforge/server/VisionServerKt { + public static final fun serveVisionData (Lio/ktor/server/application/Application;Lspace/kscience/visionforge/server/VisionRoute;Ljava/util/Map;)V + public static final fun serveVisionData (Lio/ktor/server/application/Application;Lspace/kscience/visionforge/server/VisionRoute;Lkotlin/jvm/functions/Function1;)V + public static final fun visionPage (Lio/ktor/server/application/Application;Ljava/lang/String;Lspace/kscience/visionforge/server/VisionRoute;Ljava/util/Collection;Lio/ktor/server/engine/EngineConnectorConfig;Lspace/kscience/visionforge/html/HtmlVisionFragment;)V + public static final fun visionPage (Lio/ktor/server/application/Application;Lspace/kscience/visionforge/VisionManager;[Lspace/kscience/visionforge/html/HtmlFragment;Ljava/lang/String;Lio/ktor/server/engine/EngineConnectorConfig;Lkotlin/jvm/functions/Function1;Lspace/kscience/visionforge/html/HtmlVisionFragment;)V + public static final fun visionPage (Lio/ktor/server/application/Application;Lspace/kscience/visionforge/html/VisionPage;Ljava/lang/String;Lio/ktor/server/engine/EngineConnectorConfig;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun visionPage$default (Lio/ktor/server/application/Application;Ljava/lang/String;Lspace/kscience/visionforge/server/VisionRoute;Ljava/util/Collection;Lio/ktor/server/engine/EngineConnectorConfig;Lspace/kscience/visionforge/html/HtmlVisionFragment;ILjava/lang/Object;)V + public static synthetic fun visionPage$default (Lio/ktor/server/application/Application;Lspace/kscience/visionforge/VisionManager;[Lspace/kscience/visionforge/html/HtmlFragment;Ljava/lang/String;Lio/ktor/server/engine/EngineConnectorConfig;Lkotlin/jvm/functions/Function1;Lspace/kscience/visionforge/html/HtmlVisionFragment;ILjava/lang/Object;)V + public static synthetic fun visionPage$default (Lio/ktor/server/application/Application;Lspace/kscience/visionforge/html/VisionPage;Ljava/lang/String;Lio/ktor/server/engine/EngineConnectorConfig;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V } diff --git a/visionforge-server/build.gradle.kts b/visionforge-server/build.gradle.kts index 59034dd1..650b942a 100644 --- a/visionforge-server/build.gradle.kts +++ b/visionforge-server/build.gradle.kts @@ -1,10 +1,11 @@ plugins { - id("space.kscience.gradle.jvm") + id("space.kscience.gradle.mpp") } kscience{ + jvm() useKtor() - dependencies { + jvmMain { api(projects.visionforgeCore) api("io.ktor:ktor-server-host-common") api("io.ktor:ktor-server-html-builder") diff --git a/visionforge-server/src/main/kotlin/space/kscience/visionforge/server/VisionServer.kt b/visionforge-server/src/jvmMain/kotlin/space/kscience/visionforge/server/VisionServer.kt similarity index 100% rename from visionforge-server/src/main/kotlin/space/kscience/visionforge/server/VisionServer.kt rename to visionforge-server/src/jvmMain/kotlin/space/kscience/visionforge/server/VisionServer.kt diff --git a/visionforge-server/src/main/kotlin/space/kscience/visionforge/server/applicationExtensions.kt b/visionforge-server/src/jvmMain/kotlin/space/kscience/visionforge/server/applicationExtensions.kt similarity index 100% rename from visionforge-server/src/main/kotlin/space/kscience/visionforge/server/applicationExtensions.kt rename to visionforge-server/src/jvmMain/kotlin/space/kscience/visionforge/server/applicationExtensions.kt diff --git a/visionforge-solid/README.md b/visionforge-solid/README.md index cbf4073b..331c8485 100644 --- a/visionforge-solid/README.md +++ b/visionforge-solid/README.md @@ -6,19 +6,8 @@ ## Artifact: -The Maven coordinates of this project are `space.kscience:visionforge-solid:0.2.0`. +The Maven coordinates of this project are `space.kscience:visionforge-solid:0.3.0-rc`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation 'space.kscience:visionforge-solid:0.2.0' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { @@ -27,6 +16,6 @@ repositories { } dependencies { - implementation("space.kscience:visionforge-solid:0.2.0") + implementation("space.kscience:visionforge-solid:0.3.0-rc") } ``` diff --git a/visionforge-solid/api/visionforge-solid.api b/visionforge-solid/api/visionforge-solid.api index c763e3c8..a3dc7838 100644 --- a/visionforge-solid/api/visionforge-solid.api +++ b/visionforge-solid/api/visionforge-solid.api @@ -1,24 +1,63 @@ +public final class space/kscience/visionforge/solid/AmbientLightSource : space/kscience/visionforge/solid/LightSource { + public static final field Companion Lspace/kscience/visionforge/solid/AmbientLightSource$Companion; + public fun ()V +} + +public final class space/kscience/visionforge/solid/AmbientLightSource$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/AmbientLightSource$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/AmbientLightSource; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/AmbientLightSource;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/AmbientLightSource$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/AxesSolid : space/kscience/visionforge/solid/MiscSolid { + public static final field AXES_NAME Ljava/lang/String; + public static final field Companion Lspace/kscience/visionforge/solid/AxesSolid$Companion; + public fun (D)V + public final fun getSize ()D +} + +public final class space/kscience/visionforge/solid/AxesSolid$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/AxesSolid$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/AxesSolid; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/AxesSolid;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/AxesSolid$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + public final class space/kscience/visionforge/solid/Box : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/solid/Hexagon { public static final field Companion Lspace/kscience/visionforge/solid/Box$Companion; public fun (FFF)V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;FFFLkotlinx/serialization/internal/SerializationConstructorMarker;)V - public fun getNode1 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode2 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode3 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode4 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode5 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode6 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode7 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode8 ()Lspace/kscience/visionforge/solid/Point3D; + public fun getNode1 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode2 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode3 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode4 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode5 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode6 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode7 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode8 ()Lspace/kscience/visionforge/solid/Float32Vector3D; public final fun getXSize ()F public final fun getYSize ()F public final fun getZSize ()F - public static final fun write$Self (Lspace/kscience/visionforge/solid/Box;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/Box$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/Box$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Box; @@ -32,16 +71,18 @@ public final class space/kscience/visionforge/solid/Box$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class space/kscience/visionforge/solid/ColorAccessor : space/kscience/dataforge/values/MutableValueProvider { - public fun (Lspace/kscience/dataforge/values/MutableValueProvider;Lspace/kscience/dataforge/names/Name;)V - public final fun getValue ()Lspace/kscience/dataforge/values/Value; - public fun getValue (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/values/Value; - public fun setValue (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/values/Value;)V - public final fun setValue (Lspace/kscience/dataforge/values/Value;)V +public final class space/kscience/visionforge/solid/ColorAccessor : space/kscience/dataforge/meta/MutableValueProvider { + public fun (Lspace/kscience/dataforge/meta/MutableValueProvider;Lspace/kscience/dataforge/names/Name;)V + public final fun getValue ()Lspace/kscience/dataforge/meta/Value; + public fun getValue (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/Value; + public final fun setValue (Lspace/kscience/dataforge/meta/Value;)V + public fun setValue (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Value;)V } public final class space/kscience/visionforge/solid/ColorAccessorKt { public static final fun clear (Lspace/kscience/visionforge/solid/ColorAccessor;)V + public static final fun colorProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun colorProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; public static final fun getString (Lspace/kscience/visionforge/solid/ColorAccessor;)Ljava/lang/String; public static final fun invoke (Lspace/kscience/visionforge/solid/ColorAccessor;I)V public static final fun invoke (Lspace/kscience/visionforge/solid/ColorAccessor;Ljava/lang/String;)V @@ -49,19 +90,16 @@ public final class space/kscience/visionforge/solid/ColorAccessorKt { public static final fun setString (Lspace/kscience/visionforge/solid/ColorAccessor;Ljava/lang/String;)V } -public final class space/kscience/visionforge/solid/Composite : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/VisionPropertyContainer { +public final class space/kscience/visionforge/solid/Composite : space/kscience/visionforge/solid/SolidBase { public static final field Companion Lspace/kscience/visionforge/solid/Composite$Companion; - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/visionforge/solid/CompositeType;Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/Solid;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Lspace/kscience/visionforge/solid/CompositeType;Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/Solid;)V public final fun getCompositeType ()Lspace/kscience/visionforge/solid/CompositeType; public final fun getFirst ()Lspace/kscience/visionforge/solid/Solid; public final fun getSecond ()Lspace/kscience/visionforge/solid/Solid; - public static final fun write$Self (Lspace/kscience/visionforge/solid/Composite;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/Composite$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/Composite$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Composite; @@ -76,16 +114,16 @@ public final class space/kscience/visionforge/solid/Composite$Companion { } public final class space/kscience/visionforge/solid/CompositeKt { - public static final fun composite (Lspace/kscience/visionforge/VisionContainerBuilder;Lspace/kscience/visionforge/solid/CompositeType;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Composite; - public static synthetic fun composite$default (Lspace/kscience/visionforge/VisionContainerBuilder;Lspace/kscience/visionforge/solid/CompositeType;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Composite; - public static final fun intersect (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Composite; - public static synthetic fun intersect$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Composite; + public static final fun composite (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/visionforge/solid/CompositeType;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Composite; + public static synthetic fun composite$default (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/visionforge/solid/CompositeType;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Composite; + public static final fun intersect (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Composite; + public static synthetic fun intersect$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Composite; public static final fun smartComposite (Lspace/kscience/visionforge/solid/SolidGroup;Lspace/kscience/visionforge/solid/CompositeType;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Solid; public static synthetic fun smartComposite$default (Lspace/kscience/visionforge/solid/SolidGroup;Lspace/kscience/visionforge/solid/CompositeType;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Solid; - public static final fun subtract (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Composite; - public static synthetic fun subtract$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Composite; - public static final fun union (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Composite; - public static synthetic fun union$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Composite; + public static final fun subtract (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Composite; + public static synthetic fun subtract$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Composite; + public static final fun union (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Composite; + public static synthetic fun union$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Composite; } public final class space/kscience/visionforge/solid/CompositeType : java/lang/Enum { @@ -93,6 +131,7 @@ public final class space/kscience/visionforge/solid/CompositeType : java/lang/En public static final field INTERSECT Lspace/kscience/visionforge/solid/CompositeType; public static final field SUBTRACT Lspace/kscience/visionforge/solid/CompositeType; public static final field UNION Lspace/kscience/visionforge/solid/CompositeType; + public static fun getEntries ()Lkotlin/enums/EnumEntries; public static fun valueOf (Ljava/lang/String;)Lspace/kscience/visionforge/solid/CompositeType; public static fun values ()[Lspace/kscience/visionforge/solid/CompositeType; } @@ -101,19 +140,16 @@ public final class space/kscience/visionforge/solid/ConeSegment : space/kscience public static final field Companion Lspace/kscience/visionforge/solid/ConeSegment$Companion; public fun (FFFFF)V public synthetic fun (FFFFFILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;FFFFFLkotlinx/serialization/internal/SerializationConstructorMarker;)V - public final fun getAngle ()F public final fun getBottomRadius ()F public final fun getHeight ()F - public final fun getStartAngle ()F + public final fun getPhi ()F + public final fun getPhiStart ()F public final fun getTopRadius ()F public fun toGeometry (Lspace/kscience/visionforge/solid/GeometryBuilder;)V - public static final fun write$Self (Lspace/kscience/visionforge/solid/ConeSegment;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/ConeSegment$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/ConeSegment$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/ConeSegment; @@ -128,31 +164,28 @@ public final class space/kscience/visionforge/solid/ConeSegment$Companion { } public final class space/kscience/visionforge/solid/ConeSegmentKt { - public static final fun cone (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/ConeSegment; - public static synthetic fun cone$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/ConeSegment; - public static final fun cylinder (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/ConeSegment; - public static synthetic fun cylinder$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/ConeSegment; + public static final fun cone (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/ConeSegment; + public static synthetic fun cone$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/ConeSegment; + public static final fun cylinder (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/ConeSegment; + public static synthetic fun cylinder$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/ConeSegment; } -public final class space/kscience/visionforge/solid/ConeSurface : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/VisionPropertyContainer, space/kscience/visionforge/solid/GeometrySolid { +public final class space/kscience/visionforge/solid/ConeSurface : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/solid/GeometrySolid { public static final field Companion Lspace/kscience/visionforge/solid/ConeSurface$Companion; public fun (FFFFFFF)V public synthetic fun (FFFFFFFILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;FFFFFFFLkotlinx/serialization/internal/SerializationConstructorMarker;)V - public final fun getAngle ()F public final fun getBottomInnerRadius ()F public final fun getBottomRadius ()F public final fun getHeight ()F - public final fun getStartAngle ()F + public final fun getPhi ()F + public final fun getPhiStart ()F public final fun getTopInnerRadius ()F public final fun getTopRadius ()F public fun toGeometry (Lspace/kscience/visionforge/solid/GeometryBuilder;)V - public static final fun write$Self (Lspace/kscience/visionforge/solid/ConeSurface;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/ConeSurface$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/ConeSurface$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/ConeSurface; @@ -167,23 +200,20 @@ public final class space/kscience/visionforge/solid/ConeSurface$Companion { } public final class space/kscience/visionforge/solid/ConeSurfaceKt { - public static final fun coneSurface (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/ConeSurface; - public static synthetic fun coneSurface$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/ConeSurface; - public static final fun tube (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/ConeSurface; - public static synthetic fun tube$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/ConeSurface; + public static final fun coneSurface (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/ConeSurface; + public static synthetic fun coneSurface$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/ConeSurface; + public static final fun tube (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/ConeSurface; + public static synthetic fun tube$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/ConeSurface; } -public final class space/kscience/visionforge/solid/Convex : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/VisionPropertyContainer { +public final class space/kscience/visionforge/solid/Convex : space/kscience/visionforge/solid/SolidBase { public static final field Companion Lspace/kscience/visionforge/solid/Convex$Companion; - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Ljava/util/List;)V public final fun getPoints ()Ljava/util/List; - public static final fun write$Self (Lspace/kscience/visionforge/solid/Convex;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/Convex$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/Convex$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Convex; @@ -204,37 +234,55 @@ public final class space/kscience/visionforge/solid/ConvexBuilder { } public final class space/kscience/visionforge/solid/ConvexKt { - public static final fun convex (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Convex; - public static synthetic fun convex$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Convex; + public static final fun convex (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Convex; + public static synthetic fun convex$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Convex; } -public final class space/kscience/visionforge/solid/ExtrudeBuilder : space/kscience/visionforge/SimpleVisionPropertyContainer { - public fun ()V - public fun (Ljava/util/List;Ljava/util/List;Lspace/kscience/dataforge/meta/ObservableMutableMeta;)V - public synthetic fun (Ljava/util/List;Ljava/util/List;Lspace/kscience/dataforge/meta/ObservableMutableMeta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun getLayers ()Ljava/util/List; - public final fun getShape ()Ljava/util/List; - public final fun layer (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;)V - public static synthetic fun layer$default (Lspace/kscience/visionforge/solid/ExtrudeBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;ILjava/lang/Object;)V - public final fun setLayers (Ljava/util/List;)V - public final fun setShape (Ljava/util/List;)V - public final fun shape (Lkotlin/jvm/functions/Function1;)V +public final class space/kscience/visionforge/solid/CutTube : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/solid/GeometrySolid { + public static final field Companion Lspace/kscience/visionforge/solid/CutTube$Companion; + public fun (FFFFFLspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;)V + public synthetic fun (FFFFFLspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun getHeight ()F + public final fun getInnerRadius ()F + public final fun getNBottom ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public final fun getNTop ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public final fun getOuterRadius ()F + public final fun getPhi ()F + public final fun getPhiStart ()F + public fun toGeometry (Lspace/kscience/visionforge/solid/GeometryBuilder;)V } -public final class space/kscience/visionforge/solid/Extruded : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/VisionPropertyContainer, space/kscience/visionforge/solid/GeometrySolid { +public final class space/kscience/visionforge/solid/CutTube$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/CutTube$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/CutTube; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/CutTube;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/CutTube$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/CutTubeKt { + public static final fun cutTube (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/CutTube; + public static synthetic fun cutTube$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/CutTube; +} + +public final class space/kscience/visionforge/solid/Extruded : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/solid/GeometrySolid { public static final field Companion Lspace/kscience/visionforge/solid/Extruded$Companion; public static final field TYPE Ljava/lang/String; - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/util/List;Ljava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Ljava/util/List;Ljava/util/List;)V public final fun getLayers ()Ljava/util/List; public final fun getShape ()Ljava/util/List; public fun toGeometry (Lspace/kscience/visionforge/solid/GeometryBuilder;)V - public static final fun write$Self (Lspace/kscience/visionforge/solid/Extruded;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/Extruded$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/Extruded$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Extruded; @@ -244,34 +292,172 @@ public final class space/kscience/visionforge/solid/Extruded$$serializer : kotli public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } +public final class space/kscience/visionforge/solid/Extruded$Builder { + public fun ()V + public fun (Ljava/util/List;Ljava/util/List;Lspace/kscience/dataforge/meta/MutableMeta;)V + public synthetic fun (Ljava/util/List;Ljava/util/List;Lspace/kscience/dataforge/meta/MutableMeta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun getLayers ()Ljava/util/List; + public final fun getProperties ()Lspace/kscience/dataforge/meta/MutableMeta; + public final fun getShape ()Ljava/util/List; + public final fun layer (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;)V + public static synthetic fun layer$default (Lspace/kscience/visionforge/solid/Extruded$Builder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;ILjava/lang/Object;)V + public final fun setLayers (Ljava/util/List;)V + public final fun setShape (Ljava/util/List;)V + public final fun shape (Lkotlin/jvm/functions/Function1;)V +} + public final class space/kscience/visionforge/solid/Extruded$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } +public final class space/kscience/visionforge/solid/Extruded$Layer { + public static final field Companion Lspace/kscience/visionforge/solid/Extruded$Layer$Companion; + public fun (FFFF)V + public final fun component1 ()F + public final fun component2 ()F + public final fun component3 ()F + public final fun component4 ()F + public final fun copy (FFFF)Lspace/kscience/visionforge/solid/Extruded$Layer; + public static synthetic fun copy$default (Lspace/kscience/visionforge/solid/Extruded$Layer;FFFFILjava/lang/Object;)Lspace/kscience/visionforge/solid/Extruded$Layer; + public fun equals (Ljava/lang/Object;)Z + public final fun getScale ()F + public final fun getX ()F + public final fun getY ()F + public final fun getZ ()F + public fun hashCode ()I + public final fun setScale (F)V + public final fun setX (F)V + public final fun setY (F)V + public final fun setZ (F)V + public fun toString ()Ljava/lang/String; +} + +public final class space/kscience/visionforge/solid/Extruded$Layer$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/Extruded$Layer$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Extruded$Layer; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/Extruded$Layer;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/Extruded$Layer$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + public final class space/kscience/visionforge/solid/ExtrudedKt { - public static final fun extruded (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Extruded; - public static synthetic fun extruded$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Extruded; - public static final fun polygon (Lspace/kscience/visionforge/solid/Shape2DBuilder;ILjava/lang/Number;)V + public static final fun extruded (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Extruded; + public static synthetic fun extruded$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Extruded; +} + +public final class space/kscience/visionforge/solid/Float32Euclidean2DSpace : space/kscience/kmath/geometry/GeometrySpace, space/kscience/kmath/operations/ScaleOperations { + public static final field INSTANCE Lspace/kscience/visionforge/solid/Float32Euclidean2DSpace; + public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + public fun add (Lspace/kscience/visionforge/solid/Float32Vector2D;Lspace/kscience/visionforge/solid/Float32Vector2D;)Lspace/kscience/visionforge/solid/Float32Vector2D; + public synthetic fun distanceTo (Lspace/kscience/kmath/geometry/Vector;Lspace/kscience/kmath/geometry/Vector;)D + public fun distanceTo (Lspace/kscience/visionforge/solid/Float32Vector2D;Lspace/kscience/visionforge/solid/Float32Vector2D;)D + public synthetic fun dot (Lspace/kscience/kmath/geometry/Vector;Lspace/kscience/kmath/geometry/Vector;)D + public fun dot (Lspace/kscience/visionforge/solid/Float32Vector2D;Lspace/kscience/visionforge/solid/Float32Vector2D;)D + public final fun getXAxis ()Lspace/kscience/visionforge/solid/Float32Vector2D; + public final fun getYAxis ()Lspace/kscience/visionforge/solid/Float32Vector2D; + public synthetic fun getZero ()Ljava/lang/Object; + public fun getZero ()Lspace/kscience/visionforge/solid/Float32Vector2D; + public synthetic fun norm (Ljava/lang/Object;)Ljava/lang/Object; + public final fun norm (Lspace/kscience/visionforge/solid/Float32Vector2D;)D + public fun norm (Lspace/kscience/visionforge/solid/Float32Vector2D;)Ljava/lang/Double; + public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object; + public fun scale (Lspace/kscience/visionforge/solid/Float32Vector2D;D)Lspace/kscience/visionforge/solid/Float32Vector2D; + public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object; + public fun unaryMinus (Lspace/kscience/visionforge/solid/Float32Vector2D;)Lspace/kscience/visionforge/solid/Float32Vector2D; + public final fun vector (FF)Lspace/kscience/visionforge/solid/Float32Vector2D; + public final fun vector (Ljava/lang/Number;Ljava/lang/Number;)Lspace/kscience/visionforge/solid/Float32Vector2D; +} + +public final class space/kscience/visionforge/solid/Float32Euclidean2DSpace$VectorSerializer : kotlinx/serialization/KSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/Float32Euclidean2DSpace$VectorSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Float32Vector2D; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/Float32Vector2D;)V +} + +public final class space/kscience/visionforge/solid/Float32Euclidean2DSpaceKt { + public static final fun Float32Vector2D (Ljava/lang/Number;Ljava/lang/Number;)Lspace/kscience/visionforge/solid/Float32Vector2D; +} + +public final class space/kscience/visionforge/solid/Float32Euclidean3DSpace : space/kscience/kmath/geometry/GeometrySpace, space/kscience/kmath/operations/ScaleOperations { + public static final field INSTANCE Lspace/kscience/visionforge/solid/Float32Euclidean3DSpace; + public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + public fun add (Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;)Lspace/kscience/visionforge/solid/Float32Vector3D; + public final fun cross (Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;)Lspace/kscience/visionforge/solid/Float32Vector3D; + public synthetic fun distanceTo (Lspace/kscience/kmath/geometry/Vector;Lspace/kscience/kmath/geometry/Vector;)D + public fun distanceTo (Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;)D + public synthetic fun dot (Lspace/kscience/kmath/geometry/Vector;Lspace/kscience/kmath/geometry/Vector;)D + public fun dot (Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;)D + public final fun getXAxis ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public final fun getYAxis ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public final fun getZAxis ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public synthetic fun getZero ()Ljava/lang/Object; + public fun getZero ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public synthetic fun norm (Ljava/lang/Object;)Ljava/lang/Object; + public final fun norm (Lspace/kscience/visionforge/solid/Float32Vector3D;)D + public fun norm (Lspace/kscience/visionforge/solid/Float32Vector3D;)Ljava/lang/Double; + public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object; + public fun scale (Lspace/kscience/visionforge/solid/Float32Vector3D;D)Lspace/kscience/visionforge/solid/Float32Vector3D; + public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object; + public fun unaryMinus (Lspace/kscience/visionforge/solid/Float32Vector3D;)Lspace/kscience/visionforge/solid/Float32Vector3D; + public final fun vector (FFF)Lspace/kscience/visionforge/solid/Float32Vector3D; + public final fun vector (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;)Lspace/kscience/visionforge/solid/Float32Vector3D; + public final fun vectorProduct (Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;)Lspace/kscience/visionforge/solid/Float32Vector3D; +} + +public final class space/kscience/visionforge/solid/Float32Euclidean3DSpace$VectorSerializer : kotlinx/serialization/KSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/Float32Euclidean3DSpace$VectorSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/Float32Vector3D;)V +} + +public final class space/kscience/visionforge/solid/Float32Euclidean3DSpaceKt { + public static final fun Float32Vector3D (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;)Lspace/kscience/visionforge/solid/Float32Vector3D; +} + +public abstract interface class space/kscience/visionforge/solid/Float32Vector2D : space/kscience/kmath/geometry/Vector2D { + public static final field Companion Lspace/kscience/visionforge/solid/Float32Vector2D$Companion; +} + +public final class space/kscience/visionforge/solid/Float32Vector2D$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public abstract interface class space/kscience/visionforge/solid/Float32Vector3D : space/kscience/kmath/geometry/Vector3D { + public static final field Companion Lspace/kscience/visionforge/solid/Float32Vector3D$Companion; +} + +public final class space/kscience/visionforge/solid/Float32Vector3D$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class space/kscience/visionforge/solid/GenericHexagon : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/solid/Hexagon { public static final field Companion Lspace/kscience/visionforge/solid/GenericHexagon$Companion; - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public fun (Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;)V - public fun getNode1 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode2 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode3 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode4 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode5 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode6 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode7 ()Lspace/kscience/visionforge/solid/Point3D; - public fun getNode8 ()Lspace/kscience/visionforge/solid/Point3D; - public static final fun write$Self (Lspace/kscience/visionforge/solid/GenericHexagon;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public fun (Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;)V + public fun getNode1 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode2 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode3 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode4 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode5 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode6 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode7 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public fun getNode8 ()Lspace/kscience/visionforge/solid/Float32Vector3D; } public final class space/kscience/visionforge/solid/GenericHexagon$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/GenericHexagon$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/GenericHexagon; @@ -287,28 +473,21 @@ public final class space/kscience/visionforge/solid/GenericHexagon$Companion { public abstract interface class space/kscience/visionforge/solid/GeometryBuilder { public abstract fun build ()Ljava/lang/Object; - public abstract fun face (Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/dataforge/meta/Meta;)V - public static synthetic fun face$default (Lspace/kscience/visionforge/solid/GeometryBuilder;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/dataforge/meta/Meta;ILjava/lang/Object;)V + public abstract fun face (Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/dataforge/meta/Meta;)V + public static synthetic fun face$default (Lspace/kscience/visionforge/solid/GeometryBuilder;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/dataforge/meta/Meta;ILjava/lang/Object;)V } public final class space/kscience/visionforge/solid/GeometryBuilderKt { - public static final fun cap (Lspace/kscience/visionforge/solid/GeometryBuilder;Ljava/util/List;Lspace/kscience/visionforge/solid/Point3D;)V - public static synthetic fun cap$default (Lspace/kscience/visionforge/solid/GeometryBuilder;Ljava/util/List;Lspace/kscience/visionforge/solid/Point3D;ILjava/lang/Object;)V - public static final fun face4 (Lspace/kscience/visionforge/solid/GeometryBuilder;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/dataforge/meta/Meta;)V - public static synthetic fun face4$default (Lspace/kscience/visionforge/solid/GeometryBuilder;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/dataforge/meta/Meta;ILjava/lang/Object;)V + public static final fun cap (Lspace/kscience/visionforge/solid/GeometryBuilder;Ljava/util/List;Lspace/kscience/visionforge/solid/Float32Vector3D;)V + public static synthetic fun cap$default (Lspace/kscience/visionforge/solid/GeometryBuilder;Ljava/util/List;Lspace/kscience/visionforge/solid/Float32Vector3D;ILjava/lang/Object;)V + public static final fun face4 (Lspace/kscience/visionforge/solid/GeometryBuilder;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/dataforge/meta/Meta;)V + public static synthetic fun face4$default (Lspace/kscience/visionforge/solid/GeometryBuilder;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/dataforge/meta/Meta;ILjava/lang/Object;)V } public final class space/kscience/visionforge/solid/GeometryKt { public static final field PI2 F - public static final fun Point2D (Ljava/lang/Number;Ljava/lang/Number;)Lspace/kscience/visionforge/solid/Point2D; - public static final fun Point3D (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;)Lspace/kscience/visionforge/solid/Point3D; - public static final fun cross (Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;)Lspace/kscience/visionforge/solid/Point3D; - public static final fun minus (Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;)Lspace/kscience/visionforge/solid/Point3D; - public static final fun normalizeInPlace (Lspace/kscience/visionforge/solid/MutablePoint3D;)V - public static final fun plus (Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;)Lspace/kscience/visionforge/solid/Point3D; - public static final fun toMeta (Lspace/kscience/visionforge/solid/Point2D;)Lspace/kscience/dataforge/meta/Meta; - public static final fun toMeta (Lspace/kscience/visionforge/solid/Point3D;)Lspace/kscience/dataforge/meta/Meta; - public static final fun unaryMinus (Lspace/kscience/visionforge/solid/Point3D;)Lspace/kscience/visionforge/solid/Point3D; + public static final fun toMeta (Lspace/kscience/visionforge/solid/Float32Vector2D;)Lspace/kscience/dataforge/meta/Meta; + public static final fun toMeta (Lspace/kscience/visionforge/solid/Float32Vector3D;)Lspace/kscience/dataforge/meta/Meta; } public abstract interface class space/kscience/visionforge/solid/GeometrySolid : space/kscience/visionforge/solid/Solid { @@ -316,132 +495,95 @@ public abstract interface class space/kscience/visionforge/solid/GeometrySolid : } public abstract interface class space/kscience/visionforge/solid/Hexagon : space/kscience/visionforge/solid/GeometrySolid { - public abstract fun getNode1 ()Lspace/kscience/visionforge/solid/Point3D; - public abstract fun getNode2 ()Lspace/kscience/visionforge/solid/Point3D; - public abstract fun getNode3 ()Lspace/kscience/visionforge/solid/Point3D; - public abstract fun getNode4 ()Lspace/kscience/visionforge/solid/Point3D; - public abstract fun getNode5 ()Lspace/kscience/visionforge/solid/Point3D; - public abstract fun getNode6 ()Lspace/kscience/visionforge/solid/Point3D; - public abstract fun getNode7 ()Lspace/kscience/visionforge/solid/Point3D; - public abstract fun getNode8 ()Lspace/kscience/visionforge/solid/Point3D; + public abstract fun getNode1 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public abstract fun getNode2 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public abstract fun getNode3 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public abstract fun getNode4 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public abstract fun getNode5 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public abstract fun getNode6 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public abstract fun getNode7 ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public abstract fun getNode8 ()Lspace/kscience/visionforge/solid/Float32Vector3D; public fun toGeometry (Lspace/kscience/visionforge/solid/GeometryBuilder;)V } public final class space/kscience/visionforge/solid/HexagonKt { - public static final fun box (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Box; - public static synthetic fun box$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Box; - public static final fun hexagon (Lspace/kscience/visionforge/VisionContainerBuilder;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Hexagon; - public static synthetic fun hexagon$default (Lspace/kscience/visionforge/VisionContainerBuilder;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Lspace/kscience/visionforge/solid/Point3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Hexagon; + public static final fun box (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Box; + public static synthetic fun box$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Box; + public static final fun hexagon (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Hexagon; + public static synthetic fun hexagon$default (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Lspace/kscience/visionforge/solid/Float32Vector3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Hexagon; } -public final class space/kscience/visionforge/solid/Layer { - public static final field Companion Lspace/kscience/visionforge/solid/Layer$Companion; - public fun (FFFF)V - public synthetic fun (IFFFFLkotlinx/serialization/internal/SerializationConstructorMarker;)V - public final fun component1 ()F - public final fun component2 ()F - public final fun component3 ()F - public final fun component4 ()F - public final fun copy (FFFF)Lspace/kscience/visionforge/solid/Layer; - public static synthetic fun copy$default (Lspace/kscience/visionforge/solid/Layer;FFFFILjava/lang/Object;)Lspace/kscience/visionforge/solid/Layer; - public fun equals (Ljava/lang/Object;)Z - public final fun getScale ()F - public final fun getX ()F - public final fun getY ()F - public final fun getZ ()F - public fun hashCode ()I - public final fun setScale (F)V - public final fun setX (F)V - public final fun setY (F)V - public final fun setZ (F)V - public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lspace/kscience/visionforge/solid/Layer;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V +public abstract class space/kscience/visionforge/solid/LightSource : space/kscience/visionforge/solid/MiscSolid { + public static final field Companion Lspace/kscience/visionforge/solid/LightSource$Companion; + public fun ()V + public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V + public final fun getColor ()Lspace/kscience/visionforge/solid/ColorAccessor; + public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + public final fun getIntensity ()Ljava/lang/Number; + public final fun setIntensity (Ljava/lang/Number;)V + public static final synthetic fun write$Self (Lspace/kscience/visionforge/solid/LightSource;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } -public final class space/kscience/visionforge/solid/Layer$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lspace/kscience/visionforge/solid/Layer$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Layer; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/Layer;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class space/kscience/visionforge/solid/Layer$Companion { +public final class space/kscience/visionforge/solid/LightSource$Companion { + public final fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + public final fun getINTENSITY_KEY ()Lspace/kscience/dataforge/names/Name; public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public abstract interface class space/kscience/visionforge/solid/MutablePoint3D : space/kscience/visionforge/solid/Point3D { - public abstract fun getX ()F - public abstract fun getY ()F - public abstract fun getZ ()F - public abstract fun setX (F)V - public abstract fun setY (F)V - public abstract fun setZ (F)V +public final class space/kscience/visionforge/solid/LightSourceKt { + public static final fun ambientLight (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/AmbientLightSource; + public static synthetic fun ambientLight$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/AmbientLightSource; + public static final fun pointLight (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/PointLightSource; + public static synthetic fun pointLight$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/PointLightSource; } -public final class space/kscience/visionforge/solid/Point2D { - public static final field Companion Lspace/kscience/visionforge/solid/Point2D$Companion; - public fun (FF)V - public synthetic fun (IFFLkotlinx/serialization/internal/SerializationConstructorMarker;)V - public final fun component1 ()F - public final fun component2 ()F - public final fun copy (FF)Lspace/kscience/visionforge/solid/Point2D; - public static synthetic fun copy$default (Lspace/kscience/visionforge/solid/Point2D;FFILjava/lang/Object;)Lspace/kscience/visionforge/solid/Point2D; - public fun equals (Ljava/lang/Object;)Z - public final fun getX ()F - public final fun getY ()F - public fun hashCode ()I - public final fun setX (F)V - public final fun setY (F)V - public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lspace/kscience/visionforge/solid/Point2D;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V +public abstract class space/kscience/visionforge/solid/MiscSolid : space/kscience/visionforge/solid/SolidBase { + public static final field Companion Lspace/kscience/visionforge/solid/MiscSolid$Companion; + public fun ()V + public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V + public static final synthetic fun write$Self (Lspace/kscience/visionforge/solid/MiscSolid;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } -public final class space/kscience/visionforge/solid/Point2D$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lspace/kscience/visionforge/solid/Point2D$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Point2D; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/Point2D;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class space/kscience/visionforge/solid/Point2D$Companion { +public final class space/kscience/visionforge/solid/MiscSolid$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public abstract interface class space/kscience/visionforge/solid/Point3D { - public static final field Companion Lspace/kscience/visionforge/solid/Point3D$Companion; - public abstract fun getX ()F - public abstract fun getY ()F - public abstract fun getZ ()F +public final class space/kscience/visionforge/solid/MiscSolidKt { + public static final fun axes (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/AxesSolid; + public static synthetic fun axes$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/AxesSolid; } -public final class space/kscience/visionforge/solid/Point3D$Companion { - public final fun getONE ()Lspace/kscience/visionforge/solid/Point3D; - public final fun getZERO ()Lspace/kscience/visionforge/solid/Point3D; +public final class space/kscience/visionforge/solid/PointLightSource : space/kscience/visionforge/solid/LightSource { + public static final field Companion Lspace/kscience/visionforge/solid/PointLightSource$Companion; + public fun ()V } -public final class space/kscience/visionforge/solid/PolyLine : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/VisionPropertyContainer { +public final class space/kscience/visionforge/solid/PointLightSource$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/PointLightSource$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/PointLightSource; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/PointLightSource;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/PointLightSource$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/PolyLine : space/kscience/visionforge/solid/SolidBase { public static final field Companion Lspace/kscience/visionforge/solid/PolyLine$Companion; - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V + public static final field DEFAULT_THICKNESS D public fun (Ljava/util/List;)V public final fun getPoints ()Ljava/util/List; public final fun getThickness ()Ljava/lang/Number; public final fun setThickness (Ljava/lang/Number;)V - public static final fun write$Self (Lspace/kscience/visionforge/solid/PolyLine;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/PolyLine$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/PolyLine$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/PolyLine; @@ -452,13 +594,12 @@ public final class space/kscience/visionforge/solid/PolyLine$$serializer : kotli } public final class space/kscience/visionforge/solid/PolyLine$Companion { - public final fun getTHICKNESS_KEY ()Lspace/kscience/dataforge/names/Name; public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class space/kscience/visionforge/solid/PolyLineKt { - public static final fun polyline (Lspace/kscience/visionforge/VisionContainerBuilder;[Lspace/kscience/visionforge/solid/Point3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/PolyLine; - public static synthetic fun polyline$default (Lspace/kscience/visionforge/VisionContainerBuilder;[Lspace/kscience/visionforge/solid/Point3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/PolyLine; + public static final fun polyline (Lspace/kscience/visionforge/MutableVisionContainer;[Lspace/kscience/visionforge/solid/Float32Vector3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/PolyLine; + public static synthetic fun polyline$default (Lspace/kscience/visionforge/MutableVisionContainer;[Lspace/kscience/visionforge/solid/Float32Vector3D;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/PolyLine; } public abstract interface class space/kscience/visionforge/solid/PrototypeHolder { @@ -466,53 +607,17 @@ public abstract interface class space/kscience/visionforge/solid/PrototypeHolder public abstract fun prototypes (Lkotlin/jvm/functions/Function1;)V } -public final class space/kscience/visionforge/solid/Quaternion { - public static final synthetic fun box-impl ([D)Lspace/kscience/visionforge/solid/Quaternion; - public static fun constructor-impl ([D)[D - public fun equals (Ljava/lang/Object;)Z - public static fun equals-impl ([DLjava/lang/Object;)Z - public static final fun equals-impl0 ([D[D)Z - public final fun getValues ()[D - public fun hashCode ()I - public static fun hashCode-impl ([D)I - public fun toString ()Ljava/lang/String; - public static fun toString-impl ([D)Ljava/lang/String; - public final synthetic fun unbox-impl ()[D -} - -public final class space/kscience/visionforge/solid/QuaternionKt { - public static final fun component1-VMqeIco ([D)D - public static final fun component2-VMqeIco ([D)D - public static final fun component3-VMqeIco ([D)D - public static final fun component4-VMqeIco ([D)D -} - -public final class space/kscience/visionforge/solid/RotationOrder : java/lang/Enum { - public static final field XYZ Lspace/kscience/visionforge/solid/RotationOrder; - public static final field XZY Lspace/kscience/visionforge/solid/RotationOrder; - public static final field YXZ Lspace/kscience/visionforge/solid/RotationOrder; - public static final field YZX Lspace/kscience/visionforge/solid/RotationOrder; - public static final field ZXY Lspace/kscience/visionforge/solid/RotationOrder; - public static final field ZYX Lspace/kscience/visionforge/solid/RotationOrder; - public static fun valueOf (Ljava/lang/String;)Lspace/kscience/visionforge/solid/RotationOrder; - public static fun values ()[Lspace/kscience/visionforge/solid/RotationOrder; -} - public final class space/kscience/visionforge/solid/Shape2DBuilder { public static final field Companion Lspace/kscience/visionforge/solid/Shape2DBuilder$Companion; public fun ()V - public synthetic fun (ILjava/util/ArrayList;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Ljava/util/ArrayList;)V public synthetic fun (Ljava/util/ArrayList;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun build ()Ljava/util/List; public final fun point (Ljava/lang/Number;Ljava/lang/Number;)V - public final fun to (Ljava/lang/Number;Ljava/lang/Number;)V - public static final fun write$Self (Lspace/kscience/visionforge/solid/Shape2DBuilder;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/Shape2DBuilder$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/Shape2DBuilder$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Shape2DBuilder; @@ -526,6 +631,10 @@ public final class space/kscience/visionforge/solid/Shape2DBuilder$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } +public final class space/kscience/visionforge/solid/Shape2DKt { + public static final fun polygon (Lspace/kscience/visionforge/solid/Shape2DBuilder;ILjava/lang/Number;)V +} + public abstract interface class space/kscience/visionforge/solid/Solid : space/kscience/visionforge/Vision { public static final field Companion Lspace/kscience/visionforge/solid/Solid$Companion; public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; @@ -555,17 +664,16 @@ public final class space/kscience/visionforge/solid/Solid$Companion { public final fun getZ_SCALE_KEY ()Lspace/kscience/dataforge/names/Name; } -public class space/kscience/visionforge/solid/SolidBase : space/kscience/visionforge/VisionBase, space/kscience/visionforge/solid/Solid { +public class space/kscience/visionforge/solid/SolidBase : space/kscience/visionforge/AbstractVision, space/kscience/visionforge/solid/Solid { public static final field Companion Lspace/kscience/visionforge/solid/SolidBase$Companion; public fun ()V public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; - public static final fun write$Self (Lspace/kscience/visionforge/solid/SolidBase;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lspace/kscience/visionforge/solid/SolidBase;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;Lkotlinx/serialization/KSerializer;)V } public final class space/kscience/visionforge/solid/SolidBase$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lspace/kscience/visionforge/solid/SolidBase$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun (Lkotlinx/serialization/KSerializer;)V public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/SolidBase; @@ -576,24 +684,26 @@ public final class space/kscience/visionforge/solid/SolidBase$$serializer : kotl } public final class space/kscience/visionforge/solid/SolidBase$Companion { - public final fun serializer ()Lkotlinx/serialization/KSerializer; + public final fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer; } -public final class space/kscience/visionforge/solid/SolidGroup : space/kscience/visionforge/VisionGroupBase, space/kscience/visionforge/solid/PrototypeHolder, space/kscience/visionforge/solid/Solid { +public final class space/kscience/visionforge/solid/SolidGroup : space/kscience/visionforge/AbstractVisionGroup, space/kscience/visionforge/MutableVisionContainer, space/kscience/visionforge/MutableVisionGroup, space/kscience/visionforge/solid/PrototypeHolder, space/kscience/visionforge/solid/Solid { public static final field Companion Lspace/kscience/visionforge/solid/SolidGroup$Companion; public fun ()V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/util/Map;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public synthetic fun createGroup ()Lspace/kscience/visionforge/VisionGroupBase; - public fun getChildren ()Ljava/util/Map; + public synthetic fun createGroup ()Lspace/kscience/visionforge/AbstractVisionGroup; + public synthetic fun createGroup ()Lspace/kscience/visionforge/MutableVisionGroup; + public fun createGroup ()Lspace/kscience/visionforge/solid/SolidGroup; + public final fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/solid/Solid; public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + public final fun getItems ()Ljava/util/Map; public fun getPrototype (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/solid/Solid; public fun prototypes (Lkotlin/jvm/functions/Function1;)V - public static final fun write$Self (Lspace/kscience/visionforge/solid/SolidGroup;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public synthetic fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V + public fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/solid/Solid;)V } public final class space/kscience/visionforge/solid/SolidGroup$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/SolidGroup$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/SolidGroup; @@ -610,39 +720,45 @@ public final class space/kscience/visionforge/solid/SolidGroup$Companion { public final class space/kscience/visionforge/solid/SolidGroupKt { public static final fun SolidGroup (Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidGroup; - public static final fun group (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidGroup; - public static final fun group (Lspace/kscience/visionforge/VisionContainerBuilder;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidGroup; - public static synthetic fun group$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidGroup; - public static synthetic fun group$default (Lspace/kscience/visionforge/VisionContainerBuilder;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidGroup; + public static final fun get (Lspace/kscience/visionforge/solid/SolidGroup;Ljava/lang/String;)Lspace/kscience/visionforge/solid/Solid; + public static final fun solidGroup (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidGroup; + public static final fun solidGroup (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidGroup; + public static synthetic fun solidGroup$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidGroup; + public static synthetic fun solidGroup$default (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidGroup; } public final class space/kscience/visionforge/solid/SolidKt { public static final fun getDetail (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Integer; public static final fun getIgnore (Lspace/kscience/visionforge/Vision;)Ljava/lang/Boolean; public static final fun getLayer (Lspace/kscience/visionforge/solid/Solid;)I - public static final fun getPosition (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/visionforge/solid/Point3D; - public static final fun getRotation (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/visionforge/solid/Point3D; - public static final fun getRotationOrder (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/visionforge/solid/RotationOrder; + public static final fun getPosition (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/visionforge/solid/Float32Vector3D; + public static final fun getQuaternion (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/kmath/complex/Quaternion; + public static final fun getQuaternionOrNull (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/kmath/complex/Quaternion; + public static final fun getRotation (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/visionforge/solid/Float32Vector3D; + public static final fun getRotationOrder (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/kmath/geometry/RotationOrder; public static final fun getRotationX (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; public static final fun getRotationY (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; public static final fun getRotationZ (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; - public static final fun getScale (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/visionforge/solid/Point3D; + public static final fun getScale (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/visionforge/solid/Float32Vector3D; public static final fun getScaleX (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; public static final fun getScaleY (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; public static final fun getScaleZ (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; public static final fun getX (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; public static final fun getY (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; public static final fun getZ (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; + public static final fun rotate (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/kmath/geometry/Angle;Lspace/kscience/kmath/geometry/Vector3D;)V public static final fun setDetail (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/Integer;)V public static final fun setIgnore (Lspace/kscience/visionforge/Vision;Ljava/lang/Boolean;)V public static final fun setLayer (Lspace/kscience/visionforge/solid/Solid;I)V - public static final fun setPosition (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/Point3D;)V - public static final fun setRotation (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/Point3D;)V - public static final fun setRotationOrder (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/RotationOrder;)V + public static final fun setPosition (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/Float32Vector3D;)V + public static final fun setQuaternion (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/kmath/complex/Quaternion;)V + public static final fun setQuaternionOrNull (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/kmath/complex/Quaternion;)V + public static final fun setRotation (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/Float32Vector3D;)V + public static final fun setRotationOrder (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/kmath/geometry/RotationOrder;)V public static final fun setRotationX (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/Number;)V public static final fun setRotationY (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/Number;)V public static final fun setRotationZ (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/Number;)V - public static final fun setScale (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/Point3D;)V + public static final fun setScale (Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/Float32Vector3D;)V public static final fun setScaleX (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/Number;)V public static final fun setScaleY (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/Number;)V public static final fun setScaleZ (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/Number;)V @@ -651,19 +767,16 @@ public final class space/kscience/visionforge/solid/SolidKt { public static final fun setZ (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/Number;)V } -public final class space/kscience/visionforge/solid/SolidLabel : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/VisionPropertyContainer { +public final class space/kscience/visionforge/solid/SolidLabel : space/kscience/visionforge/solid/SolidBase { public static final field Companion Lspace/kscience/visionforge/solid/SolidLabel$Companion; - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/lang/String;DLjava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Ljava/lang/String;DLjava/lang/String;)V public final fun getFontFamily ()Ljava/lang/String; public final fun getFontSize ()D public final fun getText ()Ljava/lang/String; - public static final fun write$Self (Lspace/kscience/visionforge/solid/SolidLabel;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/SolidLabel$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/SolidLabel$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/SolidLabel; @@ -678,8 +791,8 @@ public final class space/kscience/visionforge/solid/SolidLabel$Companion { } public final class space/kscience/visionforge/solid/SolidLabelKt { - public static final fun label (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Ljava/lang/Number;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidLabel; - public static synthetic fun label$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/String;Ljava/lang/Number;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidLabel; + public static final fun label (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Ljava/lang/Number;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidLabel; + public static synthetic fun label$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Ljava/lang/Number;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidLabel; } public final class space/kscience/visionforge/solid/SolidMaterial : space/kscience/dataforge/meta/Scheme { @@ -697,17 +810,26 @@ public final class space/kscience/visionforge/solid/SolidMaterial : space/kscien public final class space/kscience/visionforge/solid/SolidMaterial$Companion : space/kscience/dataforge/meta/SchemeSpec { public final fun getCOLOR_KEY ()Lspace/kscience/dataforge/names/Name; public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; + public final fun getEDGES_ENABLED_KEY ()Lspace/kscience/dataforge/names/Name; + public final fun getEDGES_KEY ()Lspace/kscience/dataforge/names/Name; + public final fun getEDGES_MATERIAL_KEY ()Lspace/kscience/dataforge/names/Name; + public final fun getEMISSIVE_COLOR_KEY ()Lspace/kscience/dataforge/names/Name; + public final fun getENABLED_KEY ()Lspace/kscience/dataforge/names/Name; public final fun getMATERIAL_COLOR_KEY ()Lspace/kscience/dataforge/names/Name; + public final fun getMATERIAL_EMISSIVE_COLOR_KEY ()Lspace/kscience/dataforge/names/Name; public final fun getMATERIAL_KEY ()Lspace/kscience/dataforge/names/Name; public final fun getMATERIAL_OPACITY_KEY ()Lspace/kscience/dataforge/names/Name; public final fun getMATERIAL_SPECULAR_COLOR_KEY ()Lspace/kscience/dataforge/names/Name; public final fun getMATERIAL_WIREFRAME_KEY ()Lspace/kscience/dataforge/names/Name; public final fun getOPACITY_KEY ()Lspace/kscience/dataforge/names/Name; public final fun getSPECULAR_COLOR_KEY ()Lspace/kscience/dataforge/names/Name; + public final fun getTYPE_KEY ()Lspace/kscience/dataforge/names/Name; public final fun getWIREFRAME_KEY ()Lspace/kscience/dataforge/names/Name; } public final class space/kscience/visionforge/solid/SolidMaterialKt { + public static final fun edges (Lspace/kscience/visionforge/solid/Solid;ZLkotlin/jvm/functions/Function1;)V + public static synthetic fun edges$default (Lspace/kscience/visionforge/solid/Solid;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public static final fun getColor (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/visionforge/solid/ColorAccessor; public static final fun getMaterial (Lspace/kscience/visionforge/solid/Solid;)Lspace/kscience/visionforge/solid/SolidMaterial; public static final fun getOpacity (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/Number; @@ -716,87 +838,80 @@ public final class space/kscience/visionforge/solid/SolidMaterialKt { public static final fun setOpacity (Lspace/kscience/visionforge/solid/Solid;Ljava/lang/Number;)V } -public abstract interface class space/kscience/visionforge/solid/SolidReference : space/kscience/visionforge/VisionGroup { - public fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value; - public abstract fun getPrototype ()Lspace/kscience/visionforge/solid/Solid; -} - -public final class space/kscience/visionforge/solid/SolidReferenceGroup : space/kscience/visionforge/VisionBase, space/kscience/visionforge/VisionGroup, space/kscience/visionforge/solid/Solid, space/kscience/visionforge/solid/SolidReference { - public static final field Companion Lspace/kscience/visionforge/solid/SolidReferenceGroup$Companion; +public final class space/kscience/visionforge/solid/SolidReference : space/kscience/visionforge/VisionGroup, space/kscience/visionforge/solid/Solid { + public static final field Companion Lspace/kscience/visionforge/solid/SolidReference$Companion; public static final field REFERENCE_CHILD_PROPERTY_PREFIX Ljava/lang/String; - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/dataforge/names/Name;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Lspace/kscience/dataforge/names/Name;)V - public fun getChildren ()Ljava/util/Map; + public fun getChildren ()Lspace/kscience/visionforge/VisionChildren; public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; - public fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value; - public fun getPrototype ()Lspace/kscience/visionforge/solid/Solid; - public final fun getRefName ()Lspace/kscience/dataforge/names/Name; - public static final fun write$Self (Lspace/kscience/visionforge/solid/SolidReferenceGroup;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public fun getParent ()Lspace/kscience/visionforge/Vision; + public fun getProperties ()Lspace/kscience/visionforge/MutableVisionProperties; + public final fun getPrototype ()Lspace/kscience/visionforge/solid/Solid; + public final fun getPrototypeName ()Lspace/kscience/dataforge/names/Name; + public fun setParent (Lspace/kscience/visionforge/Vision;)V } -public final class space/kscience/visionforge/solid/SolidReferenceGroup$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lspace/kscience/visionforge/solid/SolidReferenceGroup$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; +public final class space/kscience/visionforge/solid/SolidReference$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/SolidReference$$serializer; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/SolidReferenceGroup; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/SolidReference; public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/SolidReferenceGroup;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/SolidReference;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } -public final class space/kscience/visionforge/solid/SolidReferenceGroup$Companion { +public final class space/kscience/visionforge/solid/SolidReference$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class space/kscience/visionforge/solid/SolidReferenceKt { - public static final fun getUnref (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/solid/Solid; - public static final fun newRef (Lspace/kscience/visionforge/solid/SolidGroup;Ljava/lang/String;Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/PrototypeHolder;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/solid/SolidReferenceGroup; - public static synthetic fun newRef$default (Lspace/kscience/visionforge/solid/SolidGroup;Ljava/lang/String;Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/PrototypeHolder;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidReferenceGroup; - public static final fun ref (Lspace/kscience/visionforge/solid/SolidGroup;Ljava/lang/String;Ljava/lang/String;)Lspace/kscience/visionforge/solid/SolidReferenceGroup; - public static final fun ref (Lspace/kscience/visionforge/solid/SolidGroup;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)Lspace/kscience/visionforge/solid/SolidReferenceGroup; - public static synthetic fun ref$default (Lspace/kscience/visionforge/solid/SolidGroup;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidReferenceGroup; - public static synthetic fun ref$default (Lspace/kscience/visionforge/solid/SolidGroup;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidReferenceGroup; + public static final fun getPrototype (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/solid/Solid; + public static final fun newRef (Lspace/kscience/visionforge/solid/SolidGroup;Ljava/lang/String;Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/SolidGroup;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/solid/SolidReference; + public static synthetic fun newRef$default (Lspace/kscience/visionforge/solid/SolidGroup;Ljava/lang/String;Lspace/kscience/visionforge/solid/Solid;Lspace/kscience/visionforge/solid/SolidGroup;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidReference; + public static final fun ref (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)Lspace/kscience/visionforge/solid/SolidReference; + public static final fun ref (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/solid/SolidReference; + public static synthetic fun ref$default (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidReference; } -public final class space/kscience/visionforge/solid/Solids : space/kscience/visionforge/VisionPlugin { +public final class space/kscience/visionforge/solid/Solids : space/kscience/visionforge/VisionPlugin, space/kscience/visionforge/MutableVisionContainer { public static final field Companion Lspace/kscience/visionforge/solid/Solids$Companion; public fun (Lspace/kscience/dataforge/meta/Meta;)V public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; + public synthetic fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V + public fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/solid/Solid;)V } public final class space/kscience/visionforge/solid/Solids$Companion : space/kscience/dataforge/context/PluginFactory { + public synthetic fun build (Lspace/kscience/dataforge/context/Context;Lspace/kscience/dataforge/meta/Meta;)Ljava/lang/Object; + public fun build (Lspace/kscience/dataforge/context/Context;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/visionforge/solid/Solids; public final fun decodeFromString (Ljava/lang/String;)Lspace/kscience/visionforge/solid/Solid; public final fun encodeToString (Lspace/kscience/visionforge/solid/Solid;)Ljava/lang/String; public final fun getSerializersModuleForSolids ()Lkotlinx/serialization/modules/SerializersModule; public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; - public fun getType ()Lkotlin/reflect/KClass; - public synthetic fun invoke (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;)Ljava/lang/Object; - public fun invoke (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;)Lspace/kscience/visionforge/solid/Solids; } public final class space/kscience/visionforge/solid/SolidsKt { - public static final fun solid (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidGroup; + public static final fun solid (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidGroup; + public static final fun solid (Lspace/kscience/visionforge/html/VisionOutput;Lspace/kscience/visionforge/solid/specifications/Canvas3DOptions;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SolidGroup; + public static synthetic fun solid$default (Lspace/kscience/visionforge/html/VisionOutput;Lspace/kscience/visionforge/solid/specifications/Canvas3DOptions;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SolidGroup; } -public final class space/kscience/visionforge/solid/Sphere : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/VisionPropertyContainer, space/kscience/visionforge/solid/GeometrySolid { +public final class space/kscience/visionforge/solid/Sphere : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/solid/GeometrySolid { public static final field Companion Lspace/kscience/visionforge/solid/Sphere$Companion; public fun (FFFFF)V public synthetic fun (FFFFFILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;FFFFFLkotlinx/serialization/internal/SerializationConstructorMarker;)V public final fun getPhi ()F public final fun getPhiStart ()F public final fun getRadius ()F public final fun getTheta ()F public final fun getThetaStart ()F public fun toGeometry (Lspace/kscience/visionforge/solid/GeometryBuilder;)V - public static final fun write$Self (Lspace/kscience/visionforge/solid/Sphere;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/Sphere$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/Sphere$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Sphere; @@ -811,15 +926,14 @@ public final class space/kscience/visionforge/solid/Sphere$Companion { } public final class space/kscience/visionforge/solid/SphereKt { - public static final fun sphere (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Sphere; - public static synthetic fun sphere$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Sphere; + public static final fun sphere (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Sphere; + public static synthetic fun sphere$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Sphere; } public final class space/kscience/visionforge/solid/SphereLayer : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/solid/GeometrySolid { public static final field Companion Lspace/kscience/visionforge/solid/SphereLayer$Companion; public fun (FFFFFF)V public synthetic fun (FFFFFFILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;FFFFFFLkotlinx/serialization/internal/SerializationConstructorMarker;)V public final fun getInnerRadius ()F public final fun getOuterRadius ()F public final fun getPhi ()F @@ -827,12 +941,10 @@ public final class space/kscience/visionforge/solid/SphereLayer : space/kscience public final fun getTheta ()F public final fun getThetaStart ()F public fun toGeometry (Lspace/kscience/visionforge/solid/GeometryBuilder;)V - public static final fun write$Self (Lspace/kscience/visionforge/solid/SphereLayer;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class space/kscience/visionforge/solid/SphereLayer$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lspace/kscience/visionforge/solid/SphereLayer$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/SphereLayer; @@ -847,14 +959,138 @@ public final class space/kscience/visionforge/solid/SphereLayer$Companion { } public final class space/kscience/visionforge/solid/SphereLayerKt { - public static final fun sphereLayer (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SphereLayer; - public static synthetic fun sphereLayer$default (Lspace/kscience/visionforge/VisionContainerBuilder;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SphereLayer; + public static final fun sphereLayer (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/SphereLayer; + public static synthetic fun sphereLayer$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/SphereLayer; } -public final class space/kscience/visionforge/solid/specifications/Axes : space/kscience/dataforge/meta/Scheme { +public final class space/kscience/visionforge/solid/StlBinarySolid : space/kscience/visionforge/solid/StlSolid { + public static final field Companion Lspace/kscience/visionforge/solid/StlBinarySolid$Companion; + public fun ([B)V + public final fun getData ()[B +} + +public final class space/kscience/visionforge/solid/StlBinarySolid$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/StlBinarySolid$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/StlBinarySolid; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/StlBinarySolid;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/StlBinarySolid$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public abstract class space/kscience/visionforge/solid/StlSolid : space/kscience/visionforge/solid/SolidBase { +} + +public final class space/kscience/visionforge/solid/StlSolidKt { + public static final fun stl (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/StlSolid; + public static synthetic fun stl$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/StlSolid; +} + +public final class space/kscience/visionforge/solid/StlUrlSolid : space/kscience/visionforge/solid/StlSolid { + public static final field Companion Lspace/kscience/visionforge/solid/StlUrlSolid$Companion; + public fun (Ljava/lang/String;)V + public final fun getUrl ()Ljava/lang/String; +} + +public final class space/kscience/visionforge/solid/StlUrlSolid$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/StlUrlSolid$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/StlUrlSolid; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/StlUrlSolid;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/StlUrlSolid$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/Surface : space/kscience/visionforge/solid/SolidBase, space/kscience/visionforge/solid/GeometrySolid { + public static final field Companion Lspace/kscience/visionforge/solid/Surface$Companion; + public static final field TYPE Ljava/lang/String; + public fun (Ljava/util/List;)V + public final fun getLayers ()Ljava/util/List; + public fun toGeometry (Lspace/kscience/visionforge/solid/GeometryBuilder;)V +} + +public final class space/kscience/visionforge/solid/Surface$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/Surface$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Surface; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/Surface;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/Surface$Builder { + public fun ()V + public fun (Ljava/util/List;Lspace/kscience/dataforge/meta/MutableMeta;)V + public synthetic fun (Ljava/util/List;Lspace/kscience/dataforge/meta/MutableMeta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun getLayers ()Ljava/util/List; + public final fun getProperties ()Lspace/kscience/dataforge/meta/MutableMeta; + public final fun layer (Ljava/lang/Number;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun layer$default (Lspace/kscience/visionforge/solid/Surface$Builder;Ljava/lang/Number;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun setLayers (Ljava/util/List;)V +} + +public final class space/kscience/visionforge/solid/Surface$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/Surface$Layer { + public static final field Companion Lspace/kscience/visionforge/solid/Surface$Layer$Companion; + public fun (FLjava/util/List;Ljava/util/List;)V + public final fun component1 ()F + public final fun component2 ()Ljava/util/List; + public final fun component3 ()Ljava/util/List; + public final fun copy (FLjava/util/List;Ljava/util/List;)Lspace/kscience/visionforge/solid/Surface$Layer; + public static synthetic fun copy$default (Lspace/kscience/visionforge/solid/Surface$Layer;FLjava/util/List;Ljava/util/List;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Surface$Layer; + public fun equals (Ljava/lang/Object;)Z + public final fun getCenter ()Lspace/kscience/visionforge/solid/Float32Vector3D; + public final fun getInner ()Ljava/util/List; + public final fun getOuter ()Ljava/util/List; + public final fun getSize ()I + public final fun getZ ()F + public fun hashCode ()I + public final fun innerPoints ()Ljava/util/List; + public final fun outerPoints ()Ljava/util/List; + public fun toString ()Ljava/lang/String; +} + +public final class space/kscience/visionforge/solid/Surface$Layer$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/solid/Surface$Layer$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/solid/Surface$Layer; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/solid/Surface$Layer;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/Surface$Layer$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/solid/SurfaceKt { + public static final fun surface (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/solid/Surface; + public static synthetic fun surface$default (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/solid/Surface; +} + +public final class space/kscience/visionforge/solid/specifications/AxesScheme : space/kscience/dataforge/meta/Scheme { public static final field AXIS_SIZE D public static final field AXIS_WIDTH D - public static final field Companion Lspace/kscience/visionforge/solid/specifications/Axes$Companion; + public static final field Companion Lspace/kscience/visionforge/solid/specifications/AxesScheme$Companion; public fun ()V public final fun getSize ()D public final fun getVisible ()Z @@ -864,12 +1100,12 @@ public final class space/kscience/visionforge/solid/specifications/Axes : space/ public final fun setWidth (D)V } -public final class space/kscience/visionforge/solid/specifications/Axes$Companion : space/kscience/dataforge/meta/SchemeSpec { +public final class space/kscience/visionforge/solid/specifications/AxesScheme$Companion : space/kscience/dataforge/meta/SchemeSpec { public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; } -public final class space/kscience/visionforge/solid/specifications/Camera : space/kscience/dataforge/meta/Scheme { - public static final field Companion Lspace/kscience/visionforge/solid/specifications/Camera$Companion; +public final class space/kscience/visionforge/solid/specifications/CameraScheme : space/kscience/dataforge/meta/Scheme { + public static final field Companion Lspace/kscience/visionforge/solid/specifications/CameraScheme$Companion; public static final field FAR_CLIP D public static final field FIELD_OF_VIEW I public static final field INITIAL_AZIMUTH D @@ -891,31 +1127,29 @@ public final class space/kscience/visionforge/solid/specifications/Camera : spac public final fun setNearClip (D)V } -public final class space/kscience/visionforge/solid/specifications/Camera$Companion : space/kscience/dataforge/meta/SchemeSpec { +public final class space/kscience/visionforge/solid/specifications/CameraScheme$Companion : space/kscience/dataforge/meta/SchemeSpec { public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; } -public final class space/kscience/visionforge/solid/specifications/CameraKt { - public static final fun getZenith (Lspace/kscience/visionforge/solid/specifications/Camera;)D +public final class space/kscience/visionforge/solid/specifications/CameraSchemeKt { + public static final fun getZenith (Lspace/kscience/visionforge/solid/specifications/CameraScheme;)D } public final class space/kscience/visionforge/solid/specifications/Canvas3DOptions : space/kscience/dataforge/meta/Scheme { public static final field Companion Lspace/kscience/visionforge/solid/specifications/Canvas3DOptions$Companion; public fun ()V - public final fun getAxes ()Lspace/kscience/visionforge/solid/specifications/Axes; - public final fun getCamera ()Lspace/kscience/visionforge/solid/specifications/Camera; - public final fun getClipping ()Lspace/kscience/visionforge/solid/specifications/Clipping; - public final fun getControls ()Lspace/kscience/visionforge/solid/specifications/Controls; + public final fun getAxes ()Lspace/kscience/visionforge/solid/specifications/AxesScheme; + public final fun getCamera ()Lspace/kscience/visionforge/solid/specifications/CameraScheme; + public final fun getClipping ()Lspace/kscience/visionforge/solid/specifications/PointScheme; + public final fun getControls ()Lspace/kscience/visionforge/solid/specifications/ControlsScheme; public final fun getLayers ()Ljava/util/List; - public final fun getLight ()Lspace/kscience/visionforge/solid/specifications/Light; public final fun getOnSelect ()Lkotlin/jvm/functions/Function1; public final fun getSize ()Lspace/kscience/visionforge/solid/specifications/CanvasSize; - public final fun setAxes (Lspace/kscience/visionforge/solid/specifications/Axes;)V - public final fun setCamera (Lspace/kscience/visionforge/solid/specifications/Camera;)V - public final fun setClipping (Lspace/kscience/visionforge/solid/specifications/Clipping;)V - public final fun setControls (Lspace/kscience/visionforge/solid/specifications/Controls;)V + public final fun setAxes (Lspace/kscience/visionforge/solid/specifications/AxesScheme;)V + public final fun setCamera (Lspace/kscience/visionforge/solid/specifications/CameraScheme;)V + public final fun setClipping (Lspace/kscience/visionforge/solid/specifications/PointScheme;)V + public final fun setControls (Lspace/kscience/visionforge/solid/specifications/ControlsScheme;)V public final fun setLayers (Ljava/util/List;)V - public final fun setLight (Lspace/kscience/visionforge/solid/specifications/Light;)V public final fun setOnSelect (Lkotlin/jvm/functions/Function1;)V public final fun setSize (Lspace/kscience/visionforge/solid/specifications/CanvasSize;)V } @@ -950,8 +1184,21 @@ public final class space/kscience/visionforge/solid/specifications/CanvasSize$Co public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; } -public final class space/kscience/visionforge/solid/specifications/Clipping : space/kscience/dataforge/meta/Scheme { - public static final field Companion Lspace/kscience/visionforge/solid/specifications/Clipping$Companion; +public final class space/kscience/visionforge/solid/specifications/Clipping : space/kscience/dataforge/meta/SchemeSpec { + public static final field INSTANCE Lspace/kscience/visionforge/solid/specifications/Clipping; + public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; +} + +public final class space/kscience/visionforge/solid/specifications/ControlsScheme : space/kscience/dataforge/meta/Scheme { + public static final field Companion Lspace/kscience/visionforge/solid/specifications/ControlsScheme$Companion; + public fun ()V +} + +public final class space/kscience/visionforge/solid/specifications/ControlsScheme$Companion : space/kscience/dataforge/meta/SchemeSpec { +} + +public final class space/kscience/visionforge/solid/specifications/PointScheme : space/kscience/dataforge/meta/Scheme { + public static final field Companion Lspace/kscience/visionforge/solid/specifications/PointScheme$Companion; public fun ()V public final fun getX ()Ljava/lang/Double; public final fun getY ()Ljava/lang/Double; @@ -961,24 +1208,11 @@ public final class space/kscience/visionforge/solid/specifications/Clipping : sp public final fun setZ (Ljava/lang/Double;)V } -public final class space/kscience/visionforge/solid/specifications/Clipping$Companion : space/kscience/dataforge/meta/SchemeSpec { - public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor; +public final class space/kscience/visionforge/solid/specifications/PointScheme$Companion : space/kscience/dataforge/meta/SchemeSpec { } -public final class space/kscience/visionforge/solid/specifications/Controls : space/kscience/dataforge/meta/Scheme { - public static final field Companion Lspace/kscience/visionforge/solid/specifications/Controls$Companion; - public fun ()V -} - -public final class space/kscience/visionforge/solid/specifications/Controls$Companion : space/kscience/dataforge/meta/SchemeSpec { -} - -public final class space/kscience/visionforge/solid/specifications/Light : space/kscience/dataforge/meta/Scheme { - public static final field Companion Lspace/kscience/visionforge/solid/specifications/Light$Companion; - public fun ()V -} - -public final class space/kscience/visionforge/solid/specifications/Light$Companion : space/kscience/dataforge/meta/SchemeSpec { +public final class space/kscience/visionforge/solid/specifications/PointSchemeKt { + public static final fun invoke (Lspace/kscience/visionforge/solid/specifications/PointScheme;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;)V } public abstract class space/kscience/visionforge/solid/transform/VisualTreeTransform { diff --git a/visionforge-tables/README.md b/visionforge-tables/README.md index 6cdbd356..b02284f8 100644 --- a/visionforge-tables/README.md +++ b/visionforge-tables/README.md @@ -6,19 +6,8 @@ ## Artifact: -The Maven coordinates of this project are `space.kscience:visionforge-tables:0.2.0`. +The Maven coordinates of this project are `space.kscience:visionforge-tables:0.3.0-rc`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation 'space.kscience:visionforge-tables:0.2.0' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { @@ -27,6 +16,6 @@ repositories { } dependencies { - implementation("space.kscience:visionforge-tables:0.2.0") + implementation("space.kscience:visionforge-tables:0.3.0-rc") } ``` diff --git a/visionforge-threejs/README.md b/visionforge-threejs/README.md index 98c13b7a..3b26d996 100644 --- a/visionforge-threejs/README.md +++ b/visionforge-threejs/README.md @@ -6,19 +6,8 @@ ## Artifact: -The Maven coordinates of this project are `space.kscience:visionforge-threejs:0.2.0`. +The Maven coordinates of this project are `space.kscience:visionforge-threejs:0.3.0-rc`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation 'space.kscience:visionforge-threejs:0.2.0' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { @@ -27,6 +16,6 @@ repositories { } dependencies { - implementation("space.kscience:visionforge-threejs:0.2.0") + implementation("space.kscience:visionforge-threejs:0.3.0-rc") } ``` diff --git a/visionforge-threejs/visionforge-threejs-server/README.md b/visionforge-threejs/visionforge-threejs-server/README.md index 0b9d9e4e..16ac3520 100644 --- a/visionforge-threejs/visionforge-threejs-server/README.md +++ b/visionforge-threejs/visionforge-threejs-server/README.md @@ -6,19 +6,8 @@ ## Artifact: -The Maven coordinates of this project are `space.kscience:visionforge-threejs-server:0.2.0`. +The Maven coordinates of this project are `space.kscience:visionforge-threejs-server:0.3.0-rc`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation 'space.kscience:visionforge-threejs-server:0.2.0' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { @@ -27,6 +16,6 @@ repositories { } dependencies { - implementation("space.kscience:visionforge-threejs-server:0.2.0") + implementation("space.kscience:visionforge-threejs-server:0.3.0-rc") } ``` diff --git a/visionforge-threejs/visionforge-threejs-server/api/visionforge-threejs-server.api b/visionforge-threejs/visionforge-threejs-server/api/visionforge-threejs-server.api index d2d708d9..8d46c793 100644 --- a/visionforge-threejs/visionforge-threejs-server/api/visionforge-threejs-server.api +++ b/visionforge-threejs/visionforge-threejs-server/api/visionforge-threejs-server.api @@ -1,6 +1,6 @@ public final class space/kscience/visionforge/three/ServerExtensionsKt { - public static final fun getThreeJsHeader (Lspace/kscience/visionforge/html/Page$Companion;)Lkotlin/jvm/functions/Function1; - public static final fun makeThreeJsFile (Ljava/nio/file/Path;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;ZLkotlin/jvm/functions/Function1;)V - public static synthetic fun makeThreeJsFile$default (Ljava/nio/file/Path;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static final fun getThreeJsHeader (Lspace/kscience/visionforge/html/VisionPage$Companion;)Lspace/kscience/visionforge/html/HtmlFragment; + public static final fun makeThreeJsFile (Ljava/nio/file/Path;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;ZLspace/kscience/visionforge/html/HtmlVisionFragment;)V + public static synthetic fun makeThreeJsFile$default (Ljava/nio/file/Path;Ljava/lang/String;Lspace/kscience/visionforge/html/ResourceLocation;ZLspace/kscience/visionforge/html/HtmlVisionFragment;ILjava/lang/Object;)V } From e36e4abb7f6fa2e6d08b47be3d5da5ff08d1e3f3 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 18 Dec 2023 09:59:43 +0300 Subject: [PATCH 6/6] Advanced backwards events --- build.gradle.kts | 2 +- visionforge-core/api/visionforge-core.api | 50 ++++++++++-- .../kscience/visionforge/ControlVision.kt | 23 ++++++ .../kscience/visionforge/VisionClient.kt | 6 ++ .../kscience/visionforge/VisionManager.kt | 1 + .../kscience/visionforge/VisionProperties.kt | 6 +- .../kscience/visionforge/html/VisionOfHtml.kt | 18 +++-- .../visionforge/meta/VisionPropertyTest.kt | 4 +- .../kscience/visionforge/inputRenderers.kt | 80 +++++++------------ .../visionforge/solid/SolidPropertyTest.kt | 1 + 10 files changed, 122 insertions(+), 69 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 57e42d2b..5e015498 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ val dataforgeVersion by extra("0.7.1") allprojects { group = "space.kscience" - version = "0.3.0-RC" + version = "0.3.0" } subprojects { diff --git a/visionforge-core/api/visionforge-core.api b/visionforge-core/api/visionforge-core.api index 0cd2b904..89e926ec 100644 --- a/visionforge-core/api/visionforge-core.api +++ b/visionforge-core/api/visionforge-core.api @@ -225,6 +225,8 @@ public abstract interface class space/kscience/visionforge/ControlVision : space public final class space/kscience/visionforge/ControlVisionKt { public static final fun VisionClickEvent (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionClickEvent; public static synthetic fun VisionClickEvent$default (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionClickEvent; + public static final fun VisionInputEvent (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionInputEvent; + public static synthetic fun VisionInputEvent$default (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionInputEvent; public static final fun VisionValueChangeEvent (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionValueChangeEvent; public static synthetic fun VisionValueChangeEvent$default (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionValueChangeEvent; public static final fun onClick (Lspace/kscience/visionforge/ClickControl;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job; @@ -495,6 +497,7 @@ public final class space/kscience/visionforge/VisionClientKt { public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Ljava/lang/String;)V public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Z)V + public static final fun sendEventAsync (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/VisionEvent;)Lkotlinx/coroutines/Job; } public abstract interface class space/kscience/visionforge/VisionContainer { @@ -560,6 +563,30 @@ public final class space/kscience/visionforge/VisionGroupKt { public static synthetic fun group$default (Lspace/kscience/visionforge/MutableVisionContainer;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/SimpleVisionGroup; } +public final class space/kscience/visionforge/VisionInputEvent : space/kscience/visionforge/VisionControlEvent { + public static final field Companion Lspace/kscience/visionforge/VisionInputEvent$Companion; + public fun (Lspace/kscience/dataforge/meta/Meta;)V + public fun getMeta ()Lspace/kscience/dataforge/meta/Meta; + public final fun getName ()Lspace/kscience/dataforge/names/Name; + public final fun getValue ()Lspace/kscience/dataforge/meta/Value; + public fun toString ()Ljava/lang/String; +} + +public final class space/kscience/visionforge/VisionInputEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/visionforge/VisionInputEvent$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/VisionInputEvent; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/VisionInputEvent;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class space/kscience/visionforge/VisionInputEvent$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + public final class space/kscience/visionforge/VisionKt { public static final fun getVisible (Lspace/kscience/visionforge/Vision;)Ljava/lang/Boolean; public static final fun onPropertyChange (Lspace/kscience/visionforge/Vision;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job; @@ -649,8 +676,8 @@ public final class space/kscience/visionforge/VisionPropertiesKt { public static final fun get (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Meta; public static synthetic fun get$default (Lspace/kscience/visionforge/MutableVisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/MutableMeta; public static synthetic fun get$default (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Meta; - public static final fun getValue (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Value; - public static synthetic fun getValue$default (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Value; + public static final fun getValue (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;ZLjava/lang/Boolean;)Lspace/kscience/dataforge/meta/Value; + public static synthetic fun getValue$default (Lspace/kscience/visionforge/VisionProperties;Ljava/lang/String;ZLjava/lang/Boolean;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Value; public static final fun invoke (Lspace/kscience/visionforge/MutableVisionProperties;Lkotlin/jvm/functions/Function1;)V public static final fun remove (Lspace/kscience/visionforge/MutableVisionProperties;Ljava/lang/String;)V public static final fun remove (Lspace/kscience/visionforge/MutableVisionProperties;Lspace/kscience/dataforge/names/Name;)V @@ -781,8 +808,8 @@ public abstract class space/kscience/visionforge/html/VisionOfHtml : space/kscie public static final field Companion Lspace/kscience/visionforge/html/VisionOfHtml$Companion; public fun ()V public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public final fun getClasses ()Ljava/util/List; - public final fun setClasses (Ljava/util/List;)V + public final fun getClasses ()Ljava/util/Set; + public final fun setClasses (Ljava/util/Set;)V public static final synthetic fun write$Self (Lspace/kscience/visionforge/html/VisionOfHtml;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } @@ -813,9 +840,16 @@ public final class space/kscience/visionforge/html/VisionOfHtmlButton$Companion } public abstract class space/kscience/visionforge/html/VisionOfHtmlControl : space/kscience/visionforge/html/VisionOfHtml, space/kscience/visionforge/ControlVision { + public static final field Companion Lspace/kscience/visionforge/html/VisionOfHtmlControl$Companion; public fun ()V + public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun dispatchControlEvent (Lspace/kscience/visionforge/VisionControlEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun getControlEventFlow ()Lkotlinx/coroutines/flow/SharedFlow; + public static final synthetic fun write$Self (Lspace/kscience/visionforge/html/VisionOfHtmlControl;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V +} + +public final class space/kscience/visionforge/html/VisionOfHtmlControl$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class space/kscience/visionforge/html/VisionOfHtmlForm : space/kscience/visionforge/html/VisionOfHtmlControl { @@ -849,11 +883,9 @@ public final class space/kscience/visionforge/html/VisionOfHtmlFormKt { public class space/kscience/visionforge/html/VisionOfHtmlInput : space/kscience/visionforge/html/VisionOfHtmlControl { public static final field Companion Lspace/kscience/visionforge/html/VisionOfHtmlInput$Companion; - public synthetic fun (ILjava/lang/String;Lspace/kscience/visionforge/html/InputFeedbackMode;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public fun (Ljava/lang/String;Lspace/kscience/visionforge/html/InputFeedbackMode;)V - public synthetic fun (Ljava/lang/String;Lspace/kscience/visionforge/html/InputFeedbackMode;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V + public fun (Ljava/lang/String;)V public final fun getDisabled ()Z - public final fun getFeedbackMode ()Lspace/kscience/visionforge/html/InputFeedbackMode; public final fun getFieldName ()Ljava/lang/String; public final fun getInputType ()Ljava/lang/String; public final fun getValue ()Lspace/kscience/dataforge/meta/Value; @@ -891,6 +923,8 @@ public final class space/kscience/visionforge/html/VisionOfHtmlKt { public static synthetic fun htmlRangeField$default (Lspace/kscience/visionforge/html/VisionOutput;Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Number;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionOfRangeField; public static final fun htmlTextField (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/html/VisionOfTextField; public static synthetic fun htmlTextField$default (Lspace/kscience/visionforge/html/VisionOutput;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/visionforge/html/VisionOfTextField; + public static final fun onInput (Lspace/kscience/visionforge/html/VisionOfHtmlInput;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job; + public static synthetic fun onInput$default (Lspace/kscience/visionforge/html/VisionOfHtmlInput;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job; public static final fun onValueChange (Lspace/kscience/visionforge/html/VisionOfHtmlInput;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job; public static synthetic fun onValueChange$default (Lspace/kscience/visionforge/html/VisionOfHtmlInput;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job; } diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt index dc27662f..627a2aa1 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ControlVision.kt @@ -83,9 +83,32 @@ public class VisionValueChangeEvent(override val meta: Meta) : VisionControlEven override fun toString(): String = meta.toString() } + public fun VisionValueChangeEvent(value: Value?, name: Name? = null): VisionValueChangeEvent = VisionValueChangeEvent( Meta { this.value = value name?.let { set("name", it.toString()) } } ) + + +@Serializable +@SerialName("control.input") +public class VisionInputEvent(override val meta: Meta) : VisionControlEvent() { + + public val value: Value? get() = meta.value + + /** + * The name of a control that fired the event + */ + public val name: Name? get() = meta["name"]?.string?.parseAsName() + + override fun toString(): String = meta.toString() +} + +public fun VisionInputEvent(value: Value?, name: Name? = null): VisionInputEvent = VisionInputEvent( + Meta { + this.value = value + name?.let { set("name", it.toString()) } + } +) diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt index 7a62de7d..2d77dfd0 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionClient.kt @@ -1,5 +1,7 @@ package space.kscience.visionforge +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch import space.kscience.dataforge.context.Plugin import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.names.Name @@ -16,6 +18,10 @@ public interface VisionClient: Plugin { public fun notifyPropertyChanged(visionName: Name, propertyName: Name, item: Meta?) } +public fun VisionClient.sendEventAsync(targetName: Name, event: VisionEvent): Job = context.launch { + sendEvent(targetName, event) +} + public fun VisionClient.notifyPropertyChanged(visionName: Name, propertyName: String, item: Meta?) { notifyPropertyChanged(visionName, propertyName.parseAsName(true), item) } diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt index 9b5a21ac..84ed8286 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt @@ -85,6 +85,7 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta), MutableVisionCont subclass(VisionMetaEvent.serializer()) subclass(VisionClickEvent.serializer()) subclass(VisionValueChangeEvent.serializer()) + subclass(VisionInputEvent.serializer()) } } diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionProperties.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionProperties.kt index 3c375c62..b7a66625 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionProperties.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionProperties.kt @@ -265,14 +265,14 @@ public abstract class AbstractVisionProperties( public fun VisionProperties.getValue( name: String, - inherit: Boolean? = null, + inherit: Boolean, includeStyles: Boolean? = null, ): Value? = getValue(name.parseAsName(), inherit, includeStyles) /** * Get [Vision] property using key as a String */ -public fun VisionProperties.get( +public operator fun VisionProperties.get( name: String, inherit: Boolean? = null, includeStyles: Boolean? = null, @@ -292,7 +292,7 @@ public fun MutableVisionProperties.root( /** * Get [Vision] property using key as a String */ -public fun MutableVisionProperties.get( +public operator fun MutableVisionProperties.get( name: String, inherit: Boolean? = null, includeStyles: Boolean? = null, diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt index 0738ddc6..2bd7b9de 100644 --- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtml.kt @@ -12,15 +12,16 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import space.kscience.dataforge.meta.* import space.kscience.dataforge.names.asName -import space.kscience.visionforge.AbstractVision -import space.kscience.visionforge.ControlVision -import space.kscience.visionforge.VisionControlEvent -import space.kscience.visionforge.VisionValueChangeEvent +import space.kscience.visionforge.* @Serializable public abstract class VisionOfHtml : AbstractVision() { - public var classes: List by properties.stringList(*emptyArray()) + public var classes: Set + get() = properties.get(::classes.name,false).stringList?.toSet() ?: emptySet() + set(value) { + properties[::classes.name] = value.map { it.asValue() } + } } @Serializable @@ -58,6 +59,7 @@ public enum class InputFeedbackMode { NONE } +@Serializable public abstract class VisionOfHtmlControl: VisionOfHtml(), ControlVision{ @Transient @@ -76,7 +78,6 @@ public abstract class VisionOfHtmlControl: VisionOfHtml(), ControlVision{ @SerialName("html.input") public open class VisionOfHtmlInput( public val inputType: String, - public val feedbackMode: InputFeedbackMode = InputFeedbackMode.ONCHANGE, ) : VisionOfHtmlControl() { public var value: Value? by properties.value() public var disabled: Boolean by properties.boolean { false } @@ -92,6 +93,11 @@ public fun VisionOfHtmlInput.onValueChange( callback: suspend VisionValueChangeEvent.() -> Unit, ): Job = controlEventFlow.filterIsInstance().onEach(callback).launchIn(scope) +public fun VisionOfHtmlInput.onInput( + scope: CoroutineScope = manager?.context ?: error("Coroutine context is not resolved for $this"), + callback: suspend VisionInputEvent.() -> Unit, +): Job = controlEventFlow.filterIsInstance().onEach(callback).launchIn(scope) + @Suppress("UnusedReceiverParameter") public inline fun VisionOutput.htmlInput( inputType: String, diff --git a/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/meta/VisionPropertyTest.kt b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/meta/VisionPropertyTest.kt index b1ca970a..e8ebe406 100644 --- a/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/meta/VisionPropertyTest.kt +++ b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/meta/VisionPropertyTest.kt @@ -40,7 +40,7 @@ internal class VisionPropertyTest { @Test fun testPropertyEdit() { val vision = manager.group() - vision.properties.get("fff.ddd").apply { + vision.properties["fff.ddd"].apply { value = 2.asValue() } assertEquals(2, vision.properties.getValue("fff.ddd")?.int) @@ -50,7 +50,7 @@ internal class VisionPropertyTest { @Test fun testPropertyUpdate() { val vision = manager.group() - vision.properties.get("fff").updateWith(TestScheme) { + vision.properties["fff"].updateWith(TestScheme) { ddd = 2 } assertEquals(2, vision.properties.getValue("fff.ddd")?.int) diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt index 4112370a..3deb00da 100644 --- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/inputRenderers.kt @@ -1,18 +1,14 @@ package space.kscience.visionforge -import kotlinx.coroutines.launch import kotlinx.dom.clear import kotlinx.html.InputType import kotlinx.html.div import kotlinx.html.js.input import org.w3c.dom.HTMLElement import org.w3c.dom.HTMLInputElement -import org.w3c.dom.events.Event -import space.kscience.dataforge.meta.Value import space.kscience.dataforge.meta.asValue import space.kscience.dataforge.meta.double import space.kscience.dataforge.meta.string -import space.kscience.dataforge.names.Name import space.kscience.visionforge.html.* /** @@ -26,13 +22,6 @@ internal fun HTMLElement.subscribeToVision(vision: VisionOfHtml) { } } - -private fun VisionClient.sendInputEvent(name: Name, value: Value?) { - context.launch { - sendEvent(name, VisionValueChangeEvent(value, name)) - } -} - /** * Subscribes the HTML input element to a given vision. * @@ -62,16 +51,13 @@ internal val inputVisionRenderer: ElementVisionRenderer = ElementVisionRenderer< input { type = InputType.text }.also { htmlInputElement -> - val onEvent: (Event) -> Unit = { - client.sendInputEvent(name, htmlInputElement.value.asValue()) + + htmlInputElement.onchange = { + client.sendEventAsync(name, VisionValueChangeEvent(htmlInputElement.value.asValue(), name)) } - - when (vision.feedbackMode) { - InputFeedbackMode.ONCHANGE -> htmlInputElement.onchange = onEvent - - InputFeedbackMode.ONINPUT -> htmlInputElement.oninput = onEvent - InputFeedbackMode.NONE -> {} + htmlInputElement.oninput = { + client.sendEventAsync(name, VisionInputEvent(htmlInputElement.value.asValue(), name)) } htmlInputElement.subscribeToInput(vision) @@ -86,18 +72,16 @@ internal val checkboxVisionRenderer: ElementVisionRenderer = input { type = InputType.checkBox }.also { htmlInputElement -> - val onEvent: (Event) -> Unit = { - client.sendInputEvent(name, htmlInputElement.checked.asValue()) + + htmlInputElement.onchange = { + client.sendEventAsync(name, VisionValueChangeEvent(htmlInputElement.value.asValue(), name)) } - - when (vision.feedbackMode) { - InputFeedbackMode.ONCHANGE -> htmlInputElement.onchange = onEvent - - InputFeedbackMode.ONINPUT -> htmlInputElement.oninput = onEvent - InputFeedbackMode.NONE -> {} + htmlInputElement.oninput = { + client.sendEventAsync(name, VisionInputEvent(htmlInputElement.value.asValue(), name)) } + htmlInputElement.subscribeToInput(vision) vision.useProperty(VisionOfCheckbox::checked) { htmlInputElement.checked = it ?: false @@ -110,16 +94,13 @@ internal val textVisionRenderer: ElementVisionRenderer = input { type = InputType.text }.also { htmlInputElement -> - val onEvent: (Event) -> Unit = { - client.sendInputEvent(name, htmlInputElement.value.asValue()) + + htmlInputElement.onchange = { + client.sendEventAsync(name, VisionValueChangeEvent(htmlInputElement.value.asValue(), name)) } - - when (vision.feedbackMode) { - InputFeedbackMode.ONCHANGE -> htmlInputElement.onchange = onEvent - - InputFeedbackMode.ONINPUT -> htmlInputElement.oninput = onEvent - InputFeedbackMode.NONE -> {} + htmlInputElement.oninput = { + client.sendEventAsync(name, VisionInputEvent(htmlInputElement.value.asValue(), name)) } htmlInputElement.subscribeToInput(vision) @@ -135,18 +116,19 @@ internal val numberVisionRenderer: ElementVisionRenderer = type = InputType.number }.also { htmlInputElement -> - val onEvent: (Event) -> Unit = { + htmlInputElement.onchange = { htmlInputElement.value.toDoubleOrNull()?.let { - client.sendInputEvent(name, htmlInputElement.value.asValue()) + client.sendEventAsync(name, VisionValueChangeEvent(it.asValue(), name)) } } - when (vision.feedbackMode) { - InputFeedbackMode.ONCHANGE -> htmlInputElement.onchange = onEvent - - InputFeedbackMode.ONINPUT -> htmlInputElement.oninput = onEvent - InputFeedbackMode.NONE -> {} + htmlInputElement.oninput = { + htmlInputElement.value.toDoubleOrNull()?.let { + client.sendEventAsync(name, VisionInputEvent(it.asValue(), name)) + } } + + htmlInputElement.subscribeToInput(vision) vision.useProperty(VisionOfNumberField::value) { htmlInputElement.valueAsNumber = it?.double ?: 0.0 @@ -163,18 +145,18 @@ internal val rangeVisionRenderer: ElementVisionRenderer = step = vision.step.toString() }.also { htmlInputElement -> - val onEvent: (Event) -> Unit = { + htmlInputElement.onchange = { htmlInputElement.value.toDoubleOrNull()?.let { - client.sendInputEvent(name, htmlInputElement.value.asValue()) + client.sendEventAsync(name, VisionValueChangeEvent(it.asValue(), name)) } } - when (vision.feedbackMode) { - InputFeedbackMode.ONCHANGE -> htmlInputElement.onchange = onEvent - - InputFeedbackMode.ONINPUT -> htmlInputElement.oninput = onEvent - InputFeedbackMode.NONE -> {} + htmlInputElement.oninput = { + htmlInputElement.value.toDoubleOrNull()?.let { + client.sendEventAsync(name, VisionInputEvent(it.asValue(), name)) + } } + htmlInputElement.subscribeToInput(vision) vision.useProperty(VisionOfRangeField::value) { htmlInputElement.valueAsNumber = it?.double ?: 0.0 diff --git a/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPropertyTest.kt index 4991c12d..7b559ab7 100644 --- a/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPropertyTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPropertyTest.kt @@ -4,6 +4,7 @@ import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay import kotlinx.coroutines.test.runTest +import space.kscience.dataforge.meta.getValue import space.kscience.dataforge.meta.int import space.kscience.dataforge.meta.set import space.kscience.dataforge.meta.string