From 3a87e434838eacb86affe7bf33c3f634f30a965b Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 5 May 2021 22:53:11 +0300 Subject: [PATCH] Remove global VisionForge object --- build.gradle.kts | 3 +-- .../kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cc4ff994..12596ced 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,14 +16,13 @@ allprojects { mavenCentral() jcenter() maven("https://repo.kotlin.link") - maven("https://dl.bintray.com/pdvrieze/maven") maven("https://maven.jzy3d.org/releases") maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") } group = "space.kscience" - version = "0.2.0-dev-15" + version = "0.2.0-dev-16" } subprojects { diff --git a/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt index fdcaca2e..4e727bb6 100644 --- a/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt +++ b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt @@ -4,6 +4,7 @@ import javafx.collections.FXCollections import javafx.scene.Parent import javafx.scene.control.Tab import space.kscience.dataforge.context.Global +import space.kscience.dataforge.context.fetch import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.names.Name import space.kscience.visionforge.VisionLayout @@ -23,7 +24,7 @@ class FXDemoGrid : View(title = "DataForge-vis FX demo"), VisionLayout { } } - private val fx3d = Global.plugins.fetch(FX3DPlugin) + private val fx3d = Global.fetch(FX3DPlugin) override fun render(name: Name, vision: Solid, meta: Meta) { outputs.getOrPut(name) { FXCanvas3D(fx3d, canvasOptions) }.render(vision)