From 92eaa3cafd09aa4b93a23a601c40dc74cd94f0c7 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Mon, 16 Jul 2018 21:00:52 -0400 Subject: Add SkFloat2Bits and Region stub Bug: skia: Change-Id: I5ab9a4d42e9eec6563499a09e08ed8b183ac91b2 Reviewed-on: https://skia-review.googlesource.com/141426 Reviewed-by: Cary Clark Commit-Queue: Kevin Lubick --- experimental/wasm/compile.sh | 18 ++++++++++++++++- experimental/wasm/shell.html | 34 ++++++++++++++++++++++++++++++++ experimental/wasm/wasm_main.cpp | 43 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 92 insertions(+), 3 deletions(-) (limited to 'experimental') diff --git a/experimental/wasm/compile.sh b/experimental/wasm/compile.sh index d2e7098a0b..cb89019403 100755 --- a/experimental/wasm/compile.sh +++ b/experimental/wasm/compile.sh @@ -27,10 +27,14 @@ mkdir -p out/wasm em++ -Oz -std=c++14 \ -Iinclude/config \ -Iinclude/core \ --Iinclude/private \ +-Iinclude/gpu \ -Iinclude/pathops \ +-Iinclude/private \ -Iinclude/utils \ -Isrc/core \ +-Isrc/gpu \ +-Isrc/shaders \ +-Isrc/opts \ --bind \ -s WASM=1 \ -s NO_EXIT_RUNTIME=1 \ @@ -39,15 +43,27 @@ em++ -Oz -std=c++14 \ --shell-file $HTML_SHELL \ -o out/wasm/pathkit.html \ experimental/wasm/wasm_main.cpp \ +src/core/SkAnalyticEdge.cpp \ src/core/SkArenaAlloc.cpp \ +src/core/SkBlitter.cpp \ +src/core/SkCoverageDelta.cpp \ +src/core/SkEdge.cpp \ +src/core/SkEdgeBuilder.cpp \ +src/core/SkEdgeClipper.cpp \ +src/core/SkFDot6Constants.cpp \ src/core/SkGeometry.cpp \ +src/core/SkLineClipper.cpp \ src/core/SkMallocPixelRef.cpp \ src/core/SkMath.cpp \ src/core/SkMatrix.cpp \ +src/core/SkOpts.cpp \ src/core/SkPath.cpp \ src/core/SkPathRef.cpp \ src/core/SkPoint.cpp \ src/core/SkRect.cpp \ +src/core/SkRegion.cpp \ +src/core/SkRegion_path.cpp \ +src/core/SkScan_Path.cpp \ src/core/SkStream.cpp \ src/core/SkString.cpp \ src/core/SkStringUtils.cpp \ diff --git a/experimental/wasm/shell.html b/experimental/wasm/shell.html index 8557241096..f38429c755 100644 --- a/experimental/wasm/shell.html +++ b/experimental/wasm/shell.html @@ -424,6 +424,40 @@ document.getElementById('svg').appendChild(newPath); android2.delete(); + + // =========================================================== + + let float = Module.SkBits2Float(parseInt("0x3f2aaaab")); + Module.print('SkBits2Float(0x3f2aaaab) = 0.666667', float); + + p1 = new Module.SkPath(); + p1.moveTo(0,60); + p1.lineTo(40,60); + p1.lineTo(20,80); + p1.close(); + p2 = new Module.SkPath(); + p2.moveTo(20,60); + p2.lineTo(60,60); + p2.lineTo(40,80); + p2.close(); + + let rgnA = new Module.SkRegion(); + let rgnB = new Module.SkRegion(); + let openClip = new Module.SkRegion(); + let rgnOut = new Module.SkRegion(); + openClip.setRect(-16000, -16000, 16000, 16000); + rgnA.setPath(p1, openClip); + rgnB.setPath(p2, openClip); + rgnOut.opRegionAB(rgnA, rgnB, Module.RegionOp.INTERSECT); + let pathOut = Module.GetBoundaryPathFromRegion(rgnOut); + + p1.delete(); + p2.delete(); + rgnA.delete(); + rgnB.delete(); + openClip.delete(); + rgnOut.delete(); + pathOut.delete(); }