Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Fix MovingCamera and ZoomedScene (#388)

Leo Torresba004b85e537
diff --git a/manim/camera/moving_camera.py b/manim/camera/moving_camera.py
index 55afc497b..342bb44ce 100644
--- a/manim/camera/moving_camera.py
+++ b/manim/camera/moving_camera.py
@@ -48,7 +48,8 @@ class MovingCamera(Camera):
Camera.__init__(self, **kwargs)
# TODO, make these work for a rotated frame
- def get_frame_height(self):
+ @property
+ def frame_height(self):
"""Returns the height of the frame.
Returns
@@ -58,7 +59,8 @@ class MovingCamera(Camera):
"""
return self.frame.get_height()
- def get_frame_width(self):
+ @property
+ def frame_width(self):
"""Returns the width of the frame
Returns
@@ -68,7 +70,8 @@ class MovingCamera(Camera):
"""
return self.frame.get_width()
- def get_frame_center(self):
+ @property
+ def frame_center(self):
"""Returns the centerpoint of the frame in cartesian coordinates.
Returns
@@ -78,7 +81,8 @@ class MovingCamera(Camera):
"""
return self.frame.get_center()
- def set_frame_height(self, frame_height):
+ @frame_height.setter
+ def frame_height(self, frame_height):
"""Sets the height of the frame in MUnits.
Parameters
@@ -88,7 +92,8 @@ class MovingCamera(Camera):
"""
self.frame.stretch_to_fit_height(frame_height)
- def set_frame_width(self, frame_width):
+ @frame_width.setter
+ def frame_width(self, frame_width):
"""Sets the width of the frame in MUnits.
Parameters
@@ -98,7 +103,8 @@ class MovingCamera(Camera):
"""
self.frame.stretch_to_fit_width(frame_width)
- def set_frame_center(self, frame_center):
+ @frame_center.setter
+ def frame_center(self, frame_center):
"""Sets the centerpoint of the frame.
Parameters
diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.py
index a9dbf772b..8220bc3d6 100644
--- a/manim/mobject/mobject.py
+++ b/manim/mobject/mobject.py
@@ -718,14 +718,12 @@ class Mobject(Container):
##
- def save_state(self, use_deepcopy=False):
+ def save_state(self):
if hasattr(self, "saved_state"):
# Prevent exponential growth of data
self.saved_state = None
- if use_deepcopy:
- self.saved_state = self.deepcopy()
- else:
- self.saved_state = self.copy()
+ self.saved_state = self.copy()
+
return self
def restore(self):
diff --git a/manim/mobject/types/image_mobject.py b/manim/mobject/types/image_mobject.py
index db8bedf29..952476772 100644
--- a/manim/mobject/types/image_mobject.py
+++ b/manim/mobject/types/image_mobject.py
@@ -101,7 +101,11 @@ class ImageMobject(AbstractImageMobject):
return self
def interpolate_color(self, mobject1, mobject2, alpha):
- assert mobject1.pixel_array.shape == mobject2.pixel_array.shape
+ assert mobject1.pixel_array.shape == mobject2.pixel_array.shape, (
+ f"Mobject pixel array shapes incompatible for interpolation.\n"
+ f"Mobject 1 ({mobject1}) : {mobject1.pixel_array.shape}\n"
+ f"Mobject 2 ({mobject2}) : {mobject1.pixel_array.shape}"
+ )
self.pixel_array = interpolate(
mobject1.pixel_array, mobject2.pixel_array, alpha
).astype(self.pixel_array_dtype)
@@ -123,10 +127,13 @@ class ImageMobjectFromCamera(AbstractImageMobject):
def __init__(self, camera, **kwargs):
self.camera = camera
+ self.pixel_array = self.camera.pixel_array
AbstractImageMobject.__init__(self, **kwargs)
+ # TODO: Get rid of this.
def get_pixel_array(self):
- return self.camera.get_pixel_array()
+ self.pixel_array = self.camera.pixel_array
+ return self.pixel_array
def add_display_frame(self, **kwargs):
config = dict(self.default_display_frame_config)
@@ -134,3 +141,13 @@ class ImageMobjectFromCamera(AbstractImageMobject):
self.display_frame = SurroundingRectangle(self, **config)
self.add(self.display_frame)
return self
+
+ def interpolate_color(self, mobject1, mobject2, alpha):
+ assert mobject1.pixel_array.shape == mobject2.pixel_array.shape, (
+ f"Mobject pixel array shapes incompatible for interpolation.\n"
+ f"Mobject 1 ({mobject1}) : {mobject1.pixel_array.shape}\n"
+ f"Mobject 2 ({mobject2}) : {mobject1.pixel_array.shape}"
+ )
+ self.pixel_array = interpolate(
+ mobject1.pixel_array, mobject2.pixel_array, alpha
+ ).astype(self.pixel_array_dtype)
diff --git a/manim/scene/zoomed_scene.py b/manim/scene/zoomed_scene.py
index b2f321d16..72217cfd6 100644
--- a/manim/scene/zoomed_scene.py
+++ b/manim/scene/zoomed_scene.py
@@ -126,7 +126,7 @@ class ZoomedScene(MovingCameraScene):
The Animation of the Zoomed Display popping out.
"""
display = self.zoomed_display
- display.save_state(use_deepcopy=True)
+ display.save_state()
display.replace(self.zoomed_camera.frame, stretch=True)
return ApplyMethod(display.restore)