From 3b26a6c2605bf1509f697503e8b05282b57548c0 Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Sat, 2 Jan 2021 22:44:53 -0800 Subject: [PATCH] Clean up colors, e.g. replacing LIGHT_GREY and DARK_GREY with GREY_B and GREY_D --- manimlib/constants.py | 24 +++++++----------------- manimlib/mobject/number_line.py | 2 +- manimlib/mobject/probability.py | 4 ++-- manimlib/mobject/svg/drawings.py | 2 +- manimlib/scene/vector_space_scene.py | 2 +- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/manimlib/constants.py b/manimlib/constants.py index 8f62d2cf..236f092d 100644 --- a/manimlib/constants.py +++ b/manimlib/constants.py @@ -102,9 +102,6 @@ DEFAULT_STROKE_WIDTH = 4 # Colors COLOR_MAP = { - "DARK_BLUE": "#236B8E", - "DARK_BROWN": "#8B4513", - "LIGHT_BROWN": "#CD853F", "BLUE_E": "#1C758A", "BLUE_D": "#29ABCA", "BLUE_C": "#58C4DD", @@ -145,23 +142,16 @@ COLOR_MAP = { "PURPLE_C": "#9A72AC", "PURPLE_B": "#B189C6", "PURPLE_A": "#CAA3E8", + "GREY_E": "#222222", + "GREY_D": "#444444", + "GREY_C": "#888888", + "GREY_B": "#BBBBBB", + "GREY_A": "#DDDDDD", "WHITE": "#FFFFFF", "BLACK": "#000000", - "GREY_A": "#DDDDDD", - "GREY_B": "#BBBBBB", - "GREY_C": "#888888", - "GREY_D": "#444444", - "GREY_E": "#222222", - # TODO, remove these greys - "LIGHT_GRAY": "#BBBBBB", - "LIGHT_GREY": "#BBBBBB", - "GRAY": "#888888", - "GREY": "#888888", - "DARK_GREY": "#444444", - "DARK_GRAY": "#444444", - "DARKER_GREY": "#222222", - "DARKER_GRAY": "#222222", "GREY_BROWN": "#736357", + "DARK_BROWN": "#8B4513", + "LIGHT_BROWN": "#CD853F", "PINK": "#D147BD", "LIGHT_PINK": "#DC75CD", "GREEN_SCREEN": "#00FF00", diff --git a/manimlib/mobject/number_line.py b/manimlib/mobject/number_line.py index b5925fe5..d6e94ece 100644 --- a/manimlib/mobject/number_line.py +++ b/manimlib/mobject/number_line.py @@ -12,7 +12,7 @@ from manimlib.utils.space_ops import normalize class NumberLine(Line): CONFIG = { - "color": LIGHT_GREY, + "color": GREY_B, "stroke_width": 2, # List of 2 or 3 elements, x_min, x_max, step_size "x_range": [-8, 8, 1], diff --git a/manimlib/mobject/probability.py b/manimlib/mobject/probability.py index 55705af1..78ac6c04 100644 --- a/manimlib/mobject/probability.py +++ b/manimlib/mobject/probability.py @@ -16,10 +16,10 @@ class SampleSpace(Rectangle): CONFIG = { "height": 3, "width": 3, - "fill_color": DARK_GREY, + "fill_color": GREY_D, "fill_opacity": 1, "stroke_width": 0.5, - "stroke_color": LIGHT_GREY, + "stroke_color": GREY_B, ## "default_label_scale_val": 1, } diff --git a/manimlib/mobject/svg/drawings.py b/manimlib/mobject/svg/drawings.py index 3af30cd1..575f9db4 100644 --- a/manimlib/mobject/svg/drawings.py +++ b/manimlib/mobject/svg/drawings.py @@ -132,7 +132,7 @@ class Laptop(VGroup): }, "fill_opacity": 1, "stroke_width": 0, - "body_color": LIGHT_GREY, + "body_color": GREY_B, "shaded_body_color": GREY, "open_angle": np.pi / 4, } diff --git a/manimlib/scene/vector_space_scene.py b/manimlib/scene/vector_space_scene.py index 902ad3bd..62f8fac0 100644 --- a/manimlib/scene/vector_space_scene.py +++ b/manimlib/scene/vector_space_scene.py @@ -288,7 +288,7 @@ class LinearTransformationScene(VectorScene): "background_plane_kwargs": { "color": GREY, "axis_config": { - "stroke_color": LIGHT_GREY, + "stroke_color": GREY_B, }, "axis_config": { "color": GREY,