From 7de5cfb06035cdc8498c643c7d184e3769e50a36 Mon Sep 17 00:00:00 2001 From: zenoslin Date: Wed, 16 Feb 2022 19:24:35 +0800 Subject: [PATCH] Fix some tgfx bindings on Web env. --- web/src/pag_wasm_bindings.cpp | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/web/src/pag_wasm_bindings.cpp b/web/src/pag_wasm_bindings.cpp index fde1ee5de1..b84b3f158f 100644 --- a/web/src/pag_wasm_bindings.cpp +++ b/web/src/pag_wasm_bindings.cpp @@ -192,13 +192,13 @@ EMSCRIPTEN_BINDINGS(pag) { .property("rowBytes", &tgfx::ImageInfo::rowBytes) .property("colorType", &tgfx::ImageInfo::colorType); - class_("Matrix") - .property("a", &Matrix::getScaleX) - .property("b", &Matrix::getSkewY) - .property("c", &Matrix::getSkewX) - .property("d", &Matrix::getScaleY) - .property("tx", &Matrix::getTranslateX) - .property("ty", &Matrix::getTranslateY); + class_("Matrix") + .property("a", &tgfx::Matrix::getScaleX) + .property("b", &tgfx::Matrix::getSkewY) + .property("c", &tgfx::Matrix::getSkewX) + .property("d", &tgfx::Matrix::getScaleY) + .property("tx", &tgfx::Matrix::getTranslateX) + .property("ty", &tgfx::Matrix::getTranslateY); class_("TextDocument") .smart_ptr>("TextDocument") @@ -238,18 +238,18 @@ EMSCRIPTEN_BINDINGS(pag) { .field("xHeight", &tgfx::FontMetrics::xHeight) .field("capHeight", &tgfx::FontMetrics::capHeight); - value_object("Rect") - .field("left", &Rect::left) - .field("top", &Rect::top) - .field("right", &Rect::right) - .field("bottom", &Rect::bottom); + value_object("Rect") + .field("left", &tgfx::Rect::left) + .field("top", &tgfx::Rect::top) + .field("right", &tgfx::Rect::right) + .field("bottom", &tgfx::Rect::bottom); - value_object("Point").field("x", &Point::x).field("y", &Point::y); + value_object("Point").field("x", &tgfx::Point::x).field("y", &tgfx::Point::y); - value_object("Color") - .field("red", &Color::red) - .field("green", &Color::green) - .field("blue", &Color::blue); + value_object("Color") + .field("red", &tgfx::Color::red) + .field("green", &tgfx::Color::green) + .field("blue", &tgfx::Color::blue); value_object("Marker") .field("startTime", &Marker::startTime) @@ -262,11 +262,11 @@ EMSCRIPTEN_BINDINGS(pag) { .value("INVERSE_WINDING", tgfx::PathFillType::InverseWinding) .value("INVERSE_EVEN_ODD", tgfx::PathFillType::InverseEvenOdd); - enum_("ColorType") - .value("Unknown", ColorType::Unknown) - .value("ALPHA_8", ColorType::ALPHA_8) - .value("RGBA_8888", ColorType::RGBA_8888) - .value("BGRA_8888", ColorType::BGRA_8888); + enum_("ColorType") + .value("Unknown", tgfx::ColorType::Unknown) + .value("ALPHA_8", tgfx::ColorType::ALPHA_8) + .value("RGBA_8888", tgfx::ColorType::RGBA_8888) + .value("BGRA_8888", tgfx::ColorType::BGRA_8888); enum_("LayerType") .value("Unknown", LayerType::Unknown) @@ -289,7 +289,7 @@ EMSCRIPTEN_BINDINGS(pag) { register_vector>("VectorPAGLayer"); register_vector("VectorString"); - register_vector("VectorPoint"); + register_vector("VectorPoint"); register_vector("VectorMarker"); function("_SetFallbackFontNames", optional_override([](std::vector fontNames) {