Bump to kotlin-wrappers 1.0.0-pre.662.

buildSrc/src/main/kotlin/Versions.kt

@@ -16,7 +16,7 @@ object Versions {
 
     // JS:
     const val kotlinxHtml = "0.9.1"
-    const val kotlinWrappers = "1.0.0-pre.648"
+    const val kotlinWrappers = "1.0.0-pre.662"
 
     // Test:
     const val junit = "5.8.1"

src/jsMain/kotlin/baaahs/View.kt

@@ -1,8 +1,10 @@
 package baaahs
 
-import web.canvas.RenderingContextId
+import web.canvas.CanvasRenderingContext2D
 import web.dom.DOMTokenList
 import web.dom.Element
+import web.gl.WebGL2RenderingContext
+import web.gl.WebGLRenderingContext
 import web.html.HTMLCanvasElement
 import web.html.HTMLElement
 
@@ -29,4 +31,6 @@ fun DOMTokenList.clear() {
 fun <T : HTMLElement> HTMLElement.first(className: String) : T =
     (getElementsByClassName(className)[0] as T?)!!
 
-fun HTMLCanvasElement.context2d() = this.getContext(RenderingContextId.canvas)!!
+fun HTMLCanvasElement.get2DContext() = this.getContext(CanvasRenderingContext2D.ID)!!
+fun HTMLCanvasElement.getWebGLContext() = this.getContext(WebGLRenderingContext.ID)
+fun HTMLCanvasElement.getWebGL2Context() = this.getContext(WebGL2RenderingContext.ID)

src/jsMain/kotlin/baaahs/app/ui/dev/DevModeToolbarMenuView.kt

@@ -44,7 +44,7 @@ private val DevModeToolbarMenuView = xComponent<DevModeToolbarMenuProps>("DevMod
                     lastStats = curStats
                     forceRender()
                 }
-            }, ms = 50)
+            }, timeout = 50)
 
             withCleanup {
                 clearInterval(callback)

src/jsMain/kotlin/baaahs/app/ui/editor/EditableManagerUiView.kt

@@ -5,8 +5,8 @@ import baaahs.app.ui.dialog.DialogStyles
 import baaahs.app.ui.dialog.dialogPanels
 import baaahs.ui.*
 import external.ErrorBoundary
-import external.mui.Portal
 import js.core.jso
+import mui.base.Portal
 import mui.icons.material.Redo
 import mui.icons.material.Undo
 import mui.material.*

src/jsMain/kotlin/baaahs/app/ui/gadgets/color/ColorWheel.kt

@@ -2,8 +2,8 @@ package baaahs.app.ui.gadgets.color
 
 import baaahs.Color
 import baaahs.geom.Vector2F
+import baaahs.get2DContext
 import web.canvas.CanvasRenderingContext2D
-import web.canvas.RenderingContextId
 import web.html.HTMLCanvasElement
 import kotlin.math.floor
 import kotlin.math.max
@@ -50,7 +50,7 @@ class ColorWheel(
     var harmonyMode: HarmonyMode = HarmonyMode.triad,
     var colors: Array<Color> = Array(3) { Color.WHITE }
 ) {
-    private val ctx = canvasEl.getContext(RenderingContextId.canvas) as CanvasRenderingContext2D
+    private val ctx = canvasEl.get2DContext()
 
     private var priorRadius: Int? = null
 

src/jsMain/kotlin/baaahs/app/ui/gadgets/color/ColorWheelView.kt

@@ -17,9 +17,9 @@ import react.dom.*
 import react.dom.events.MouseEvent
 import react.useRef
 import styled.inlineStyles
+import web.animations.requestAnimationFrame
 import web.html.HTMLCanvasElement
 import web.html.HTMLElement
-import web.timers.requestAnimationFrame
 import kotlin.math.min
 
 private const val pickerRadius = 12

src/jsMain/kotlin/baaahs/app/ui/layout/GridTabLayoutView.kt

@@ -22,10 +22,10 @@ import baaahs.ui.unaryPlus
 import baaahs.ui.xComponent
 import baaahs.unknown
 import baaahs.util.useResizeListener
-import external.mui.Portal
 import external.react_resizable.buildResizeHandle
 import kotlinx.css.*
 import materialui.icon
+import mui.base.Portal
 import mui.material.*
 import react.*
 import react.dom.div

src/jsMain/kotlin/baaahs/app/ui/preview/ClientPreview.kt

@@ -21,7 +21,7 @@ import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.w3c.dom.get
-import web.timers.requestAnimationFrame
+import web.animations.requestAnimationFrame
 
 class ClientPreview(
     model: Model,

src/jsMain/kotlin/baaahs/gl/JsGlBase.kt

@@ -1,11 +1,12 @@
 package baaahs.gl
 
 import baaahs.document
+import baaahs.getWebGL2Context
+import baaahs.getWebGLContext
 import com.danielgergely.kgl.Kgl
 import com.danielgergely.kgl.KglJs
-import org.khronos.webgl.ArrayBufferView
-import org.khronos.webgl.WebGLObject
-import web.canvas.RenderingContextId
+import org.khronos.webgl.WebGLRenderingContext
+import web.gl.WebGL2RenderingContext
 import web.html.HTMLCanvasElement
 import web.prompts.alert
 
@@ -16,7 +17,7 @@ actual object GlBase {
     class JsGlManager : GlManager() {
         override val available: Boolean by lazy {
             val canvas = document.createElement("canvas") as HTMLCanvasElement
-            val gl = canvas.getContext(RenderingContextId.webgl)
+            val gl = canvas.getWebGLContext()
             gl != null
         }
 
@@ -26,7 +27,7 @@ actual object GlBase {
         }
 
         fun createContext(canvas: HTMLCanvasElement, trace: Boolean = false): JsGlContext {
-            val webgl = canvas.getContext(RenderingContextId.webgl2) as WebGL2RenderingContext?
+            val webgl = canvas.getWebGL2Context()
             if (webgl == null) {
                 alert(
                     "Running GLSL shows on iOS requires WebGL 2.0.\n" +
@@ -37,7 +38,7 @@ actual object GlBase {
             }
             return JsGlContext(
                 canvas,
-                maybeTrace(KglJs(webgl), trace),
+                maybeTrace(KglJs(webgl.unsafeCast<WebGLRenderingContext>()), trace),
                 "300 es",
                 webgl
             )
@@ -75,11 +76,11 @@ actual object GlBase {
 
         /** Creates a related context with shared state and the given Kgl. */
         open fun requestAnimationFrame(callback: (Double) -> Unit) {
-            web.timers.requestAnimationFrame(callback)
+            web.animations.requestAnimationFrame(callback)
         }
 
         private fun ensureExtension(name: String, required: Boolean): Boolean {
-            val extension = webgl.getExtension(name)
+            val extension = webgl.getExtension(name) as Any?
             if (required && extension == null) {
                 alert("$name not supported")
                 throw Exception("$name not supported")
@@ -89,23 +90,21 @@ actual object GlBase {
     }
 }
 
-abstract external class WebGL2RenderingContext : com.danielgergely.kgl.WebGL2RenderingContext {
-    fun fenceSync(condition: Int, flags: Int): WebGLSync
-    fun clientWaitSync(sync: WebGLSync, flags: Int, timeout: Number): Int
-    fun deleteSync(sync: WebGLSync): WebGLSync
-    fun readPixels(x: Int, y: Int, width: Int, height: Int, format: Int, type: Int, offset: Int)
-    fun getBufferSubData(target: Int, srcByteOffset: Int, dstData: ArrayBufferView, dstOffset: Int, length: Int)
-
-    companion object {
-        val PIXEL_PACK_BUFFER: Int
-        val SYNC_GPU_COMMANDS_COMPLETE: Int
-        val ALREADY_SIGNALED: Int
-        val TIMEOUT_EXPIRED: Int
-        val CONDITION_SATISFIED: Int
-        val WAIT_FAILED: Int
-        val STATIC_READ: Int
-        val STREAM_READ: Int
-    }
-}
-
-external class WebGLSync : WebGLObject
+//abstract external class WebGL2RenderingContext : com.danielgergely.kgl.WebGL2RenderingContext {
+//    fun fenceSync(condition: Int, flags: Int): WebGLSync
+//    fun clientWaitSync(sync: WebGLSync, flags: Int, timeout: Number): Int
+//    fun deleteSync(sync: WebGLSync): WebGLSync
+//    fun readPixels(x: Int, y: Int, width: Int, height: Int, format: Int, type: Int, offset: Int)
+//    fun getBufferSubData(target: Int, srcByteOffset: Int, dstData: ArrayBufferView, dstOffset: Int, length: Int)
+//
+//    companion object {
+//        val PIXEL_PACK_BUFFER: Int
+//        val SYNC_GPU_COMMANDS_COMPLETE: Int
+//        val ALREADY_SIGNALED: Int
+//        val TIMEOUT_EXPIRED: Int
+//        val CONDITION_SATISFIED: Int
+//        val WAIT_FAILED: Int
+//        val STATIC_READ: Int
+//        val STREAM_READ: Int
+//    }
+//}

src/jsMain/kotlin/baaahs/gl/preview/MovingHeadPreview.kt

@@ -6,6 +6,7 @@ import baaahs.fixtures.FixtureTypeRenderPlan
 import baaahs.fixtures.NullTransport
 import baaahs.fixtures.ProgramRenderPlan
 import baaahs.fixtures.movingHeadFixture
+import baaahs.get2DContext
 import baaahs.gl.GlContext
 import baaahs.gl.glsl.GlslProgram
 import baaahs.gl.render.ComponentRenderEngine
@@ -15,11 +16,12 @@ import baaahs.model.MovingHead
 import baaahs.plugin.core.MovingHeadParams
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import web.canvas.CanvasRenderingContext2D
-import web.canvas.RenderingContextId
+import web.animations.requestAnimationFrame
 import web.html.HTMLCanvasElement
-import web.timers.requestAnimationFrame
-import kotlin.math.*
+import kotlin.math.PI
+import kotlin.math.cos
+import kotlin.math.roundToInt
+import kotlin.math.sin
 
 
 private val Float.short: String
@@ -50,7 +52,7 @@ class MovingHeadPreview(
             val fixture = movingHeadFixture(movingHead, 1, movingHead.name, NullTransport, movingHead.adapter)
             renderEngine.addFixture(fixture)
         }
-    private val context2d = canvas2d.getContext(RenderingContextId.canvas) as CanvasRenderingContext2D
+    private val context2d = canvas2d.get2DContext()
 
     override fun start() {
         running = true

src/jsMain/kotlin/baaahs/gl/preview/ProjectionPreview.kt

@@ -9,6 +9,7 @@ import baaahs.fixtures.NullTransport
 import baaahs.fixtures.ProgramRenderPlan
 import baaahs.geom.Vector2D
 import baaahs.geom.Vector3F
+import baaahs.get2DContext
 import baaahs.gl.GlContext
 import baaahs.gl.glsl.GlslProgram
 import baaahs.gl.render.ComponentRenderEngine
@@ -20,11 +21,9 @@ import baaahs.model.PixelArray
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import three.js.Vector2
-import web.canvas.CanvasRenderingContext2D
+import web.animations.requestAnimationFrame
 import web.canvas.Path2D
-import web.canvas.RenderingContextId
 import web.html.HTMLCanvasElement
-import web.timers.requestAnimationFrame
 
 class ProjectionPreview(
     canvas2d: HTMLCanvasElement,
@@ -75,7 +74,7 @@ class ProjectionPreview(
         }
     }
 
-    private val context2d = canvas2d.getContext(RenderingContextId.canvas) as CanvasRenderingContext2D
+    private val context2d = canvas2d.get2DContext()
 
     override fun start() {
         running = true

src/jsMain/kotlin/baaahs/gl/render/WebGL2ResultDeliveryStrategy.kt

@@ -3,16 +3,19 @@ package baaahs.gl.render
 import baaahs.document
 import baaahs.gl.GlBase
 import baaahs.gl.GlContext
-import baaahs.gl.WebGL2RenderingContext
-import baaahs.gl.WebGL2RenderingContext.Companion.PIXEL_PACK_BUFFER
-import baaahs.gl.WebGL2RenderingContext.Companion.STREAM_READ
-import baaahs.gl.WebGL2RenderingContext.Companion.SYNC_GPU_COMMANDS_COMPLETE
-import baaahs.gl.WebGLSync
 import baaahs.gl.result.ResultStorage
 import baaahs.internalTimerClock
 import com.danielgergely.kgl.Buffer
 import com.danielgergely.kgl.GlBuffer
+import com.danielgergely.kgl.Kgl
+import js.buffer.ArrayBufferView
 import kotlinx.coroutines.delay
+import web.gl.GLenum
+import web.gl.WebGL2RenderingContext
+import web.gl.WebGL2RenderingContext.Companion.PIXEL_PACK_BUFFER
+import web.gl.WebGL2RenderingContext.Companion.STREAM_READ
+import web.gl.WebGL2RenderingContext.Companion.SYNC_GPU_COMMANDS_COMPLETE
+import web.gl.WebGLSync
 
 actual fun pickResultDeliveryStrategy(gl: GlContext): ResultDeliveryStrategy {
     return SwitchingResultDeliveryStrategy(gl as GlBase.JsGlContext)
@@ -76,7 +79,9 @@ class WebGl2ResultDeliveryStrategy(private val gl: GlBase.JsGlContext) : ResultD
             gl.check { bindBuffer(PIXEL_PACK_BUFFER, glBuf) }
             gl.check {
                 webgl2.getBufferSubData(
-                    PIXEL_PACK_BUFFER, 0, cpuBuffer.getJsBufferWithOffset(), 0, 0
+                    PIXEL_PACK_BUFFER, 0,
+                    cpuBuffer.getJsBufferWithOffset().unsafeCast<ArrayBufferView>(),
+                    0, 0
                 )
             }
             gl.check { bindBuffer(PIXEL_PACK_BUFFER, null) }
@@ -86,12 +91,17 @@ class WebGl2ResultDeliveryStrategy(private val gl: GlBase.JsGlContext) : ResultD
     }
 }
 
+private fun Kgl.bindBuffer(target: GLenum, bufferId: GlBuffer?) =
+    bindBuffer(target as Int, bufferId)
+
 class FenceSync(private val gl: GlBase.JsGlContext) {
     private val webgl2 = gl.webgl
 
     private val fenceSync = gl.check { webgl2.fenceSync(SYNC_GPU_COMMANDS_COMPLETE, 0) }
 
     suspend fun await() {
+        fenceSync ?: error("Fence sync not supported.")
+
         gl.check { webgl2.flush() }
 
         val startTime = internalTimerClock.now()

src/jsMain/kotlin/baaahs/imaging/CanvasBitmap.kt

@@ -1,7 +1,7 @@
 package baaahs.imaging
 
 import baaahs.MediaDevices
-import baaahs.context2d
+import baaahs.get2DContext
 import com.danielgergely.kgl.ByteBuffer
 import org.khronos.webgl.ArrayBuffer
 import org.khronos.webgl.Uint8Array
@@ -15,7 +15,7 @@ open class CanvasBitmap(internal val canvas: HTMLCanvasElement) : Bitmap {
     override val width = canvas.width
     override val height = canvas.height
 
-    internal val ctx = canvas.context2d()
+    internal val ctx = canvas.get2DContext()
 
     override fun drawImage(image: Image) {
         (image as JsImage).draw(ctx, 0, 0)
@@ -113,7 +113,7 @@ open class CanvasBitmap(internal val canvas: HTMLCanvasElement) : Bitmap {
 
     override fun clone(): Bitmap {
         val newCanvas = createCanvas(canvas.width, canvas.height)
-        val ctx = newCanvas.context2d()
+        val ctx = newCanvas.get2DContext()
         ctx.drawImage(canvas, 0.0, 0.0)
         return CanvasBitmap(newCanvas)
     }