commit cfb4e0fd5ceb9c0367ec13b1d71201fe8df5bc08
author Luigi Rosso <luigi.rosso@gmail.com> Thu Mar 03 15:02:51 2022 -0800
committer Luigi Rosso <luigi-rosso@users.noreply.github.com> Thu Mar 03 15:14:44 2022 -0800
tree 936ef6a53a5ef19847ea865b84b6e06ee66f1f0b
parent 74708f17a81b11257b4541b89eba5a1fd92abed5

Tweaking types

src/shapes/mesh.cpp

diff --git a/src/shapes/mesh.cpp b/src/shapes/mesh.cpp
index a1d5957..a51114c 100644
--- a/src/shapes/mesh.cpp
+++ b/src/shapes/mesh.cpp
@@ -90,9 +90,9 @@
         uv[index++] = vertex->u();
         uv[index++] = vertex->v();
     }
-    m_UVRenderBuffer = makeBufferF32(uv.data(), uv.size());
-    m_IndexRenderBuffer =
-        makeBufferU16(m_IndexBuffer->data(), m_IndexBuffer->size());
+    m_UVRenderBuffer = makeBufferF32(Span<const float>(uv.data(), uv.size()));
+    m_IndexRenderBuffer = makeBufferU16(
+        Span((const uint16_t*)m_IndexBuffer->data(), m_IndexBuffer->size()));
 }
 
 void Mesh::update(ComponentDirt value) {
@@ -119,7 +119,8 @@
             vertices[index++] = translation[0];
             vertices[index++] = translation[1];
         }
-        m_VertexRenderBuffer = makeBufferF32(vertices.data(), vertices.size());
+        m_VertexRenderBuffer =
+            makeBufferF32(Span((const float*)vertices.data(), vertices.size()));
     }
 
     if (skin() == nullptr) {

test/no_op_renderer.cpp

diff --git a/test/no_op_renderer.cpp b/test/no_op_renderer.cpp
index a85f778..b6ec756 100644
--- a/test/no_op_renderer.cpp
+++ b/test/no_op_renderer.cpp
@@ -38,13 +38,7 @@
         return nullptr;
     }
 
-    rcp<RenderBuffer> makeBufferU16(const uint16_t[], size_t count) {
-        return nullptr;
-    }
-    rcp<RenderBuffer> makeBufferU32(const uint32_t[], size_t count) {
-        return nullptr;
-    }
-    rcp<RenderBuffer> makeBufferF32(const float[], size_t count) {
-        return nullptr;
-    }
+    rcp<RenderBuffer> makeBufferU16(Span<const uint16_t>) { return nullptr; }
+    rcp<RenderBuffer> makeBufferU32(Span<const uint32_t>) { return nullptr; }
+    rcp<RenderBuffer> makeBufferF32(Span<const float>) { return nullptr; }
 } // namespace rive

test/span_test.cpp

diff --git a/test/span_test.cpp b/test/span_test.cpp
index 6ab15dc..c59c532 100644
--- a/test/span_test.cpp
+++ b/test/span_test.cpp
@@ -9,9 +9,9 @@
 using namespace rive;
 
 namespace {
-class baseclass {};
-class subclass : public baseclass {};
-}
+    class baseclass {};
+    class subclass : public baseclass {};
+} // namespace
 
 static void function(Span<int> span) {}
 static void function(Span<baseclass*> span) {}
@@ -24,15 +24,15 @@
     REQUIRE(span.size_bytes() == 0);
     REQUIRE(span.begin() == span.end());
 
-    int array[] = { 0, 1, 2, 3, 4, 5, 6,7 ,8, 9 };
+    int array[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
 
-    span = { array, 4 };
+    span = {array, 4};
     REQUIRE(!span.empty());
     REQUIRE(span.data() == array);
     REQUIRE(span.size() == 4);
     REQUIRE(span.size_bytes() == 4 * sizeof(int));
     REQUIRE(span.begin() + span.size() == span.end());
-    
+
     int counter = 0;
     int sum = 0;
     for (auto s : span) {