public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-09-01 00:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Interpolate colors using square of rgbs

Browse source
This commit is contained in:
Grant Sanderson 2022-12-29 16:07:28 -08:00
parent 124c83d94e
commit 04d3e6a47c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manimlib/utils/color.py
View file

@ -88,7 +88,7 @@ def color_gradient(
alphas_mod1[-1] = 1 alphas_mod1[-1] = 1
floors[-1] = len(rgbs) - 2 floors[-1] = len(rgbs) - 2
return [ return [
rgb_to_color(interpolate(rgbs[i], rgbs[i + 1], alpha)) rgb_to_color(np.sqrt(interpolate(rgbs[i]**2, rgbs[i + 1]**2, alpha)))
for i, alpha in zip(floors, alphas_mod1) for i, alpha in zip(floors, alphas_mod1)
] ]
@ -98,13 +98,13 @@ def interpolate_color(
color2: ManimColor, color2: ManimColor,
alpha: float alpha: float
) -> Color: ) -> Color:
rgb = interpolate(color_to_rgb(color1), color_to_rgb(color2), alpha) rgb = np.sqrt(interpolate(color_to_rgb(color1)**2, color_to_rgb(color2)**2, alpha))
return rgb_to_color(rgb) return rgb_to_color(rgb)
def average_color(*colors: ManimColor) -> Color: def average_color(*colors: ManimColor) -> Color:
rgbs = np.array(list(map(color_to_rgb, colors))) rgbs = np.array(list(map(color_to_rgb, colors)))
return rgb_to_color(rgbs.mean(0)) return rgb_to_color(np.sqrt((rgbs**2).mean(0)))
def random_color() -> Color: def random_color() -> Color: