From 32b76bf4487ec475e3123a44290e8ec69c1ee840 Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Sat, 2 Jan 2021 22:38:07 -0800 Subject: [PATCH] Small move to DEFAULT_PIXEL_HEIGHT, etc. In theory these values shouldn't matter anymore, but it's nice to have some default there for the definition of Camera --- manimlib/camera/camera.py | 2 +- manimlib/constants.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/manimlib/camera/camera.py b/manimlib/camera/camera.py index db90bf1e..e5521114 100644 --- a/manimlib/camera/camera.py +++ b/manimlib/camera/camera.py @@ -132,7 +132,7 @@ class Camera(object): "frame_config": {}, "pixel_height": DEFAULT_PIXEL_HEIGHT, "pixel_width": DEFAULT_PIXEL_WIDTH, - "frame_rate": DEFAULT_FRAME_RATE, # TODO, move this elsewhere + "frame_rate": DEFAULT_FRAME_RATE, # Note: frame height and width will be resized to match # the pixel aspect ratio "background_color": BLACK, diff --git a/manimlib/constants.py b/manimlib/constants.py index 1c6f33c2..8f62d2cf 100644 --- a/manimlib/constants.py +++ b/manimlib/constants.py @@ -7,6 +7,10 @@ FRAME_WIDTH = FRAME_HEIGHT * ASPECT_RATIO FRAME_Y_RADIUS = FRAME_HEIGHT / 2 FRAME_X_RADIUS = FRAME_WIDTH / 2 +DEFAULT_PIXEL_HEIGHT = 1080 +DEFAULT_PIXEL_WIDTH = 1920 +DEFAULT_FRAME_RATE = 30 + SMALL_BUFF = 0.1 MED_SMALL_BUFF = 0.25 MED_LARGE_BUFF = 0.5 @@ -94,14 +98,8 @@ UHD_QUALITY_CAMERA_CONFIG = { "frame_rate": 60, } -# TOOD, remove these -DEFAULT_PIXEL_HEIGHT = UHD_QUALITY_CAMERA_CONFIG["pixel_height"] -DEFAULT_PIXEL_WIDTH = UHD_QUALITY_CAMERA_CONFIG["pixel_width"] -DEFAULT_FRAME_RATE = 60 - DEFAULT_STROKE_WIDTH = 4 - # Colors COLOR_MAP = { "DARK_BLUE": "#236B8E",