Add code to lua paths to get the fill path and get lists of verbs and

src/utils/SkLua.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkLua.h"
 
 #if SK_SUPPORT_GPU
@@ skipping 203 matching lines @@
 
 static void setarray_number(lua_State* L, int index, double value) {
     lua_pushnumber(L, value);
     lua_rawseti(L, -2, index);
 }
 
 static void setarray_scalar(lua_State* L, int index, SkScalar value) {
     setarray_number(L, index, SkScalarToLua(value));
 }
 
+static void setarray_string(lua_State* L, int index, const char str[]) {
+        lua_pushstring(L, str);

[reed1, 2016/08/01 21:17:21]

indent is too far

[Harry Stern, 2016/08/01 22:07:33]

Done.

+        lua_rawseti(L, -2, index);
+}
+
 void SkLua::pushBool(bool value, const char key[]) {
     lua_pushboolean(fL, value);
     CHECK_SETFIELD(key);
 }
 
 void SkLua::pushString(const char str[], const char key[]) {
     lua_pushstring(fL, str);
     CHECK_SETFIELD(key);
 }
 
@@ skipping 918 matching lines @@
 static int lpaint_getPathEffect(lua_State* L) {
     const SkPaint* paint = get_obj<SkPaint>(L, 1);
     SkPathEffect* pe = paint->getPathEffect();
     if (pe) {
         push_ref(L, pe);
         return 1;
     }
     return 0;
 }
 
+static int lpaint_getFillPath(lua_State* L) {
+    const SkPaint* paint = get_obj<SkPaint>(L, 1);
+    const SkPath* path = get_obj<SkPath>(L, 2);
+
+    SkPath fillpath;
+    paint->getFillPath(*path, &fillpath);
+
+    SkLua lua(L);
+    lua.pushPath(fillpath);
+
+    return 1;
+}
+
 static int lpaint_gc(lua_State* L) {
     get_obj<SkPaint>(L, 1)->~SkPaint();
     return 0;
 }
 
 static const struct luaL_Reg gSkPaint_Methods[] = {
     { "isAntiAlias", lpaint_isAntiAlias },
     { "setAntiAlias", lpaint_setAntiAlias },
     { "isDither", lpaint_isDither },
     { "setDither", lpaint_setDither },
@@ skipping 38 matching lines @@
     { "getEffects", lpaint_getEffects },
     { "getColorFilter", lpaint_getColorFilter },
     { "setColorFilter", lpaint_setColorFilter },
     { "getImageFilter", lpaint_getImageFilter },
     { "setImageFilter", lpaint_setImageFilter },
     { "getXfermode", lpaint_getXfermode },
     { "setXfermode", lpaint_setXfermode },
     { "getShader", lpaint_getShader },
     { "setShader", lpaint_setShader },
     { "getPathEffect", lpaint_getPathEffect },
+    { "getFillPath", lpaint_getFillPath },
     { "__gc", lpaint_gc },
     { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static const char* mode2string(SkShader::TileMode mode) {
     static const char* gNames[] = { "clamp", "repeat", "mirror" };
     SkASSERT((unsigned)mode < SK_ARRAY_COUNT(gNames));
     return gNames[mode];
@@ skipping 349 matching lines @@
         ret_count += 4;
     }
     return ret_count;
 }
 
 static int lpath_countPoints(lua_State* L) {
     lua_pushinteger(L, get_obj<SkPath>(L, 1)->countPoints());
     return 1;
 }
 
+static int lpath_getVerbs(lua_State* L) {
+    const SkPath* path = get_obj<SkPath>(L, 1);
+    SkPath::Iter iter(*path, false);
+    SkPoint pts[4];
+
+    lua_newtable(L);
+
+        bool done = false;

[reed1, 2016/08/01 21:17:21]

indent?

[Harry Stern, 2016/08/01 22:07:33]

Done.

+        int i = 0;
+    do {
+        switch (iter.next(pts, true)) {
+            case SkPath::kMove_Verb:
+                setarray_string(L, ++i, "move");
+                break;
+            case SkPath::kClose_Verb:
+                setarray_string(L, ++i, "close");
+                break;
+            case SkPath::kLine_Verb:
+                setarray_string(L, ++i, "line");
+                break;
+            case SkPath::kQuad_Verb:
+                setarray_string(L, ++i, "quad");
+                break;
+            case SkPath::kConic_Verb:
+                setarray_string(L, ++i, "conic");
+                break;
+            case SkPath::kCubic_Verb:
+                setarray_string(L, ++i, "cubic");
+                break;
+            case SkPath::kDone_Verb:
+                setarray_string(L, ++i, "done");
+                done = true;
+                break;
+           }

[reed1, 2016/08/01 21:17:21]

indent?

[Harry Stern, 2016/08/01 22:07:33]

Done.

+    } while (!done);
+
+        return 1;
+}
+
 static int lpath_reset(lua_State* L) {
     get_obj<SkPath>(L, 1)->reset();
     return 0;
 }
 
 static int lpath_moveTo(lua_State* L) {
     get_obj<SkPath>(L, 1)->moveTo(lua2scalar(L, 2), lua2scalar(L, 3));
     return 0;
 }
 
@@ skipping 22 matching lines @@
 
 static int lpath_gc(lua_State* L) {
     get_obj<SkPath>(L, 1)->~SkPath();
     return 0;
 }
 
 static const struct luaL_Reg gSkPath_Methods[] = {
     { "getBounds", lpath_getBounds },
     { "getFillType", lpath_getFillType },
     { "getSegmentTypes", lpath_getSegmentTypes },
+    { "getVerbs", lpath_getVerbs },
     { "isConvex", lpath_isConvex },
     { "isEmpty", lpath_isEmpty },
     { "isRect", lpath_isRect },
     { "isNestedFillRects", lpath_isNestedFillRects },
     { "countPoints", lpath_countPoints },
     { "reset", lpath_reset },
     { "moveTo", lpath_moveTo },
     { "lineTo", lpath_lineTo },
     { "quadTo", lpath_quadTo },
     { "cubicTo", lpath_cubicTo },
@@ skipping 494 matching lines @@
     REG_CLASS(L, SkTextBlob);
     REG_CLASS(L, SkTypeface);
     REG_CLASS(L, SkXfermode);
 }
 
 extern "C" int luaopen_skia(lua_State* L);
 extern "C" int luaopen_skia(lua_State* L) {
     SkLua::Load(L);
     return 0;
 }