Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from 3b1b:master #15

Merged
merged 15 commits into from
Dec 30, 2022
Merged

[pull] master from 3b1b:master #15

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
04d3e6a
Interpolate colors using square of rgbs
3b1b Dec 30, 2022
0f9adbf
Add Tex.make_number_changable
3b1b Dec 30, 2022
7df12c6
Tiny cleanup
3b1b Dec 30, 2022
5c33c7e
Remove "None" output type for set_animating_status
3b1b Dec 30, 2022
4db01fd
Fix Mobject.looks_identical
3b1b Dec 30, 2022
3b4a233
Fix LaggedStartMap
3b1b Dec 30, 2022
5d87f3f
Update parents of new_mob in Mobject.replace
3b1b Dec 30, 2022
fdccfd5
Add TexAndNumbersExample
3b1b Dec 30, 2022
632819d
Show examples of indexing by substrings and regular expressions
3b1b Dec 30, 2022
8e3378f
Orient Camera.get_pixel_array correctly
3b1b Dec 30, 2022
7dde368
Ensure error-flash rect is fixed in frame
3b1b Dec 30, 2022
7895a2c
No need to immediately compute triangulation for SVG paths
3b1b Dec 30, 2022
dddaef0
Add lru_cache for get_shader_code_from_file
3b1b Dec 30, 2022
66f0a57
Clean up looks_identical
3b1b Dec 30, 2022
50960ee
Merge pull request #1953 from 3b1b/video-work
3b1b Dec 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Interpolate colors using square of rgbs
  • Loading branch information
@3b1b
3b1b committed Dec 30, 2022
commit 04d3e6a47ca9960777754aa3abe77f5acc87b5a0
6 changes: 3 additions & 3 deletions manimlib/utils/color.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def color_gradient(
alphas_mod1[-1] = 1
floors[-1] = len(rgbs) - 2
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)
]

Expand All @@ -98,13 +98,13 @@ def interpolate_color(
color2: ManimColor,
alpha: float
) -> 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)


def average_color(*colors: ManimColor) -> Color:
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:
Expand Down