Refactor Script registration (#11280) bc6f965d1f

Co-authored-by: Philip Chung <philterdesign@gmail.com>

tests/unit_tests/runtime/scripting/scripting_converter_test.cpp

@@ -3,7 +3,6 @@
 #include "scripting_test_utilities.hpp"
 #include "rive/animation/state_machine_instance.hpp"
 #include "rive/lua/rive_lua_libs.hpp"
-#include "rive/viewmodel/viewmodel_instance_number.hpp"
 #include "rive/viewmodel/viewmodel_instance_string.hpp"
 #include "rive_file_reader.hpp"
 
@@ -405,42 +404,4 @@ TEST_CASE("scripted string converter", "[silver]")
     artboard->draw(renderer.get());
 
     CHECK(silver.matches("script_string_converter"));
-}
-
-TEST_CASE("scripted data converter using multi chain requires", "[silver]")
-{
-    rive::SerializingFactory silver;
-    auto file = ReadRiveFile("assets/script_dependency_test.riv", &silver);
-    auto artboard = file->artboardNamed("Artboard");
-
-    silver.frameSize(artboard->width(), artboard->height());
-    REQUIRE(artboard != nullptr);
-    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.1f);
-
-    auto renderer = silver.makeRenderer();
-    artboard->draw(renderer.get());
-
-    rive::ViewModelInstanceNumber* num =
-        vmi->propertyValue("InputValue1")->as<rive::ViewModelInstanceNumber>();
-    REQUIRE(num != nullptr);
-
-    int counter = 0;
-    int frames = 30;
-    for (int i = 0; i < frames; i++)
-    {
-        num->propertyValue(counter);
-        silver.addFrame();
-        stateMachine->advanceAndApply(0.016f);
-        artboard->draw(renderer.get());
-        counter += 5;
-    }
-
-    CHECK(silver.matches("script_converter_with_dependency"));
 }

tests/unit_tests/runtime/scripting/scripting_dependency_test.cpp

@@ -0,0 +1,90 @@
+#include "catch.hpp"
+#include "rive_file_reader.hpp"
+#include "rive/animation/state_machine_instance.hpp"
+#include "rive/lua/rive_lua_libs.hpp"
+#include "rive/assets/script_asset.hpp"
+#include "rive/viewmodel/viewmodel_instance_number.hpp"
+#include "rive/viewmodel/viewmodel_instance_string.hpp"
+#include "utils/serializing_factory.hpp"
+
+using namespace rive;
+
+TEST_CASE("scripted data converter number using multi chain requires",
+          "[silver]")
+{
+    rive::SerializingFactory silver;
+    auto file = ReadRiveFile("assets/script_dependency_test.riv", &silver);
+    auto artboard = file->artboardNamed("Artboard");
+
+    silver.frameSize(artboard->width(), artboard->height());
+    REQUIRE(artboard != nullptr);
+    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.1f);
+
+    auto renderer = silver.makeRenderer();
+    artboard->draw(renderer.get());
+
+    rive::ViewModelInstanceNumber* num =
+        vmi->propertyValue("InputValue1")->as<rive::ViewModelInstanceNumber>();
+    REQUIRE(num != nullptr);
+
+    int counter = 0;
+    int frames = 30;
+    for (int i = 0; i < frames; i++)
+    {
+        num->propertyValue(counter);
+        silver.addFrame();
+        stateMachine->advanceAndApply(0.016f);
+        artboard->draw(renderer.get());
+        counter += 5;
+    }
+
+    CHECK(silver.matches("script_converter_with_dependency"));
+}
+
+TEST_CASE("scripted data converter string using multi chain requires",
+          "[silver]")
+{
+    rive::SerializingFactory silver;
+    auto file = ReadRiveFile("assets/script_dependency_test2.riv", &silver);
+    auto artboard = file->artboardNamed("Artboard");
+
+    silver.frameSize(artboard->width(), artboard->height());
+    REQUIRE(artboard != nullptr);
+    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.1f);
+
+    auto renderer = silver.makeRenderer();
+    artboard->draw(renderer.get());
+
+    rive::ViewModelInstanceString* str =
+        vmi->propertyValue("InputString")->as<rive::ViewModelInstanceString>();
+    REQUIRE(str != nullptr);
+
+    std::vector<std::string> values = {"Hello world!",
+                                       "1,2,3",
+                                       "rive scripting",
+                                       "testing testing testing",
+                                       "Script Data Converter"};
+    for (int i = 0; i < values.size(); i++)
+    {
+        str->propertyValue(values[i]);
+        silver.addFrame();
+        stateMachine->advanceAndApply(0.016f);
+        artboard->draw(renderer.get());
+    }
+
+    CHECK(silver.matches("script_converter_with_dependency_2"));
+}