WIP: DriveRack

Author: xian

src/commonMain/kotlin/baaahs/Pinky.kt

@@ -2,6 +2,7 @@ package baaahs
 
 import baaahs.api.ws.WebSocketRouter
 import baaahs.dmx.Dmx
+import baaahs.driverack.DriveRack
 import baaahs.fixtures.Fixture
 import baaahs.fixtures.FixtureManager
 import baaahs.gl.RootToolchain
@@ -26,6 +27,7 @@ import baaahs.util.Logger
 import kotlinx.coroutines.*
 import kotlinx.serialization.Serializable
 import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 class Pinky(
     val model: Model,
@@ -54,12 +56,13 @@ class Pinky(
     override val coroutineContext: CoroutineContext = pinkyMainDispatcher + pinkyJob
 
     private val pubSub: PubSub.Server = PubSub.Server(httpServer, coroutineContext)
-    val gadgetManager = GadgetManager(pubSub, clock, coroutineContext)
+    private val driveRackBuilder = DriveRack(pubSub, EmptyCoroutineContext + Dispatchers.Default)
+    private val gadgetManager = GadgetManager(pubSub, clock, coroutineContext)
     internal val fixtureManager = FixtureManager(renderManager)
 
     val toolchain = RootToolchain(plugins)
     val stageManager: StageManager = StageManager(
-        toolchain, renderManager, pubSub, storage, fixtureManager, clock, model, gadgetManager
+        toolchain, renderManager, pubSub, storage, fixtureManager, clock, model, gadgetManager, driveRackBuilder
     )
 
     fun switchTo(newShow: Show?, file: Fs.File? = null) {

src/commonMain/kotlin/baaahs/PubSub.kt

@@ -395,6 +395,8 @@ abstract class PubSub {
         protected fun <T> buildTopicInfo(topic: Topic<T>): TopicInfo<T> {
             return TopicInfo(topic)
         }
+
+        abstract fun <T : Any?> openChannel(topic: Topic<T>, initialValue: T, onUpdate: (T) -> Unit): Channel<T>
     }
 
     class Server(httpServer: Network.HttpServer, private val handlerContext: CoroutineContext) : Endpoint() {
@@ -409,6 +411,10 @@ abstract class PubSub {
             }
         }
 
+        override fun <T> openChannel(topic: Topic<T>, initialValue: T, onUpdate: (T) -> Unit): Channel<T> {
+            return publish(topic, initialValue, onUpdate)
+        }
+
         fun <T : Any?> publish(topic: Topic<T>, data: T, onUpdate: (T) -> Unit): Channel<T> {
             val topicName = topic.name
 
@@ -544,6 +550,10 @@ abstract class PubSub {
             link.connectWebSocket(serverAddress, port, "/sm/ws", connectionToServer)
         }
 
+        override fun <T> openChannel(topic: Topic<T>, initialValue: T, onUpdate: (T) -> Unit): Channel<T> {
+            return subscribe(topic, onUpdate)
+        }
+
         @JsName("subscribe")
         fun <T> subscribe(topic: Topic<T>, onUpdateFn: (T) -> Unit): Channel<T> {
             val subscriber = Origin("Client-side subscriber at ${link.myAddress}")

src/commonMain/kotlin/baaahs/ShowPlayer.kt

@@ -1,5 +1,7 @@
 package baaahs
 
+import baaahs.driverack.Channel
+import baaahs.driverack.DriveRack
 import baaahs.gl.Toolchain
 import baaahs.gl.data.Feed
 import baaahs.gl.shader.OpenShader
@@ -13,9 +15,10 @@ import baaahs.show.live.ShowOpener
 
 interface ShowPlayer {
     val toolchain: Toolchain
+    val driveRack: DriveRack
 
     /**
-     * This is for [baaahs.plugin.CorePlugin.ModelInfoDataSource], but we should probably find
+     * This is for [baaahs.plugin.core.datasource.ModelInfoDataSource], but we should probably find
      * a better way to get it. Don't add more uses.
      */
     @Deprecated("Get it some other way", level = DeprecationLevel.WARNING)
@@ -24,6 +27,7 @@ interface ShowPlayer {
     fun <T : Gadget> registerGadget(id: String, gadget: T, controlledDataSource: DataSource? = null)
     fun <T : Gadget> useGadget(id: String): T = error("override me?")
     fun <T : Gadget> useGadget(dataSource: DataSource): T?
+    fun <T> useChannel(id: String): Channel<T> = error("override me?")
 
     fun openFeed(id: String, dataSource: DataSource): Feed
 

src/commonMain/kotlin/baaahs/ShowRunner.kt

@@ -1,5 +1,6 @@
 package baaahs
 
+import baaahs.driverack.RackMap
 import baaahs.fixtures.FixtureManager
 import baaahs.gl.render.RenderManager
 import baaahs.show.Show
@@ -16,6 +17,7 @@ class ShowRunner(
     private val fixtureManager: FixtureManager,
     private val updateProblems: (List<ShowProblem>) -> Unit
 ) {
+    val rackMap: RackMap get() = openShow.rackMap
     private var showState: ShowState = initialShowState ?: openShow.getShowState()
     private var activePatchSetChanged: Boolean = true
 

src/commonMain/kotlin/baaahs/StageManager.kt

@@ -1,8 +1,13 @@
 package baaahs
 
 import baaahs.app.ui.CommonIcons
+import baaahs.driverack.BusAlias
+import baaahs.driverack.Channel
+import baaahs.driverack.DriveRack
+import baaahs.driverack.RackMap
 import baaahs.fixtures.FixtureManager
 import baaahs.fixtures.RenderPlan
+import baaahs.gadgets.Slider
 import baaahs.gl.Toolchain
 import baaahs.gl.render.RenderManager
 import baaahs.io.Fs
@@ -16,6 +21,7 @@ import baaahs.show.Show
 import baaahs.show.buildEmptyShow
 import baaahs.ui.Icon
 import baaahs.ui.Observable
+import baaahs.ui.RemovableObserver
 import baaahs.ui.addObserver
 import baaahs.util.Clock
 import kotlinx.coroutines.CoroutineScope
@@ -64,7 +70,8 @@ class StageManager(
     private val fixtureManager: FixtureManager,
     private val clock: Clock,
     modelInfo: ModelInfo,
-    private val gadgetManager: GadgetManager
+    private val gadgetManager: GadgetManager,
+    override val driveRack: DriveRack
 ) : BaseShowPlayer(toolchain, modelInfo) {
     val facade = Facade()
     private var showRunner: ShowRunner? = null
@@ -82,6 +89,12 @@ class StageManager(
         }
     }
 
+    private val busA = driveRack.createBus("A")
+    private val busB = driveRack.createBus("B")
+    private val buses = listOf(busA, busB)
+    private val primary = BusAlias(busA)
+    private val secondary = BusAlias(busB)
+
     @Suppress("unused")
     private val clientData =
         pubSub.state(Topics.createClientData(fsSerializer), ClientData(storage.fs.rootFile))
@@ -105,8 +118,26 @@ class StageManager(
 
     private var gadgetsChangedJobEnqueued: Boolean = false
 
+    private var driveRackObservers = mutableListOf<RemovableObserver<*>>()
     override fun <T : Gadget> registerGadget(id: String, gadget: T, controlledDataSource: DataSource?) {
-        gadgetManager.registerGadget(id, gadget)
+        var registerWithGadgetManager = true
+
+        if (gadget is Slider) {
+            registerWithGadgetManager = false
+
+//            primary.channel<T>(id).addObserver {
+//                gadget.position = it.value as Float
+//            }
+
+//            buses.map { bus ->
+//                bus.channel<Any?>(id).addObserver {}
+//            }.also { driveRackObservers.addAll(it) }
+        }
+
+        if (registerWithGadgetManager) {
+            gadgetManager.registerGadget(id, gadget)
+        }
+
         super.registerGadget(id, gadget, controlledDataSource)
     }
 
@@ -121,6 +152,8 @@ class StageManager(
         return gadgetManager.useGadget(id)
     }
 
+    override fun <T> useChannel(id: String): Channel<T> = primary.channel(id)
+
     fun switchTo(
         newShow: Show?,
         newShowState: ShowState? = null,
@@ -139,6 +172,9 @@ class StageManager(
         releaseUnused()
 
         showRunner = newShowRunner
+
+        wireDriveRack(newShowRunner?.rackMap ?: RackMap.Empty)
+
         showEditSession.show = newShowRunner?.show
         showEditSession.showFile = file
         showEditSession.showIsUnsaved = isUnsaved
@@ -148,6 +184,22 @@ class StageManager(
         notifyOfShowChanges(fromClientUpdate)
     }
 
+    private fun wireDriveRack(rackMap: RackMap) {
+        driveRack.rackMap = rackMap
+
+//        rackMap.entries.map { entry ->
+//            Updatable(entry.initialValue).also { updatable ->
+//                primary.channel<Any?>(entry.id).addObserver { channel ->
+//                    updatable.value = channel.value
+//                }
+//            }
+//        }
+    }
+
+    class Updatable(
+        var value: Any? = null
+    )
+
     private fun updateRunningShowPath(file: Fs.File?) {
         GlobalScope.launch {
             storage.updateConfig {

src/commonMain/kotlin/baaahs/client/ClientStageManager.kt

@@ -1,19 +1,32 @@
 package baaahs.client
 
 import baaahs.*
+import baaahs.driverack.BusAlias
+import baaahs.driverack.DriveRack
 import baaahs.gl.Toolchain
 import baaahs.model.Model
 import baaahs.show.DataSource
 import baaahs.show.Show
 import baaahs.show.live.ActivePatchSet
 import baaahs.show.live.OpenShow
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.serialization.json.JsonElement
 
 class ClientStageManager(
     toolchain: Toolchain,
     private val pubSub: PubSub.Client,
     model: Model
 ) : BaseShowPlayer(toolchain, model) {
+    override val driveRack: DriveRack = DriveRack(pubSub, Dispatchers.Default /* TODO() */)
+
+    private val busA = driveRack.createBus("A")
+    private val busB = driveRack.createBus("B")
+    private val buses = listOf(busA, busB)
+    private val primary = BusAlias(busA)
+    private val secondary = BusAlias(busB)
+
     private val gadgets: MutableMap<String, ClientGadget> = mutableMapOf()
     private val listeners = mutableListOf<Listener>()
     private var openShow: OpenShow? = null
@@ -28,11 +41,14 @@ class ClientStageManager(
         return super.openShow(show, showState)
             .also {
                 openShow = it
+                driveRack.rackMap = it.rackMap
                 checkForChanges()
             }
     }
 
     override fun <T : Gadget> registerGadget(id: String, gadget: T, controlledDataSource: DataSource?) {
+        if (gadget is baaahs.gadgets.Slider) return
+
         gadgets[id] = ClientGadget(id, pubSub, gadget)
         super.registerGadget(id, gadget, controlledDataSource)
     }

src/commonMain/kotlin/baaahs/control/GadgetControl.kt

@@ -63,10 +63,11 @@ data class MutableGadgetControl(
         return OpenGadgetControl(randomId(gadget.title.camelize()), gadget, controlledDataSource)
     }
 }
-class OpenGadgetControl(
+
+open class OpenGadgetControl(
     override val id: String,
     override val gadget: Gadget,
-    val controlledDataSource: DataSource
+    private val controlledDataSource: DataSource
 ) : OpenControl {
     override fun controlledDataSources(): Set<DataSource> =
         setOf(controlledDataSource)

src/commonMain/kotlin/baaahs/control/SliderControl.kt

@@ -0,0 +1,98 @@
+package baaahs.control
+
+import baaahs.*
+import baaahs.app.ui.EditorPanel
+import baaahs.app.ui.editor.EditableManager
+import baaahs.driverack.Channel
+import baaahs.driverack.RackMap
+import baaahs.gadgets.Slider
+import baaahs.show.Control
+import baaahs.show.DataSource
+import baaahs.show.live.ControlProps
+import baaahs.show.live.OpenContext
+import baaahs.show.live.OpenControl
+import baaahs.show.live.controlViews
+import baaahs.show.mutable.MutableControl
+import baaahs.show.mutable.MutableShow
+import baaahs.show.mutable.ShowBuilder
+import baaahs.ui.View
+import baaahs.ui.addObserver
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+@SerialName("baaahs.Core:Slider")
+data class SliderControl(
+    val slider: Slider,
+    val controlledDataSourceId: String
+) : Control {
+    override val title: String
+        get() = slider.title
+
+    override fun suggestId(): String = controlledDataSourceId + "Slider"
+
+    override fun createMutable(mutableShow: MutableShow): MutableSliderControl {
+        return MutableSliderControl(slider, mutableShow.findDataSource(controlledDataSourceId).dataSource)
+    }
+
+    override fun allocateChannel(id: String): RackMap.Entry<Float> {
+        return RackMap.Entry(id, slider.initialValue, Float.serializer())
+    }
+
+    override fun open(
+        id: String,
+        openContext: OpenContext,
+        showPlayer: ShowPlayer
+    ): OpenControl {
+        val controlledDataSource = openContext.getDataSource(controlledDataSourceId)
+        val channel = showPlayer.useChannel<Float>(id)
+        return OpenSliderControl(id, slider, channel, controlledDataSource)
+    }
+}
+
+data class MutableSliderControl(
+    var slider: Slider,
+    val controlledDataSource: DataSource
+) : MutableControl {
+    override val title: String
+        get() = slider.title
+
+    override var asBuiltId: String? = null
+
+    override fun getEditorPanels(editableManager: EditableManager): List<EditorPanel> {
+        return emptyList()
+    }
+
+    override fun build(showBuilder: ShowBuilder): Control {
+        return SliderControl(slider, showBuilder.idFor(controlledDataSource))
+    }
+
+    // TODO: fix
+//    fun open(): OpenControl {
+//        return OpenSliderControl(randomId(slider.title.camelize()), slider, channel, controlledDataSource)
+//    }
+}
+
+class OpenSliderControl(
+    override val id: String,
+    val slider: Slider,
+    val channel: Channel<Float>,
+    val controlledDataSource: DataSource
+) : OpenControl {
+    override val gadget: Gadget = slider
+
+//    init {
+//        channel.addObserver {
+//
+//
+//        }
+//    }
+
+    override fun toNewMutable(mutableShow: MutableShow): MutableControl {
+        return MutableSliderControl(slider, controlledDataSource)
+    }
+
+    override fun getView(controlProps: ControlProps): View =
+        controlViews.forSlider(this, controlProps)
+}