Merge pull request #36 from jonmmease/jonmmease/initial_gradients

Add support for gradients
jonmmease · Jan 27, 2024 · 145bb8f · 145bb8f
2 parents 2413707 + 9709b72
commit 145bb8f
Show file tree

Hide file tree

Showing 104 changed files with 62,192 additions and 991 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/scatter-panning/Cargo.lock b/examples/scatter-panning/Cargo.lock
diff --git a/examples/wgpu-winit/Cargo.lock b/examples/wgpu-winit/Cargo.lock
diff --git a/sg2d-vega-test-data/Cargo.toml b/sg2d-vega-test-data/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 
 [dependencies]
 serde_json = {workspace = true}
-vl-convert-rs = "1.2.1"
+vl-convert-rs = "1.2.3"
 pollster = "0.3"
diff --git a/sg2d-vega-test-data/vega-scenegraphs/gradients/arc_gradient.png b/sg2d-vega-test-data/vega-scenegraphs/gradients/arc_gradient.png
diff --git a/sg2d-vega-test-data/vega-scenegraphs/gradients/arc_gradient.sg.json b/sg2d-vega-test-data/vega-scenegraphs/gradients/arc_gradient.sg.json
@@ -0,0 +1,157 @@
+{
+  "width": 210,
+  "height": 210,
+  "origin": [
+    5,
+    5
+  ],
+  "scenegraph": {
+    "clip": false,
+    "interactive": true,
+    "items": [
+      {
+        "items": [
+          {
+            "clip": false,
+            "interactive": true,
+            "items": [
+              {
+                "x": 100,
+                "y": 100,
+                "outerRadius": 80,
+                "innerRadius": 20,
+                "startAngle": 5,
+                "endAngle": 7,
+                "fill": {
+                  "x1": 0,
+                  "y1": 1,
+                  "x2": 1,
+                  "y2": 1,
+                  "gradient": "linear",
+                  "stops": [
+                    {
+                      "offset": 0,
+                      "color": "yellow"
+                    },
+                    {
+                      "offset": 0.4,
+                      "color": "yellow"
+                    },
+                    {
+                      "offset": 0.6,
+                      "color": "darkgreen"
+                    },
+                    {
+                      "offset": 1,
+                      "color": "darkgreen"
+                    }
+                  ]
+                },
+                "fillOpacity": 0.6,
+                "stroke": {
+                  "x1": 0,
+                  "y1": 0,
+                  "x2": 1,
+                  "y2": 1,
+                  "gradient": "linear",
+                  "stops": [
+                    {
+                      "offset": 0,
+                      "color": "orange"
+                    },
+                    {
+                      "offset": 0.4,
+                      "color": "orange"
+                    },
+                    {
+                      "offset": 0.6,
+                      "color": "purple"
+                    },
+                    {
+                      "offset": 1,
+                      "color": "purple"
+                    }
+                  ]
+                },
+                "strokeWidth": 4
+              },
+              {
+                "x": 100,
+                "y": 100,
+                "outerRadius": 80,
+                "innerRadius": 20,
+                "startAngle": 8,
+                "endAngle": 9,
+                "fill": {
+                  "x1": 0,
+                  "y1": 0,
+                  "x2": 1,
+                  "y2": 1,
+                  "gradient": "linear",
+                  "stops": [
+                    {
+                      "offset": 0,
+                      "color": "orange"
+                    },
+                    {
+                      "offset": 0.4,
+                      "color": "orange"
+                    },
+                    {
+                      "offset": 0.6,
+                      "color": "purple"
+                    },
+                    {
+                      "offset": 1,
+                      "color": "purple"
+                    }
+                  ]
+                },
+                "fillOpacity": 0.6,
+                "stroke": {
+                  "x1": 0,
+                  "y1": 1,
+                  "x2": 1,
+                  "y2": 1,
+                  "gradient": "linear",
+                  "stops": [
+                    {
+                      "offset": 0,
+                      "color": "yellow"
+                    },
+                    {
+                      "offset": 0.4,
+                      "color": "yellow"
+                    },
+                    {
+                      "offset": 0.6,
+                      "color": "darkgreen"
+                    },
+                    {
+                      "offset": 1,
+                      "color": "darkgreen"
+                    }
+                  ]
+                },
+                "strokeWidth": 4
+              }
+            ],
+            "marktype": "arc",
+            "name": "marks",
+            "role": "mark",
+            "zindex": 0
+          }
+        ],
+        "fill": "transparent",
+        "x": 0,
+        "y": 0,
+        "width": 200,
+        "height": 200
+      }
+    ],
+    "marktype": "group",
+    "name": "root",
+    "role": "frame",
+    "zindex": 0
+  }
+}
diff --git a/sg2d-vega-test-data/vega-scenegraphs/gradients/area_line_with_gradient.png b/sg2d-vega-test-data/vega-scenegraphs/gradients/area_line_with_gradient.png