#5584: Appending of winding vertices is working now

codereader · Nov 6, 2021 · 4e39896 · 4e39896
1 parent dd9d9b8
commit 4e39896
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 14 deletions.
diff --git a/libs/render/CompactWindingVertexBuffer.h b/libs/render/CompactWindingVertexBuffer.h
@@ -51,7 +51,7 @@ class CompactWindingVertexBuffer
     {
         assert(winding.size() == _size);
 
-        auto currentSize = _vertices.size();
+        const auto currentSize = _vertices.size();
         auto position = currentSize / _size;
         _vertices.reserve(currentSize + _size); // reserve() never shrinks
 
@@ -62,9 +62,9 @@ class CompactWindingVertexBuffer
 
         for (unsigned int n = static_cast<unsigned int>(_size) - 1; n - 1 > 0; --n)
         {
-            _indices.push_back(0);
-            _indices.push_back(n - 1);
-            _indices.push_back(n);
+            _indices.push_back(static_cast<unsigned int>(currentSize) + 0);
+            _indices.push_back(static_cast<unsigned int>(currentSize) + n - 1);
+            _indices.push_back(static_cast<unsigned int>(currentSize) + n);
         }
 
         return position;

diff --git a/test/WindingRendering.cpp b/test/WindingRendering.cpp
@@ -14,7 +14,11 @@ inline std::vector<ArbitraryMeshVertex> createWinding(int id, int size)
 
     for (int i = 0; i < size; ++i)
     {
-        winding.emplace_back(ArbitraryMeshVertex({ id + 0.0, id + 0.5, id + 0.3 }, { 0, 0, id + 0.0 }, { id + 0.0, -id + 0.0 }));
+        auto offset = static_cast<double>(i + size * id);
+        winding.emplace_back(ArbitraryMeshVertex(
+            { offset + 0.0, offset + 0.5, offset + 0.3 }, 
+            { 0, 0, offset + 0.0 }, 
+            { offset + 0.0, -offset + 0.0 }));
     }
 
     return winding;
@@ -25,7 +29,8 @@ inline void checkWindingIndices(const VertexBuffer& buffer, std::size_t slot)
     // Slot must be within range
     auto windingSize = buffer.getWindingSize();
 
-    EXPECT_LT(slot, buffer.getVertices().size() / windingSize);
+    auto numWindingsInBuffer = buffer.getVertices().size() / windingSize;
+    EXPECT_LT(slot, numWindingsInBuffer) << "Slot out of bounds";
 
     // Assume the indices are within bounds
     auto indexStart = buffer.getNumIndicesPerWinding() * slot;
@@ -52,18 +57,42 @@ TEST(CompactWindingVertexBuffer, NumIndicesPerWinding)
 
 TEST(CompactWindingVertexBuffer, AddSingleWinding)
 {
-    auto winding1 = createWinding(1, 4);
+    for (auto size = 3; size < 12; ++size)
+    {
+        VertexBuffer buffer(size);
 
-    VertexBuffer buffer(4);
+        auto winding1 = createWinding(1, size);
+        auto slot = buffer.pushWinding(winding1);
 
-    auto slot = buffer.pushWinding(winding1);
+        EXPECT_EQ(slot, 0) << "Wrong slot assignment";
+        EXPECT_EQ(buffer.getVertices().size(), size);
+        EXPECT_EQ(buffer.getIndices().size(), buffer.getNumIndicesPerWinding());
 
-    EXPECT_EQ(slot, 0) << "Wrong slot assignment";
-    EXPECT_EQ(buffer.getVertices().size(), 4);
-    EXPECT_EQ(buffer.getIndices().size(), buffer.getNumIndicesPerWinding());
+        // Assume that the indices have been correctly calculated
+        checkWindingIndices(buffer, slot);
+    }
+}
 
-    // Assume that the indices have been correctly calculated
-    checkWindingIndices(buffer, slot);
+TEST(CompactWindingVertexBuffer, AddMultipleWindings)
+{
+    for (auto size = 3; size < 12; ++size)
+    {
+        VertexBuffer buffer(size);
+
+        // Add 10 windings to the buffer
+        for (auto n = 1; n <= 10; ++n)
+        {
+            auto winding1 = createWinding(n, size);
+            auto slot = buffer.pushWinding(winding1);
+
+            EXPECT_EQ(slot, n-1) << "Unexpected slot assignment";
+            EXPECT_EQ(buffer.getVertices().size(), n * size);
+            EXPECT_EQ(buffer.getIndices().size(), n * buffer.getNumIndicesPerWinding());
+
+            // Assume that the indices have been correctly calculated
+            checkWindingIndices(buffer, slot);
+        }
+    }
 }
 
 }