commit e7eb4474ac1eafad7a420be8e80f1a4eedcacb42
author Mike Reed <mike@reedtribe.org> Wed Feb 23 10:51:48 2022 -0500
committer Michael Reed <mike@reedtribe.org> Tue Mar 01 12:25:27 2022 -0500
tree cee00364882f54ffb38c7c696c71d6fd578ae8c9
parent 41e3ac77856248e0f00e6213081199741dd263d1

remove unneeded meshtype

include/rive/renderer.hpp

diff --git a/include/rive/renderer.hpp b/include/rive/renderer.hpp
index d82402e..6011a99 100644
--- a/include/rive/renderer.hpp
+++ b/include/rive/renderer.hpp
@@ -70,14 +70,7 @@
                                                int count,
                                                const Mat2D* localMatrix = nullptr);
 
-    class RenderMesh : public RefCnt {
-    public:
-        enum Type {
-            triangles,
-            strip,
-            fan,
-        };
-    };
+    class RenderMesh : public RefCnt {};
 
     /*  Copies the data provided, and returns a reusable RenderMesh object which can
      *  be drawn in drawMesh(...).
@@ -87,8 +80,7 @@
      *  Note: texCoords[] are normalized (0..1), but can be outside of that range.
      *        if they are out of range, the shader (in drawMesh) will handle tiling
      */
-    extern rcp<RenderMesh> makeMesh(RenderMesh::Type,
-                                    int vertexCount,
+    extern rcp<RenderMesh> makeMesh(int vertexCount,
                                     const float vertices[],     //  x0,  y0,  x1,  y1, ...
                                     const float texCoords[],    // tx0, ty0, tx1, ty1, ...
                                     int indexCount,

skia/renderer/include/to_skia.hpp

diff --git a/skia/renderer/include/to_skia.hpp b/skia/renderer/include/to_skia.hpp
index 7756f97..6420106 100644
--- a/skia/renderer/include/to_skia.hpp
+++ b/skia/renderer/include/to_skia.hpp
@@ -93,16 +93,6 @@
             }
             return SkBlendMode::kSrcOver;
         }
-        
-        static SkVertices::VertexMode convert(rive::RenderMesh::Type t) {
-            switch (t) {
-                case rive::RenderMesh::triangles: return SkVertices::kTriangles_VertexMode;
-                case rive::RenderMesh::strip:     return SkVertices::kTriangleStrip_VertexMode;
-                case rive::RenderMesh::fan:       return SkVertices::kTriangleFan_VertexMode;
-            }
-            assert(false);
-            return SkVertices::kTriangles_VertexMode;
-        }
     };
 } // namespace rive
 #endif

skia/renderer/src/skia_renderer.cpp

diff --git a/skia/renderer/src/skia_renderer.cpp b/skia/renderer/src/skia_renderer.cpp
index 59a100b..6cafdc4 100644
--- a/skia/renderer/src/skia_renderer.cpp
+++ b/skia/renderer/src/skia_renderer.cpp
@@ -217,12 +217,12 @@
        return rcp<RenderShader>(new SkiaRenderShader(std::move(sh)));
    }
 
-    rcp<RenderMesh> makeMesh(RenderMesh::Type meshType,
-                             int vertexCount, const float vertices[], const float texCoords[],
+    rcp<RenderMesh> makeMesh(int vertexCount, const float vertices[], const float texCoords[],
                              int indexCount, const uint16_t indices[])
     {
         const SkColor* colors = nullptr;
-        auto vt = SkVertices::MakeCopy(ToSkia::convert(meshType), vertexCount,
+        auto mode = SkVertices::kTriangles_VertexMode;
+        auto vt = SkVertices::MakeCopy(mode, vertexCount,
                                        (const SkPoint*)vertices,
                                        (const SkPoint*)texCoords,
                                        colors,