From 29220ac509ed95acab06d7222afe1d46b5eb1b41 Mon Sep 17 00:00:00 2001 From: kolibril13 Date: Fri, 14 Aug 2020 11:25:36 +0200 Subject: [PATCH 1/2] # Changes in camera.py to fix fixed frame option in 3D --- manim/camera/camera.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manim/camera/camera.py b/manim/camera/camera.py index 8dc65309bd..fdc0c4b256 100644 --- a/manim/camera/camera.py +++ b/manim/camera/camera.py @@ -414,9 +414,8 @@ def extract_mobject_family_members(self, mobjects, only_those_with_points=False) else: method = Mobject.get_family if self.use_z_index: - mobjects.sort(key=lambda m: m.z_index) + mobjects = sorted(mobjects,key=lambda m: m.z_index) return remove_list_redundancies(list(it.chain(*[method(m) for m in mobjects]))) - def get_mobjects_to_display( self, mobjects, include_submobjects=True, excluded_mobjects=None ): From 0525f64be6b803215246a6ceb7fa5f56df279d9a Mon Sep 17 00:00:00 2001 From: kolibril13 Date: Fri, 14 Aug 2020 11:30:09 +0200 Subject: [PATCH 2/2] # run black on camera --- manim/camera/camera.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/manim/camera/camera.py b/manim/camera/camera.py index fdc0c4b256..7520e31cd7 100644 --- a/manim/camera/camera.py +++ b/manim/camera/camera.py @@ -414,8 +414,9 @@ def extract_mobject_family_members(self, mobjects, only_those_with_points=False) else: method = Mobject.get_family if self.use_z_index: - mobjects = sorted(mobjects,key=lambda m: m.z_index) + mobjects = sorted(mobjects, key=lambda m: m.z_index) return remove_list_redundancies(list(it.chain(*[method(m) for m in mobjects]))) + def get_mobjects_to_display( self, mobjects, include_submobjects=True, excluded_mobjects=None ): @@ -438,7 +439,7 @@ def get_mobjects_to_display( """ if include_submobjects: mobjects = self.extract_mobject_family_members( - mobjects, only_those_with_points=True, + mobjects, only_those_with_points=True ) if excluded_mobjects: all_excluded = self.extract_mobject_family_members(excluded_mobjects) @@ -973,9 +974,7 @@ def overlay_rgba_array(self, pixel_array, new_array): new_array : np.array The new pixel array to overlay. """ - self.overlay_PIL_image( - pixel_array, self.get_image(new_array), - ) + self.overlay_PIL_image(pixel_array, self.get_image(new_array)) def overlay_PIL_image(self, pixel_array, image): """Overlays a PIL image on the passed pixel array. @@ -1091,9 +1090,9 @@ def adjusted_thickness(self, thickness): """ # TODO: This seems...unsystematic big_sum = op.add( - camera_config["default_pixel_height"], camera_config["default_pixel_width"], + camera_config["default_pixel_height"], camera_config["default_pixel_width"] ) - this_sum = op.add(self.get_pixel_height(), self.get_pixel_width(),) + this_sum = op.add(self.get_pixel_height(), self.get_pixel_width()) factor = fdiv(big_sum, this_sum) return 1 + (thickness - 1) / factor