Unverified Commit 492996b2 authored by Thai's avatar Thai Committed by GitHub

Fix SkiaJsSample build failed (#444)

parent 232a8c47
...@@ -4,16 +4,16 @@ import kotlinx.browser.document ...@@ -4,16 +4,16 @@ import kotlinx.browser.document
import org.jetbrains.skia.Canvas import org.jetbrains.skia.Canvas
import org.jetbrains.skia.Paint import org.jetbrains.skia.Paint
import org.jetbrains.skia.Rect import org.jetbrains.skia.Rect
import org.jetbrains.skiko.GenericSkikoApp import org.jetbrains.skiko.GenericSkikoView
import org.jetbrains.skiko.SkiaLayer import org.jetbrains.skiko.SkiaLayer
import org.jetbrains.skiko.SkiaRenderer import org.jetbrains.skiko.SkikoView
import org.jetbrains.skiko.wasm.onWasmReady import org.jetbrains.skiko.wasm.onWasmReady
import org.w3c.dom.HTMLCanvasElement import org.w3c.dom.HTMLCanvasElement
private class DemoApp: SkiaRenderer { private class DemoApp: SkikoView {
private val paint = Paint() private val paint = Paint()
override fun onRender(canvas: Canvas, width: Int, height: Int, currentTimestamp: Long) { override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
canvas.drawCircle(200f, 50f, 25f, paint) canvas.drawCircle(200f, 50f, 25f, paint)
canvas.drawLine(100f, 100f, 200f, 200f, paint) canvas.drawLine(100f, 100f, 200f, 200f, paint)
...@@ -33,8 +33,8 @@ fun main() { ...@@ -33,8 +33,8 @@ fun main() {
} else { } else {
BouncingBalls() BouncingBalls()
} }
skiaLayer.renderer = GenericSkikoApp(skiaLayer, app) skiaLayer.skikoView = GenericSkikoView(skiaLayer, app)
skiaLayer.setCanvas(canvas) skiaLayer.attachTo(canvas)
skiaLayer.needRedraw() skiaLayer.needRedraw()
} }
} }
......
...@@ -4,12 +4,12 @@ import org.jetbrains.skia.Canvas ...@@ -4,12 +4,12 @@ import org.jetbrains.skia.Canvas
import org.jetbrains.skia.Color4f import org.jetbrains.skia.Color4f
import org.jetbrains.skia.Paint import org.jetbrains.skia.Paint
import org.jetbrains.skia.PaintMode import org.jetbrains.skia.PaintMode
import org.jetbrains.skiko.SkiaRenderer import org.jetbrains.skiko.SkikoView
import kotlin.math.PI import kotlin.math.PI
import kotlin.math.cos import kotlin.math.cos
import kotlin.math.sin import kotlin.math.sin
class BouncingBalls: SkiaRenderer { class BouncingBalls: SkikoView {
private data class Circle(var x: Float, var y: Float, var r: Float) private data class Circle(var x: Float, var y: Float, var r: Float)
companion object { companion object {
...@@ -87,9 +87,9 @@ class BouncingBalls: SkiaRenderer { ...@@ -87,9 +87,9 @@ class BouncingBalls: SkiaRenderer {
Color4f(0f, 1f, 1f, 0.8f).asPaint() Color4f(0f, 1f, 1f, 0.8f).asPaint()
)) ))
override fun onRender(canvas: Canvas, width: Int, height: Int, currentTimestamp: Long) { override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
val dtime = (currentTimestamp - prevTimestamp) val dtime = (nanoTime - prevTimestamp)
prevTimestamp = currentTimestamp prevTimestamp = nanoTime
data.forEach { (ball, paint) -> data.forEach { (ball, paint) ->
ball.recalculate(width, height, dtime.toFloat()) ball.recalculate(width, height, dtime.toFloat())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment