A community-maintained Python framework for creating mathematical animations.
Some bug fixes to ZoomedScene
Grant Sandersona982b3c1acdf
diff --git a/scene/moving_camera_scene.py b/scene/moving_camera_scene.pyindex f3f5ed74e..7d777804a 100644--- a/scene/moving_camera_scene.py+++ b/scene/moving_camera_scene.py@@ -1,19 +1,20 @@from __future__ import absolute_import-from constants import *-from scene.scene import Scenefrom camera.moving_camera import MovingCamera-from mobject.frame import ScreenRectangleclass MovingCameraScene(Scene):+ CONFIG = {+ "camera_class": MovingCamera+ }+def setup(self):- self.camera_frame = ScreenRectangle(height=FRAME_HEIGHT)- self.camera_frame.set_stroke(width=0)- self.camera = MovingCamera(- self.camera_frame, **self.camera_config- )+ Scene.setup(self)+ assert(isinstance(self.camera, MovingCamera))+ self.camera_frame = self.camera.frame+ # Hmm, this currently relies on the fact that MovingCamera+ # willd default to a full-sized frame. Is that okay?return selfdef get_moving_mobjects(self, *animations):diff --git a/scene/zoomed_scene.py b/scene/zoomed_scene.pyindex bf628894b..fb959ff0c 100644--- a/scene/zoomed_scene.py+++ b/scene/zoomed_scene.py@@ -1,9 +1,10 @@from __future__ import absolute_import-from scene.scene import Scene+from scene.moving_camera_scene import MovingCameraScenefrom camera.moving_camera import MovingCamerafrom camera.multi_camera import MultiCamerafrom mobject.types.image_mobject import ImageMobjectFromCamera+from utils.simple_functions import fdivfrom constants import *@@ -11,7 +12,7 @@ from constants import *# Note, any scenes from old videos using ZoomedScene will almost certainly# break, as it was restructured.-class ZoomedScene(Scene):+class ZoomedScene(MovingCameraScene):CONFIG = {"camera_class": MultiCamera,"zoomed_display_height": 3,@@ -30,6 +31,7 @@ class ZoomedScene(Scene):}def setup(self):+ MovingCameraScene.setup(self)# Initialize camera and displayzoomed_camera = MovingCamera(**self.zoomed_camera_config)zoomed_display = ImageMobjectFromCamera(@@ -80,7 +82,7 @@ class ZoomedScene(Scene):self.add_foreground_mobjects(*to_add)def get_moving_mobjects(self, *animations):- moving_mobjects = Scene.get_moving_mobjects(self, *animations)+ moving_mobjects = MovingCameraScene.get_moving_mobjects(self, *animations)zoomed_mobjects = [self.zoomed_camera.frame, self.zoomed_display]moving_zoomed_mobjects = set(moving_mobjects).intersection(zoomed_mobjects)if self.zoom_activated and moving_zoomed_mobjects:@@ -88,3 +90,9 @@ class ZoomedScene(Scene):# everythingreturn self.mobjectsreturn moving_mobjects++ def get_zoom_factor(self):+ return fdiv(+ self.zoomed_camera.frame.get_width(),+ self.zoomed_display.get_width()+ )