Make SkV3/SkV4 convertible from py::list

susmitamane · Nov 7, 2024 · 664de84 · 664de84
1 parent c1a6a5d
commit 664de84
Showing 1 changed file with 29 additions and 0 deletions.
diff --git a/src/skia/RuntimeEffect.cpp b/src/skia/RuntimeEffect.cpp
@@ -21,15 +21,33 @@ py::class_<SkV3>(m, "V3")
         [] (float x, float y, float z) {
             return SkV3{x, y, z};
         }))
+    .def(py::init(
+        [] (py::tuple v3) {
+            if (v3.size() != 3)
+                throw py::value_error("V3 must have exactly three elements.");
+            return SkV3{v3[0].cast<float>(), v3[1].cast<float>(), v3[2].cast<float>()};
+        }),
+        py::arg("v3"))
     ;
 
+py::implicitly_convertible<py::tuple, SkV3>();
+
 py::class_<SkV4>(m, "V4")
     .def(py::init(
         [] (float x, float y, float z, float w) {
             return SkV4{x, y, z, w};
         }))
+    .def(py::init(
+        [] (py::tuple v4) {
+            if (v4.size() != 4)
+                throw py::value_error("V4 must have exactly four elements.");
+            return SkV4{v4[0].cast<float>(), v4[1].cast<float>(), v4[2].cast<float>(), v4[3].cast<float>()};
+        }),
+        py::arg("v4"))
     ;
 
+py::implicitly_convertible<py::tuple, SkV4>();
+
 py::class_<SkRuntimeEffect::Result>(m, "RuntimeEffectResult")
     .def_readwrite("effect", &SkRuntimeEffect::Result::effect)
     .def_readwrite("errorText", &SkRuntimeEffect::Result::errorText)
@@ -177,6 +195,17 @@ runtime_effect_builder
             v = uniform;
         },
         py::arg("name"), py::arg("uniform"))
+    .def("setUniform",
+        [] (SkRuntimeEffectBuilder& builder, std::string_view name, py::list vN) {
+          if (vN.size() != 3 && vN.size() != 4)
+                throw py::value_error("Input must have exactly three or four elements.");
+            auto v = builder.uniform(name);
+            if (vN.size() == 3)
+                v = SkV3{vN[0].cast<float>(), vN[1].cast<float>(), vN[2].cast<float>()};
+            if (vN.size() == 4)
+                v = SkV4{vN[0].cast<float>(), vN[1].cast<float>(), vN[2].cast<float>(), vN[3].cast<float>()};
+        },
+        py::arg("name"), py::arg("uniform"))
     .def("setChild",
         [] (SkRuntimeEffectBuilder& builder, std::string_view name, sk_sp<SkShader> child) {
             auto v = builder.child(name);