Fix MovingCamera and ZoomedScene (#388)

* remove set/get and replace with properties that override the Camera properties

* fix typo

* Make save_state always use copy()

* Use camera.pixel_array instead of camera.get_pixel_array.

* More descriptive AssertionError for incompatible pixel array shapes.

Co-authored-by: Aathish Sivasubrahmanian <[email protected]>

Author: leotrs

manim/camera/moving_camera.py

@@ -48,7 +48,8 @@ def __init__(self, frame=None, **kwargs):
         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 @@ def get_frame_height(self):
         """
         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 @@ def get_frame_width(self):
         """
         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 @@ def get_frame_center(self):
         """
         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 @@ def set_frame_height(self, frame_height):
         """
         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 @@ def set_frame_width(self, frame_width):
         """
         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

manim/mobject/mobject.py

@@ -718,14 +718,12 @@ def get_color(self):
 
     ##
 
-    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):

manim/mobject/types/image_mobject.py

@@ -101,7 +101,11 @@ def fade(self, darkness=0.5, family=True):
         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,14 +127,27 @@ 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)
         config.update(kwargs)
         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)

manim/scene/zoomed_scene.py

@@ -126,7 +126,7 @@ def get_zoomed_display_pop_out_animation(self, **kwargs):
             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)