feature: add group effects support (#11359) df0db41a9c

Co-authored-by: hernan <hernan@rive.app>

tests/unit_tests/runtime/dash_test.cpp

@@ -8,16 +8,24 @@ class _TestDasher : public rive::PathDasher
 {
 
 public:
-    rive::ShapePaintPath* dash(const rive::RawPath* source,
+    rive::ShapePaintPath* dash(rive::ShapePaintPath* destination,
+                               const rive::RawPath* source,
+                               rive::PathMeasure* pathMeasure,
                                rive::Dash* offset,
                                rive::Span<rive::Dash*> dashes)
     {
-        return rive::PathDasher::dash(source, offset, dashes);
+        return rive::PathDasher::dash(destination,
+                                      source,
+                                      pathMeasure,
+                                      offset,
+                                      dashes);
     }
 };
 
 TEST_CASE("0 length dashes don't cause a crash", "[dashing]")
 {
+    rive::ShapePaintPath shapePaint;
+    rive::PathMeasure pathMeasure;
     rive::RawPath path;
     path.addRect({1, 1, 5, 6});
 
@@ -28,5 +36,5 @@ TEST_CASE("0 length dashes don't cause a crash", "[dashing]")
     std::vector<rive::Dash*> dashes = {&a, &b};
 
     rive::Dash offset(0.0f, false);
-    dasher.dash(&path, &offset, dashes);
+    dasher.dash(&shapePaint, &path, &pathMeasure, &offset, dashes);
 }

tests/unit_tests/runtime/path_test.cpp

@@ -16,6 +16,7 @@
 #include "rive_file_reader.hpp"
 #include "rive/math/path_types.hpp"
 #include "rive/animation/state_machine_instance.hpp"
+#include "rive/viewmodel/viewmodel_instance_number.hpp"
 #include "utils/serializing_factory.hpp"
 #include <catch.hpp>
 #include <cstdio>
@@ -595,4 +596,106 @@ TEST_CASE("Apply trim path effect to fill", "[silver]")
     }
 
     CHECK(silver.matches("fill_trim_path"));
-}
+}
+
+TEST_CASE("Apply group effect to multiple paths", "[silver]")
+{
+    rive::SerializingFactory silver;
+    auto file = ReadRiveFile("assets/group_effect.riv", &silver);
+
+    auto artboard = file->artboardDefault();
+    REQUIRE(artboard != nullptr);
+
+    silver.frameSize(artboard->width(), artboard->height());
+
+    auto stateMachine = artboard->stateMachineAt(0);
+    int viewModelId = artboard.get()->viewModelId();
+
+    auto vmi = viewModelId == -1
+                   ? file->createViewModelInstance(artboard.get())
+                   : file->createViewModelInstance(viewModelId, 0);
+    auto dashValue =
+        vmi->propertyValue("dashValue")->as<rive::ViewModelInstanceNumber>();
+
+    auto shape2 = artboard->find<rive::Shape>("shape2");
+    rive::ShapePaint* shapePaint2 = nullptr;
+    for (auto& child : shape2->children())
+    {
+        if (child->is<rive::ShapePaint>())
+        {
+            shapePaint2 = child->as<rive::ShapePaint>();
+            break;
+        }
+    }
+    REQUIRE(shapePaint2 != nullptr);
+
+    auto shape1 = artboard->find<rive::Shape>("shape1");
+    rive::ShapePaint* shapePaint1 = nullptr;
+    for (auto& child : shape1->children())
+    {
+        if (child->is<rive::ShapePaint>())
+        {
+            shapePaint1 = child->as<rive::ShapePaint>();
+            break;
+        }
+    }
+    REQUIRE(shapePaint1 != nullptr);
+
+    stateMachine->bindViewModelInstance(vmi);
+    stateMachine->advanceAndApply(0.0f);
+    auto renderer = silver.makeRenderer();
+    artboard->draw(renderer.get());
+
+    silver.addFrame();
+    dashValue->propertyValue(10);
+
+    // Manually advancing and update data bind to test for dirt
+    artboard->advanceInternal(
+        0.0f,
+        rive::AdvanceFlags::IsRoot | rive::AdvanceFlags::Animate |
+            rive::AdvanceFlags::AdvanceNested | rive::AdvanceFlags::NewFrame);
+    artboard->updateDataBinds();
+    // Ensure that invalidating one shape paint does not cause the other shape
+    // paint to invalidate even if they share the same group effect
+    REQUIRE(shapePaint1->dirt() == rive::ComponentDirt::Path);
+    REQUIRE(shapePaint2->dirt() == rive::ComponentDirt::None);
+    artboard->updatePass(true);
+    stateMachine->advanceAndApply(0.0f);
+    artboard->draw(renderer.get());
+
+    int frames = (int)(1.0f / 0.064f);
+
+    for (int i = 0; i < frames; i++)
+    {
+        silver.addFrame();
+        stateMachine->advanceAndApply(0.064f);
+        artboard->draw(renderer.get());
+    }
+
+    CHECK(silver.matches("group_effect"));
+}
+
+TEST_CASE("Apply group effect with missing items", "[silver]")
+{
+    rive::SerializingFactory silver;
+    auto file = ReadRiveFile("assets/group_effect.riv", &silver);
+
+    auto artboard = file->artboardNamed("main-missing-targets");
+    REQUIRE(artboard != nullptr);
+
+    silver.frameSize(artboard->width(), artboard->height());
+
+    auto stateMachine = artboard->stateMachineAt(0);
+    int viewModelId = artboard.get()->viewModelId();
+
+    auto vmi = viewModelId == -1
+                   ? file->createViewModelInstance(artboard.get())
+                   : file->createViewModelInstance(viewModelId, 0);
+
+    stateMachine->bindViewModelInstance(vmi);
+    stateMachine->advanceAndApply(0.0f);
+    auto renderer = silver.makeRenderer();
+    artboard->draw(renderer.get());
+
+    CHECK(silver.matches("group_effect-main-missing-targets"));
+}

tests/unit_tests/runtime/trim_test.cpp

@@ -51,7 +51,7 @@ static void testRawPath(rive::Artboard* artboard,
     REQUIRE(stroke->is<rive::Stroke>());
     auto effect = stroke->effect();
     REQUIRE(effect != nullptr);
-    auto effectPath = effect->effectPath();
+    auto effectPath = effect->effectPath(stroke);
     REQUIRE(effectPath != nullptr);
     auto rawPath = effectPath->rawPath();
     REQUIRE(rawPath != nullptr);