Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Fixed opengl `set_color` with gradients (#2140)

Ryan McCauley9bf45c7985c2
diff --git a/manim/mobject/types/opengl_vectorized_mobject.py b/manim/mobject/types/opengl_vectorized_mobject.py
index 62e10a6bb..35e9fbda6 100644
--- a/manim/mobject/types/opengl_vectorized_mobject.py
+++ b/manim/mobject/types/opengl_vectorized_mobject.py
@@ -154,7 +154,10 @@ class OpenGLVMobject(OpenGLMobject):
def set_fill(self, color=None, opacity=None, recurse=True):
if color is not None:
- self.fill_color = Color(color)
+ if isinstance(color, str):
+ self.fill_color = Color(color)
+ else:
+ self.fill_color = color
if opacity is not None:
self.fill_opacity = opacity
if recurse:
@@ -173,7 +176,10 @@ class OpenGLVMobject(OpenGLMobject):
recurse=True,
):
if color is not None:
- self.stroke_color = Color(color)
+ if isinstance(color, str):
+ self.stroke_color = Color(color)
+ else:
+ self.stroke_color = color
if opacity is not None:
self.stroke_opacity = opacity
if recurse:
@@ -259,9 +265,13 @@ class OpenGLVMobject(OpenGLMobject):
return self
def set_color(self, color, opacity=None, recurse=True):
- self.color = Color(color)
+ if isinstance(color, str):
+ self.color = Color(color)
+ else:
+ self.color = color
if opacity is not None:
self.opacity = opacity
+
self.set_fill(color, opacity=opacity, recurse=recurse)
self.set_stroke(color, opacity=opacity, recurse=recurse)
return self
diff --git a/tests/opengl/test_color_opengl.py b/tests/opengl/test_color_opengl.py
index 470cc502f..fe70d6e67 100644
--- a/tests/opengl/test_color_opengl.py
+++ b/tests/opengl/test_color_opengl.py
@@ -1,6 +1,7 @@
import numpy as np
+from colour import Color
-from manim import BLACK, PURE_GREEN, Scene
+from manim import BLACK, BLUE, GREEN, PURE_BLUE, PURE_GREEN, PURE_RED, RED, Scene
from manim.mobject.opengl_mobject import OpenGLMobject
from manim.mobject.types.opengl_vectorized_mobject import OpenGLVMobject
@@ -93,3 +94,73 @@ def test_set_fill(using_opengl_renderer):
assert m.color.hex == "#fff"
m.set_color(BLACK)
assert m.color.hex == "#000"
+
+
+def test_set_color_handles_lists_of_strs(using_opengl_renderer):
+ m = OpenGLVMobject()
+ assert m.color.hex == "#fff"
+ m.set_color([BLACK, BLUE, GREEN])
+ assert m.color[0] == BLACK
+ assert m.color[1] == BLUE
+ assert m.color[2] == GREEN
+
+ assert m.fill_color[0] == BLACK
+ assert m.fill_color[1] == BLUE
+ assert m.fill_color[2] == GREEN
+
+ assert m.stroke_color[0] == BLACK
+ assert m.stroke_color[1] == BLUE
+ assert m.stroke_color[2] == GREEN
+
+
+def test_set_color_handles_lists_of_color_objects(using_opengl_renderer):
+ m = OpenGLVMobject()
+ assert m.color.hex == "#fff"
+ m.set_color([Color(PURE_BLUE), Color(PURE_GREEN), Color(PURE_RED)])
+ assert m.color[0].hex == "#00f"
+ assert m.color[1].hex == "#0f0"
+ assert m.color[2].hex == "#f00"
+
+ assert m.fill_color[0].hex == "#00f"
+ assert m.fill_color[1].hex == "#0f0"
+ assert m.fill_color[2].hex == "#f00"
+
+ assert m.stroke_color[0].hex == "#00f"
+ assert m.stroke_color[1].hex == "#0f0"
+ assert m.stroke_color[2].hex == "#f00"
+
+
+def test_set_fill_handles_lists_of_strs(using_opengl_renderer):
+ m = OpenGLVMobject()
+ assert m.fill_color.hex == "#fff"
+ m.set_fill([BLACK, BLUE, GREEN])
+ assert m.fill_color[0] == BLACK
+ assert m.fill_color[1] == BLUE
+ assert m.fill_color[2] == GREEN
+
+
+def test_set_fill_handles_lists_of_color_objects(using_opengl_renderer):
+ m = OpenGLVMobject()
+ assert m.fill_color.hex == "#fff"
+ m.set_fill([Color(PURE_BLUE), Color(PURE_GREEN), Color(PURE_RED)])
+ assert m.fill_color[0].hex == "#00f"
+ assert m.fill_color[1].hex == "#0f0"
+ assert m.fill_color[2].hex == "#f00"
+
+
+def test_set_stroke_handles_lists_of_strs(using_opengl_renderer):
+ m = OpenGLVMobject()
+ assert m.stroke_color.hex == "#fff"
+ m.set_stroke([BLACK, BLUE, GREEN])
+ assert m.stroke_color[0] == BLACK
+ assert m.stroke_color[1] == BLUE
+ assert m.stroke_color[2] == GREEN
+
+
+def test_set_stroke_handles_lists_of_color_objects(using_opengl_renderer):
+ m = OpenGLVMobject()
+ assert m.stroke_color.hex == "#fff"
+ m.set_stroke([Color(PURE_BLUE), Color(PURE_GREEN), Color(PURE_RED)])
+ assert m.stroke_color[0].hex == "#00f"
+ assert m.stroke_color[1].hex == "#0f0"
+ assert m.stroke_color[2].hex == "#f00"