vertex_colors -> color_mode='vertex' (#312)

kushalkolar · web-flow · commit c3fd72e05309 · 2023-10-02T18:30:27.000-04:00
* vertex_colors -&gt; color_mode='vertex'

* update ci to use pygfx@main instead of a specific commit
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
         python -m pip install --upgrade pip
         # remove pygfx from requirements, we install a specific commit of pygfx since both fpl and pygfx are fast evolving
         sed -i "/pygfx/d" ./setup.py
-        pip install git+https://github.com/pygfx/pygfx.git@cf1da6c32223ba3cf7256982ce9b89c81b593076
+        pip install git+https://github.com/pygfx/pygfx.git@main
         pip install -e ".[notebook,docs,tests]"
     - name: Build docs
       run: |
@@ -78,7 +78,7 @@ jobs:
         python -m pip install --upgrade pip
         # remove pygfx from requirements, we install a specific commit of pygfx since both fpl and pygfx are fast evolving
         sed -i "/pygfx/d" ./setup.py
-        pip install git+https://github.com/pygfx/pygfx.git@cf1da6c32223ba3cf7256982ce9b89c81b593076
+        pip install git+https://github.com/pygfx/pygfx.git@main
         pip install -e ".["tests"]"
     - name: Show wgpu backend
       run:
diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml
@@ -33,7 +33,7 @@ jobs:
           python -m pip install --upgrade pip
           # remove pygfx from requirements, we install a specific commit of pygfx since both fpl and pygfx are fast evolving
           sed -i "/pygfx/d" ./setup.py
-          pip install git+https://github.com/pygfx/pygfx.git@b63f22a1aa61993c32cd96895316cb8248a81e4d
+          pip install git+https://github.com/pygfx/pygfx.git@main
           pip install -e ".["tests"]"
       - name: Show wgpu backend
         run:
diff --git a/fastplotlib/graphics/line.py b/fastplotlib/graphics/line.py
@@ -114,7 +114,7 @@ def __init__(
         world_object: pygfx.Line = pygfx.Line(
             # self.data.feature_data because data is a Buffer
             geometry=pygfx.Geometry(positions=self.data(), colors=self.colors()),
-            material=material(thickness=self.thickness(), vertex_colors=True),
+            material=material(thickness=self.thickness(), color_mode="vertex"),
         )
 
         self._set_world_object(world_object)
diff --git a/fastplotlib/graphics/scatter.py b/fastplotlib/graphics/scatter.py
@@ -91,7 +91,7 @@ def __init__(
 
         world_object = pygfx.Points(
             pygfx.Geometry(positions=self.data(), sizes=self.sizes(), colors=self.colors()),
-            material=pygfx.PointsMaterial(vertex_colors=True, vertex_sizes=True),
+            material=pygfx.PointsMaterial(color_mode="vertex", vertex_sizes=True),
         )
 
         self._set_world_object(world_object)

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ def __init__(`
`114`	`114`	`world_object: pygfx.Line = pygfx.Line(`
`115`	`115`	`# self.data.feature_data because data is a Buffer`
`116`	`116`	`geometry=pygfx.Geometry(positions=self.data(), colors=self.colors()),`
`117`		`- material=material(thickness=self.thickness(), vertex_colors=True),`
	`117`	`+ material=material(thickness=self.thickness(), color_mode="vertex"),`
`118`	`118`	`)`
`119`	`119`
`120`	`120`	`self._set_world_object(world_object)`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ def __init__(`
`91`	`91`
`92`	`92`	`world_object = pygfx.Points(`
`93`	`93`	`pygfx.Geometry(positions=self.data(), sizes=self.sizes(), colors=self.colors()),`
`94`		`- material=pygfx.PointsMaterial(vertex_colors=True, vertex_sizes=True),`
	`94`	`+ material=pygfx.PointsMaterial(color_mode="vertex", vertex_sizes=True),`
`95`	`95`	`)`
`96`	`96`
`97`	`97`	`self._set_world_object(world_object)`