WIP

Author: xian

data/Living Room.scene

@@ -21,7 +21,7 @@
             "deviceId": "192.168.1.9",
             "deviceName": "Light Panels 50:72:54",
             "accessToken": "xI2UVHZzcbuWWMIbig1Zv9NhajekW0oC",
-            "defaultFixtureConfig": {
+            "defaultFixtureOptions": {
                 "type": "PixelArray",
                 "pixelFormat": "RGB8"
             }

data/config.json

@@ -1,4 +1 @@
-{
-    "runningShowPath": "Playa 2022.sparkle",
-    "runningScenePath": "Living Room.scene"
-}
+{"runningShowPath":"Playa 2022.sparkle"}

src/commonMain/kotlin/baaahs/controller/NanoleafManager.kt

@@ -108,6 +108,7 @@ class NanoleafController(
 ) : Controller {
     private val upSince = clock.now()
     private var accessToken: String? = config?.accessToken
+        ?: nanoleafAdapter.getAccessToken(deviceMetadata,)
     private var device = accessToken?.let {
         nanoleafAdapter.openDevice(deviceMetadata, it)
     }
@@ -126,7 +127,7 @@ class NanoleafController(
             deviceMetadata.deviceId,
             accessToken
         )
-    override val defaultFixtureConfig: FixtureConfig?
+    override val defaultFixtureOptions: FixtureOptions?
         get() = null
     override val defaultTransportConfig: TransportConfig?
         get() = null
@@ -136,9 +137,7 @@ class NanoleafController(
     override fun createTransport(
         entity: Model.Entity?,
         fixtureConfig: FixtureConfig,
-        transportConfig: TransportConfig?,
-        componentCount: Int,
-        bytesPerComponent: Int
+        transportConfig: TransportConfig?
     ): Transport = object : Transport {
         override val name: String
             get() = deviceMetadata.deviceName
@@ -189,7 +188,7 @@ class NanoleafController(
 
         return listOf(
             FixtureMapping(null,
-                PixelArrayDevice.Config(
+                PixelArrayDevice.Options(
                     panels.size,
                     PixelFormat.RGB8,
                     pixelLocations = scaledPixelLocations
@@ -228,6 +227,7 @@ class NanoleafTransportConfig() : TransportConfig {
 expect class NanoleafAdapter(coroutineContext: CoroutineContext, clock: Clock) {
     fun start(callback: (NanoleafDeviceMetadata) -> Unit)
     fun stop()
+    fun getAccessToken(deviceMetadata: NanoleafDeviceMetadata): String
     fun openDevice(deviceMetadata: NanoleafDeviceMetadata, accessToken: String): NanoleafDevice
 }
 
@@ -274,7 +274,7 @@ data class NanoleafControllerConfig(
     override val deviceName: String,
     val accessToken: String? = null,
     override val fixtures: List<FixtureMappingData> = emptyList(),
-    override val defaultFixtureConfig: FixtureConfig? = null,
+    override val defaultFixtureOptions: FixtureOptions? = null,
     override val defaultTransportConfig: TransportConfig? = null
 ) : ControllerConfig, NanoleafDeviceMetadata {
     override val title: String get() = deviceName
@@ -299,19 +299,22 @@ data class NanoleafControllerConfig(
         }
     }
 
-    override fun createFixturePreview(fixtureConfig: FixtureConfig, transportConfig: TransportConfig): FixturePreview {
+    override fun createFixturePreview(
+        fixtureOptions: FixtureOptions,
+        transportConfig: TransportConfig
+    ): FixturePreview {
         val staticDmxMapping = dmxAllocator!!.allocate(
-            fixtureConfig.componentCount!!,
-            fixtureConfig.bytesPerComponent,
+            fixtureOptions.componentCount!!,
+            fixtureOptions.bytesPerComponent,
             transportConfig as DmxTransportConfig
         )
-        val dmxPreview = error("foo")
+//        val dmxPreview = error("foo")
 
         return object : FixturePreview {
-            override val fixtureConfig: ConfigPreview
-                get() = fixtureConfig.preview()
+            override val fixtureOptions: ConfigPreview
+                get() = fixtureOptions.preview()
             override val transportConfig: ConfigPreview
-                get() = dmxPreview
+                get() = transportConfig.preview()
         }
     }
 }
@@ -329,8 +332,8 @@ class MutableNanoleafControllerConfig(config: NanoleafControllerConfig) : Mutabl
 
     override val fixtures: MutableList<MutableFixtureMapping> =
         config.fixtures.map { it.edit() }.toMutableList()
-    override var defaultFixtureConfig: MutableFixtureConfig? =
-        config.defaultFixtureConfig?.edit()
+    override var defaultFixtureOptions: MutableFixtureOptions? =
+        config.defaultFixtureOptions?.edit()
     override var defaultTransportConfig: MutableTransportConfig? =
         config.defaultTransportConfig?.edit()
 
@@ -339,7 +342,7 @@ class MutableNanoleafControllerConfig(config: NanoleafControllerConfig) : Mutabl
             hostName, port, deviceId, deviceName,
             accessToken,
             fixtures.map { it.build() },
-            defaultFixtureConfig?.build(),
+            defaultFixtureOptions?.build(),
             defaultTransportConfig?.build()
         )
 

src/commonMain/kotlin/baaahs/device/PixelFormat.kt

@@ -116,6 +116,13 @@ enum class PixelFormat {
             setter(redF, greenF, blueF)
         }
 
+        override fun readColorInts(reader: ByteArrayReader, setter: (Int, Int, Int) -> Unit) {
+            val greenI = reader.readByte().asUnsignedToInt()
+            val redI = reader.readByte().asUnsignedToInt()
+            val blueI = reader.readByte().asUnsignedToInt()
+            setter(redI, greenI, blueI)
+        }
+
         override fun writeColor(color: Color, buf: ByteArrayWriter) {
             buf.writeByte(1) // Mode: manual dimming
             buf.writeByte(0) // Palette (garbage!)

src/commonMain/kotlin/baaahs/plugin/sound_analysis/SoundAnalysisPlugin.kt

@@ -382,7 +382,7 @@ class SoundAnalysisFeedContext(
             textureBuffer.position = 0
             textureBuffer = FloatBuffer(sampleBuffer)
         } catch (e: Exception) {
-            println("texture buffer size == ${textureBuffer.size}")
+//            println("texture buffer size == ${textureBuffer.size}")
             println("sample buffer size == ${sampleBuffer.size}")
             e.printStackTrace()
         }

src/jsMain/kotlin/baaahs/app/ui/controllers/NanoleafControllerEditorView.kt

@@ -6,12 +6,14 @@ import baaahs.scene.EditingController
 import baaahs.ui.unaryMinus
 import baaahs.ui.value
 import baaahs.ui.xComponent
-import kotlinx.js.jso
+import js.core.jso
 import mui.material.Container
 import mui.material.TextField
 import mui.system.sx
 import react.*
 import react.dom.onChange
+import web.cssom.Display
+import web.cssom.FlexDirection
 
 private val NanoleafControllerEditorView = xComponent<NanoleafControllerEditorProps>("NanoleafControllerEditor") { props ->
     val appContext = useContext(appContext)
@@ -42,8 +44,8 @@ private val NanoleafControllerEditorView = xComponent<NanoleafControllerEditorPr
     Container {
         attrs.classes = jso { root = -styles.propertiesEditSection }
         attrs.sx {
-            display = csstype.Display.flex
-            flexDirection = csstype.FlexDirection.column
+            display = Display.flex
+            flexDirection = FlexDirection.column
         }
 
         TextField {

src/jsMain/kotlin/baaahs/controller/NanoleafAdapter.kt

@@ -10,6 +10,10 @@ actual class NanoleafAdapter actual constructor(coroutineContext: CoroutineConte
     actual fun stop() {
     }
 
+    actual fun getAccessToken(deviceMetadata: NanoleafDeviceMetadata): String {
+        TODO("not implemented")
+    }
+
     actual fun openDevice(
         deviceMetadata: NanoleafDeviceMetadata,
         accessToken: String

src/jvmMain/kotlin/baaahs/controller/NanoleafAdapter.kt

@@ -37,6 +37,10 @@ actual class NanoleafAdapter actual constructor(
     actual fun stop() {
     }
 
+    actual fun getAccessToken(deviceMetadata: NanoleafDeviceMetadata): String {
+        return NanoleafSetup.createAccessToken(deviceMetadata.hostName, deviceMetadata.port)
+    }
+
     actual fun openDevice(
         deviceMetadata: NanoleafDeviceMetadata,
         accessToken: String
@@ -54,8 +58,6 @@ actual class NanoleafAdapter actual constructor(
         override val deviceName: String,
         val accessToken: String
     ) : baaahs.controller.NanoleafDevice {
-
-        //    val accessToken = NanoleafSetup.createAccessToken(meta.hostName, meta.port)
         //    val accessToken = "xI2UVHZzcbuWWMIbig1Zv9NhajekW0oC"
         val device: NanoleafDevice = NanoleafDevice.createDevice(hostName, port, accessToken)
             .also { it.enableExternalStreaming() }