Merge branch 'master' of github.com:3b1b/manim

old_projects/number_line_scene.py

@@ -1,3 +1,8 @@
+import numpy as np
+from animation.transform import Transform
+from point_cloud_mobject import Point
+from topics.number_line import NumberLine
+
 class NumberLineScene(Scene):
     def construct(self, **number_line_config):
         self.number_line = NumberLine(**number_line_config)

scene/scene_from_video.py

@@ -28,7 +28,7 @@ class SceneFromVideo(Scene):
         print("Reading in " + file_name + "...")
         for count in show_progress(range(start_frame, end_frame+1)):
             returned, frame = cap.read()
-            if not returned
+            if not returned:
                 break
             # b, g, r = cv2.split(frame)
             # self.frames.append(cv2.merge([r, g, b]))
@@ -52,3 +52,4 @@ class SceneFromVideo(Scene):
         for index in range(len(self.frames)):
             for i in range(3):
                 self.frames[index][:,:,i] = edged_frames[index]
+