Skip to content

S
skiko
Unverified Commit 239f685e authored by Nikolay Igotti's avatar Nikolay Igotti Committed by GitHub
Browse files
Options

Move to Skia m99-51988d0bc1 (#457) 

Co-authored-by: 's avatarAleksandr Veselov <aleksandr.veselov@jetbrains.com>
parent 83394aa1
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 278 deletions
skiko/gradle.properties
View file @ 239f685e
...@@ -3,15 +3,15 @@ deploy.version=0.0.0 ...@@ -3,15 +3,15 @@ deploy.version=0.0.0
kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false kotlin.native.enableDependencyPropagation=false
dependencies.skia.windows-x64=m97-0b898c4b8e dependencies.skia.windows-x64=m99-51988d0bc1
dependencies.skia.linux-x64=m97-0b898c4b8e dependencies.skia.linux-x64=m99-51988d0bc1
dependencies.skia.macos-x64=m97-0b898c4b8e dependencies.skia.macos-x64=m99-51988d0bc1
dependencies.skia.linux-arm64=m97-0b898c4b8e dependencies.skia.linux-arm64=m99-51988d0bc1
dependencies.skia.macos-arm64=m97-0b898c4b8e dependencies.skia.macos-arm64=m99-51988d0bc1
dependencies.skia.wasm-wasm=m97-0b898c4b8e dependencies.skia.wasm-wasm=m99-51988d0bc1
dependencies.skia.ios-x64=m97-0b898c4b8e dependencies.skia.ios-x64=m99-51988d0bc1
dependencies.skia.ios-arm64=m97-0b898c4b8e dependencies.skia.ios-arm64=m99-51988d0bc1
dependencies.skia.android-x64=m97-0b898c4b8e dependencies.skia.android-x64=m99-51988d0bc1
dependencies.skia.android-arm64=m97-0b898c4b8e dependencies.skia.android-arm64=m99-51988d0bc1
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
skiko/src/commonMain/kotlin/org/jetbrains/skia/Canvas.kt
View file @ 239f685e
...@@ -488,11 +488,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -488,11 +488,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
return this return this
} }
fun drawPicture(picture: Picture): Canvas { fun drawPicture(picture: Picture, matrix: Matrix33? = null, paint: Paint? = null): Canvas {
return drawPicture(picture, null, null)
}
fun drawPicture(picture: Picture, matrix: Matrix33?, paint: Paint?): Canvas {
Stats.onNativeCall() Stats.onNativeCall()
interopScope { interopScope {
_nDrawPicture(_ptr, getPtr(picture), toInterop(matrix?.mat), getPtr(paint)) _nDrawPicture(_ptr, getPtr(picture), toInterop(matrix?.mat), getPtr(paint))
...@@ -502,61 +498,6 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -502,61 +498,6 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
return this return this
} }
/**
*
* Draws a triangle mesh, using clip and Matrix.
*
*
* If paint contains an Shader, the shader is mapped using the vertices' positions.
*
*
* If vertices colors are defined in vertices, and Paint paint contains Shader,
* BlendMode mode combines vertices colors with Shader.
*
* @param positions triangle mesh to draw
* @param colors color array, one for each corner; may be null
* @param paint specifies the Shader, used as Vertices texture
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices_2](https://fiddle.skia.org/c/@Canvas_drawVertices_2)
*/
fun drawTriangles(positions: Array<Point>, colors: IntArray?, paint: Paint): Canvas {
return drawTriangles(positions, colors, null, null, BlendMode.MODULATE, paint)
}
/**
*
* Draws a triangle mesh, using clip and Matrix.
*
*
* If paint contains an Shader and vertices does not contain texCoords, the shader
* is mapped using the vertices' positions.
*
*
* If vertices colors are defined in vertices, and Paint paint contains Shader,
* BlendMode mode combines vertices colors with Shader.
*
* @param positions triangle mesh to draw
* @param colors color array, one for each corner; may be null
* @param texCoords Point array of texture coordinates, mapping Shader to corners; may be null
* @param indices with which indices points should be drawn; may be null
* @param paint specifies the Shader, used as Vertices texture
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices_2](https://fiddle.skia.org/c/@Canvas_drawVertices_2)
*/
fun drawTriangles(
positions: Array<Point>,
colors: IntArray?,
texCoords: Array<Point>?,
indices: ShortArray?,
paint: Paint
): Canvas {
return drawTriangles(positions, colors, texCoords, indices, BlendMode.MODULATE, paint)
}
/** /**
* *
* Draws a triangle mesh, using clip and Matrix. * Draws a triangle mesh, using clip and Matrix.
...@@ -573,7 +514,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -573,7 +514,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
* @param colors color array, one for each corner; may be null * @param colors color array, one for each corner; may be null
* @param texCoords Point array of texture coordinates, mapping Shader to corners; may be null * @param texCoords Point array of texture coordinates, mapping Shader to corners; may be null
* @param indices with which indices points should be drawn; may be null * @param indices with which indices points should be drawn; may be null
* @param mode combines vertices colors with Shader, if both are present * @param blendMode combines vertices colors with Shader, if both are present
* @param paint specifies the Shader, used as Vertices texture * @param paint specifies the Shader, used as Vertices texture
* *
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices) * @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
...@@ -582,10 +523,10 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -582,10 +523,10 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
*/ */
fun drawTriangles( fun drawTriangles(
positions: Array<Point>, positions: Array<Point>,
colors: IntArray?, colors: IntArray? = null,
texCoords: Array<Point>?, texCoords: Array<Point>? = null,
indices: ShortArray?, indices: ShortArray? = null,
mode: BlendMode, blendMode: BlendMode,
paint: Paint paint: Paint
): Canvas { ): Canvas {
require(positions.size % 3 == 0) { "Expected positions.length % 3 == 0, got: " + positions.size } require(positions.size % 3 == 0) { "Expected positions.length % 3 == 0, got: " + positions.size }
...@@ -602,7 +543,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -602,7 +543,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
toInterop(Point.flattenArray(texCoords)), toInterop(Point.flattenArray(texCoords)),
indices?.size ?: 0, indices?.size ?: 0,
toInterop(indices), toInterop(indices),
mode.ordinal, blendMode.ordinal,
getPtr(paint) getPtr(paint)
) )
} }
...@@ -610,29 +551,6 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -610,29 +551,6 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
return this return this
} }
/**
*
* Draws a triangle strip mesh, using clip and Matrix.
*
*
* If paint contains an Shader, the shader is mapped using the vertices' positions.
*
*
* If vertices colors are defined in vertices, and Paint paint contains Shader,
* BlendMode mode combines vertices colors with Shader.
*
* @param positions triangle mesh to draw
* @param colors color array, one for each corner; may be null
* @param paint specifies the Shader, used as Vertices texture
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices_2](https://fiddle.skia.org/c/@Canvas_drawVertices_2)
*/
fun drawTriangleStrip(positions: Array<Point>, colors: IntArray?, paint: Paint): Canvas {
return drawTriangleStrip(positions, colors, null, null, BlendMode.MODULATE, paint)
}
/** /**
* *
* Draws a triangle strip mesh, using clip and Matrix. * Draws a triangle strip mesh, using clip and Matrix.
...@@ -649,6 +567,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -649,6 +567,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
* @param colors color array, one for each corner; may be null * @param colors color array, one for each corner; may be null
* @param texCoords Point array of texture coordinates, mapping Shader to corners; may be null * @param texCoords Point array of texture coordinates, mapping Shader to corners; may be null
* @param indices with which indices points should be drawn; may be null * @param indices with which indices points should be drawn; may be null
* @param blendMode combines vertices colors with Shader, if both are present
* @param paint specifies the Shader, used as Vertices texture * @param paint specifies the Shader, used as Vertices texture
* *
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices) * @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
...@@ -657,43 +576,10 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -657,43 +576,10 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
*/ */
fun drawTriangleStrip( fun drawTriangleStrip(
positions: Array<Point>, positions: Array<Point>,
colors: IntArray?, colors: IntArray? = null,
texCoords: Array<Point>?, texCoords: Array<Point>? = null,
indices: ShortArray?, indices: ShortArray? = null,
paint: Paint blendMode: BlendMode,
): Canvas {
return drawTriangleStrip(positions, colors, texCoords, indices, BlendMode.MODULATE, paint)
}
/**
*
* Draws a triangle strip mesh, using clip and Matrix.
*
*
* If paint contains an Shader and vertices does not contain texCoords, the shader
* is mapped using the vertices' positions.
*
*
* If vertices colors are defined in vertices, and Paint paint contains Shader,
* BlendMode mode combines vertices colors with Shader.
*
* @param positions triangle mesh to draw
* @param colors color array, one for each corner; may be null
* @param texCoords Point array of texture coordinates, mapping Shader to corners; may be null
* @param indices with which indices points should be drawn; may be null
* @param mode combines vertices colors with Shader, if both are present
* @param paint specifies the Shader, used as Vertices texture
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices_2](https://fiddle.skia.org/c/@Canvas_drawVertices_2)
*/
fun drawTriangleStrip(
positions: Array<Point>,
colors: IntArray?,
texCoords: Array<Point>?,
indices: ShortArray?,
mode: BlendMode,
paint: Paint paint: Paint
): Canvas { ): Canvas {
require(colors == null || colors.size == positions.size) { "Expected colors.length == positions.length, got: " + colors!!.size + " != " + positions.size } require(colors == null || colors.size == positions.size) { "Expected colors.length == positions.length, got: " + colors!!.size + " != " + positions.size }
...@@ -709,7 +595,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -709,7 +595,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
toInterop(Point.flattenArray(texCoords)), toInterop(Point.flattenArray(texCoords)),
indices?.size ?: 0, indices?.size ?: 0,
toInterop(indices), toInterop(indices),
mode.ordinal, blendMode.ordinal,
getPtr(paint) getPtr(paint)
) )
} }
...@@ -717,61 +603,6 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -717,61 +603,6 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
return this return this
} }
/**
*
* Draws a triangle fan mesh, using clip and Matrix.
*
*
* If paint contains an Shader, the shader is mapped using the vertices' positions.
*
*
* If vertices colors are defined in vertices, and Paint paint contains Shader,
* BlendMode mode combines vertices colors with Shader.
*
* @param positions triangle mesh to draw
* @param colors color array, one for each corner; may be null
* @param paint specifies the Shader, used as Vertices texture
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices_2](https://fiddle.skia.org/c/@Canvas_drawVertices_2)
*/
fun drawTriangleFan(positions: Array<Point>, colors: IntArray?, paint: Paint): Canvas {
return drawTriangleFan(positions, colors, null, null, BlendMode.MODULATE, paint)
}
/**
*
* Draws a triangle fan mesh, using clip and Matrix.
*
*
* If paint contains an Shader and vertices does not contain texCoords, the shader
* is mapped using the vertices' positions.
*
*
* If vertices colors are defined in vertices, and Paint paint contains Shader,
* BlendMode mode combines vertices colors with Shader.
*
* @param positions triangle mesh to draw
* @param colors color array, one for each corner; may be null
* @param texCoords Point array of texture coordinates, mapping Shader to corners; may be null
* @param indices with which indices points should be drawn; may be null
* @param paint specifies the Shader, used as Vertices texture
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
*
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices_2](https://fiddle.skia.org/c/@Canvas_drawVertices_2)
*/
fun drawTriangleFan(
positions: Array<Point>,
colors: IntArray?,
texCoords: Array<Point>?,
indices: ShortArray?,
paint: Paint
): Canvas {
return drawTriangleFan(positions, colors, texCoords, indices, BlendMode.MODULATE, paint)
}
/** /**
* *
* Draws a triangle fan mesh, using clip and Matrix. * Draws a triangle fan mesh, using clip and Matrix.
...@@ -788,7 +619,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -788,7 +619,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
* @param colors color array, one for each corner; may be null * @param colors color array, one for each corner; may be null
* @param texCoords Point array of texture coordinates, mapping Shader to corners; may be null * @param texCoords Point array of texture coordinates, mapping Shader to corners; may be null
* @param indices with which indices points should be drawn; may be null * @param indices with which indices points should be drawn; may be null
* @param mode combines vertices colors with Shader, if both are present * @param blendMode combines vertices colors with Shader, if both are present
* @param paint specifies the Shader, used as Vertices texture * @param paint specifies the Shader, used as Vertices texture
* *
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices) * @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
...@@ -797,10 +628,10 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -797,10 +628,10 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
*/ */
fun drawTriangleFan( fun drawTriangleFan(
positions: Array<Point>, positions: Array<Point>,
colors: IntArray?, colors: IntArray? = null,
texCoords: Array<Point>?, texCoords: Array<Point>? = null,
indices: ShortArray?, indices: ShortArray? = null,
mode: BlendMode, blendMode: BlendMode,
paint: Paint paint: Paint
): Canvas { ): Canvas {
require(colors == null || colors.size == positions.size) { "Expected colors.length == positions.length, got: " + colors!!.size + " != " + positions.size } require(colors == null || colors.size == positions.size) { "Expected colors.length == positions.length, got: " + colors!!.size + " != " + positions.size }
...@@ -816,7 +647,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -816,7 +647,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
toInterop(Point.flattenArray(texCoords)), toInterop(Point.flattenArray(texCoords)),
indices?.size ?: 0, indices?.size ?: 0,
toInterop(indices), toInterop(indices),
mode.ordinal, blendMode.ordinal,
getPtr(paint) getPtr(paint)
) )
} }
...@@ -841,7 +672,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -841,7 +672,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
* @param colors color array, one for each corner; may be null * @param colors color array, one for each corner; may be null
* @param texCoords flattened Point array of texture coordinates, mapping Shader to corners; may be null * @param texCoords flattened Point array of texture coordinates, mapping Shader to corners; may be null
* @param indices with which indices points should be drawn; may be null * @param indices with which indices points should be drawn; may be null
* @param mode combines vertices colors with Shader, if both are present * @param blendMode combines vertices colors with Shader, if both are present
* @param paint specifies the Shader, used as Vertices texture * @param paint specifies the Shader, used as Vertices texture
* *
* @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices) * @see [https://fiddle.skia.org/c/@Canvas_drawVertices](https://fiddle.skia.org/c/@Canvas_drawVertices)
...@@ -852,10 +683,10 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -852,10 +683,10 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
fun drawVertices( fun drawVertices(
vertexMode: VertexMode, vertexMode: VertexMode,
positions: FloatArray, positions: FloatArray,
colors: IntArray?, colors: IntArray? = null,
texCoords: FloatArray?, texCoords: FloatArray? = null,
indices: ShortArray?, indices: ShortArray? = null,
mode: BlendMode, blendMode: BlendMode,
paint: Paint paint: Paint
): Canvas { ): Canvas {
require(positions.size % 2 == 0) { require(positions.size % 2 == 0) {
...@@ -879,7 +710,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -879,7 +710,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
toInterop(texCoords), toInterop(texCoords),
indices?.size ?: 0, indices?.size ?: 0,
toInterop(indices), toInterop(indices),
mode.ordinal, blendMode.ordinal,
getPtr(paint) getPtr(paint)
) )
} }
...@@ -887,74 +718,6 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -887,74 +718,6 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
return this return this
} }
/**
*
* Draws a Coons patch: the interpolation of four cubics with shared corners,
* associating a color, and optionally a texture SkPoint, with each corner.
*
*
* Coons patch uses clip and Matrix, paint Shader, ColorFilter,
* alpha, ImageFilter, and BlendMode. If Shader is provided it is treated
* as Coons patch texture.
*
*
* Point array cubics specifies four Path cubic starting at the top-left corner,
* in clockwise order, sharing every fourth point. The last Path cubic ends at the
* first point.
*
*
* Color array color associates colors with corners in top-left, top-right,
* bottom-right, bottom-left order.
*
*
* @param cubics Path cubic array, sharing common points
* @param colors color array, one for each corner
* @param paint Shader, ColorFilter, BlendMode, used to draw
* @return this
*
* @see [https://fiddle.skia.org/c/4cf70f8d194867d053d7e177e5088445](https://fiddle.skia.org/c/4cf70f8d194867d053d7e177e5088445)
*/
fun drawPatch(cubics: Array<Point>, colors: IntArray, paint: Paint): Canvas {
return drawPatch(cubics, colors, null, paint)
}
/**
*
* Draws a Coons patch: the interpolation of four cubics with shared corners,
* associating a color, and optionally a texture SkPoint, with each corner.
*
*
* Coons patch uses clip and Matrix, paint Shader, ColorFilter,
* alpha, ImageFilter, and BlendMode. If Shader is provided it is treated
* as Coons patch texture.
*
*
* Point array cubics specifies four Path cubic starting at the top-left corner,
* in clockwise order, sharing every fourth point. The last Path cubic ends at the
* first point.
*
*
* Color array color associates colors with corners in top-left, top-right,
* bottom-right, bottom-left order.
*
*
* If paint contains Shader, Point array texCoords maps Shader as texture to
* corners in top-left, top-right, bottom-right, bottom-left order. If texCoords is
* nullptr, Shader is mapped using positions (derived from cubics).
*
* @param cubics Path cubic array, sharing common points
* @param colors color array, one for each corner
* @param texCoords Point array of texture coordinates, mapping Shader to corners;
* may be null
* @param paint Shader, ColorFilter, BlendMode, used to draw
* @return this
*
* @see [https://fiddle.skia.org/c/4cf70f8d194867d053d7e177e5088445](https://fiddle.skia.org/c/4cf70f8d194867d053d7e177e5088445)
*/
fun drawPatch(cubics: Array<Point>, colors: IntArray, texCoords: Array<Point>?, paint: Paint): Canvas {
return drawPatch(cubics, colors, texCoords, BlendMode.MODULATE, paint)
}
/** /**
* *
* Draws a Coons patch: the interpolation of four cubics with shared corners, * Draws a Coons patch: the interpolation of four cubics with shared corners,
...@@ -984,7 +747,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -984,7 +747,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
* @param colors color array, one for each corner * @param colors color array, one for each corner
* @param texCoords Point array of texture coordinates, mapping Shader to corners; * @param texCoords Point array of texture coordinates, mapping Shader to corners;
* may be null * may be null
* @param mode BlendMode for colors, and for Shader if paint has one * @param blendMode BlendMode for colors, and for Shader if paint has one
* @param paint Shader, ColorFilter, BlendMode, used to draw * @param paint Shader, ColorFilter, BlendMode, used to draw
* @return this * @return this
* *
...@@ -993,8 +756,8 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -993,8 +756,8 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
fun drawPatch( fun drawPatch(
cubics: Array<Point>, cubics: Array<Point>,
colors: IntArray, colors: IntArray,
texCoords: Array<Point>?, texCoords: Array<Point>? = null,
mode: BlendMode, blendMode: BlendMode,
paint: Paint paint: Paint
): Canvas { ): Canvas {
require(cubics.size == 12) { "Expected cubics.length == 12, got: " + cubics.size } require(cubics.size == 12) { "Expected cubics.length == 12, got: " + cubics.size }
...@@ -1007,7 +770,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int ...@@ -1007,7 +770,7 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
toInterop(Point.flattenArray(cubics)), toInterop(Point.flattenArray(cubics)),
toInterop(colors), toInterop(colors),
toInterop(Point.flattenArray(texCoords)), toInterop(Point.flattenArray(texCoords)),
mode.ordinal, blendMode.ordinal,
getPtr(paint) getPtr(paint)
) )
} }
......
skiko/src/commonTest/kotlin/org/jetbrains/skia/CanvasTest.kt
View file @ 239f685e
...@@ -36,9 +36,9 @@ class CanvasTest { ...@@ -36,9 +36,9 @@ class CanvasTest {
VertexMode.TRIANGLES, VertexMode.TRIANGLES,
positions, positions,
colors, colors,
positions, null,
indices, indices,
BlendMode.SRC_OVER, BlendMode.DST_OVER,
Paint() Paint()
) )
...@@ -170,6 +170,7 @@ class CanvasTest { ...@@ -170,6 +170,7 @@ class CanvasTest {
cubics = points.toTypedArray(), cubics = points.toTypedArray(),
colors = intArrayOf(Color.RED, Color.BLUE, Color.YELLOW, Color.CYAN), colors = intArrayOf(Color.RED, Color.BLUE, Color.YELLOW, Color.CYAN),
texCoords = null, texCoords = null,
blendMode = BlendMode.DST_OVER,
paint = Paint() paint = Paint()
) )
......
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