From 4c894077d3de3ab0cc1423aa53d97f70d4cbc3c9 Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Thu, 15 Dec 2022 15:24:08 -0800 Subject: [PATCH] Add np_vector types to constants --- manimlib/constants.py | 168 +++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 83 deletions(-) diff --git a/manimlib/constants.py b/manimlib/constants.py index 752d82c5..87fcac3b 100644 --- a/manimlib/constants.py +++ b/manimlib/constants.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import numpy as np from typing import TYPE_CHECKING @@ -36,27 +38,27 @@ DEFAULT_MOBJECT_TO_MOBJECT_BUFFER: float = MED_SMALL_BUFF DEFAULT_WAIT_TIME: float = 1.0 -ORIGIN = np.array([0., 0., 0.]) -UP = np.array([0., 1., 0.]) -DOWN = np.array([0., -1., 0.]) -RIGHT = np.array([1., 0., 0.]) -LEFT = np.array([-1., 0., 0.]) -IN = np.array([0., 0., -1.]) -OUT = np.array([0., 0., 1.]) -X_AXIS = np.array([1., 0., 0.]) -Y_AXIS = np.array([0., 1., 0.]) -Z_AXIS = np.array([0., 0., 1.]) +ORIGIN: np_vector = np.array([0., 0., 0.]) +UP: np_vector = np.array([0., 1., 0.]) +DOWN: np_vector = np.array([0., -1., 0.]) +RIGHT: np_vector = np.array([1., 0., 0.]) +LEFT: np_vector = np.array([-1., 0., 0.]) +IN: np_vector = np.array([0., 0., -1.]) +OUT: np_vector = np.array([0., 0., 1.]) +X_AXIS: np_vector = np.array([1., 0., 0.]) +Y_AXIS: np_vector = np.array([0., 1., 0.]) +Z_AXIS: np_vector = np.array([0., 0., 1.]) # Useful abbreviations for diagonals -UL = UP + LEFT -UR = UP + RIGHT -DL = DOWN + LEFT -DR = DOWN + RIGHT +UL: np_vector = UP + LEFT +UR: np_vector = UP + RIGHT +DL: np_vector = DOWN + LEFT +DR: np_vector = DOWN + RIGHT -TOP = FRAME_Y_RADIUS * UP -BOTTOM = FRAME_Y_RADIUS * DOWN -LEFT_SIDE = FRAME_X_RADIUS * LEFT -RIGHT_SIDE = FRAME_X_RADIUS * RIGHT +TOP: np_vector = FRAME_Y_RADIUS * UP +BOTTOM: np_vector = FRAME_Y_RADIUS * DOWN +LEFT_SIDE: np_vector = FRAME_X_RADIUS * LEFT +RIGHT_SIDE: np_vector = FRAME_X_RADIUS * RIGHT PI: float = np.pi TAU: float = 2 * PI @@ -95,62 +97,62 @@ COMMAND_MODIFIER: int = 64 # Colors -BLUE_E = "#1C758A" -BLUE_D = "#29ABCA" -BLUE_C = "#58C4DD" -BLUE_B = "#9CDCEB" -BLUE_A = "#C7E9F1" -TEAL_E = "#49A88F" -TEAL_D = "#55C1A7" -TEAL_C = "#5CD0B3" -TEAL_B = "#76DDC0" -TEAL_A = "#ACEAD7" -GREEN_E = "#699C52" -GREEN_D = "#77B05D" -GREEN_C = "#83C167" -GREEN_B = "#A6CF8C" -GREEN_A = "#C9E2AE" -YELLOW_E = "#E8C11C" -YELLOW_D = "#F4D345" -YELLOW_C = "#FFFF00" -YELLOW_B = "#FFEA94" -YELLOW_A = "#FFF1B6" -GOLD_E = "#C78D46" -GOLD_D = "#E1A158" -GOLD_C = "#F0AC5F" -GOLD_B = "#F9B775" -GOLD_A = "#F7C797" -RED_E = "#CF5044" -RED_D = "#E65A4C" -RED_C = "#FC6255" -RED_B = "#FF8080" -RED_A = "#F7A1A3" -MAROON_E = "#94424F" -MAROON_D = "#A24D61" -MAROON_C = "#C55F73" -MAROON_B = "#EC92AB" -MAROON_A = "#ECABC1" -PURPLE_E = "#644172" -PURPLE_D = "#715582" -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_BROWN = "#736357" -DARK_BROWN = "#8B4513" -LIGHT_BROWN = "#CD853F" -PINK = "#D147BD" -LIGHT_PINK = "#DC75CD" -GREEN_SCREEN = "#00FF00" -ORANGE = "#FF862F" +BLUE_E: ManimColor = "#1C758A" +BLUE_D: ManimColor = "#29ABCA" +BLUE_C: ManimColor = "#58C4DD" +BLUE_B: ManimColor = "#9CDCEB" +BLUE_A: ManimColor = "#C7E9F1" +TEAL_E: ManimColor = "#49A88F" +TEAL_D: ManimColor = "#55C1A7" +TEAL_C: ManimColor = "#5CD0B3" +TEAL_B: ManimColor = "#76DDC0" +TEAL_A: ManimColor = "#ACEAD7" +GREEN_E: ManimColor = "#699C52" +GREEN_D: ManimColor = "#77B05D" +GREEN_C: ManimColor = "#83C167" +GREEN_B: ManimColor = "#A6CF8C" +GREEN_A: ManimColor = "#C9E2AE" +YELLOW_E: ManimColor = "#E8C11C" +YELLOW_D: ManimColor = "#F4D345" +YELLOW_C: ManimColor = "#FFFF00" +YELLOW_B: ManimColor = "#FFEA94" +YELLOW_A: ManimColor = "#FFF1B6" +GOLD_E: ManimColor = "#C78D46" +GOLD_D: ManimColor = "#E1A158" +GOLD_C: ManimColor = "#F0AC5F" +GOLD_B: ManimColor = "#F9B775" +GOLD_A: ManimColor = "#F7C797" +RED_E: ManimColor = "#CF5044" +RED_D: ManimColor = "#E65A4C" +RED_C: ManimColor = "#FC6255" +RED_B: ManimColor = "#FF8080" +RED_A: ManimColor = "#F7A1A3" +MAROON_E: ManimColor = "#94424F" +MAROON_D: ManimColor = "#A24D61" +MAROON_C: ManimColor = "#C55F73" +MAROON_B: ManimColor = "#EC92AB" +MAROON_A: ManimColor = "#ECABC1" +PURPLE_E: ManimColor = "#644172" +PURPLE_D: ManimColor = "#715582" +PURPLE_C: ManimColor = "#9A72AC" +PURPLE_B: ManimColor = "#B189C6" +PURPLE_A: ManimColor = "#CAA3E8" +GREY_E: ManimColor = "#222222" +GREY_D: ManimColor = "#444444" +GREY_C: ManimColor = "#888888" +GREY_B: ManimColor = "#BBBBBB" +GREY_A: ManimColor = "#DDDDDD" +WHITE: ManimColor = "#FFFFFF" +BLACK: ManimColor = "#000000" +GREY_BROWN: ManimColor = "#736357" +DARK_BROWN: ManimColor = "#8B4513" +LIGHT_BROWN: ManimColor = "#CD853F" +PINK: ManimColor = "#D147BD" +LIGHT_PINK: ManimColor = "#DC75CD" +GREEN_SCREEN: ManimColor = "#00FF00" +ORANGE: ManimColor = "#FF862F" -MANIM_COLORS = [ +MANIM_COLORS: List[ManimColor] = [ BLACK, GREY_E, GREY_D, GREY_C, GREY_B, GREY_A, WHITE, BLUE_E, BLUE_D, BLUE_C, BLUE_B, BLUE_A, TEAL_E, TEAL_D, TEAL_C, TEAL_B, TEAL_A, @@ -165,14 +167,14 @@ MANIM_COLORS = [ ] # Abbreviated names for the "median" colors -BLUE = BLUE_C -TEAL = TEAL_C -GREEN = GREEN_C -YELLOW = YELLOW_C -GOLD = GOLD_C -RED = RED_C -MAROON = MAROON_C -PURPLE = PURPLE_C -GREY = GREY_C +BLUE: ManimColor = BLUE_C +TEAL: ManimColor = TEAL_C +GREEN: ManimColor = GREEN_C +YELLOW: ManimColor = YELLOW_C +GOLD: ManimColor = GOLD_C +RED: ManimColor = RED_C +MAROON: ManimColor = MAROON_C +PURPLE: ManimColor = PURPLE_C +GREY: ManimColor = GREY_C -COLORMAP_3B1B = [BLUE_E, GREEN, YELLOW, RED] +COLORMAP_3B1B: List[ManimColor] = [BLUE_E, GREEN, YELLOW, RED]