public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-04-13 09:47:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simple cleanup and removal of unused functions

Browse source
This commit is contained in:
Grant Sanderson 2021-01-05 22:37:28 -08:00
parent 446a69f7c0
commit 3c1ab6ce25
1 changed files with 50 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
manimlib/scene/scene.py
View file

@ -1,8 +1,8 @@
import inspect import inspect
import random import random
import warnings
import platform import platform
import itertools as it import itertools as it
import logging
from tqdm import tqdm as ProgressDisplay from tqdm import tqdm as ProgressDisplay
import numpy as np import numpy as np
@ -44,8 +44,6 @@ class Scene(object):
if self.preview: if self.preview:
self.window = Window(self, **self.window_config) self.window = Window(self, **self.window_config)
self.camera_config["ctx"] = self.window.ctx self.camera_config["ctx"] = self.window.ctx
self.virtual_animation_start_time = 0
self.real_animation_start_time = time.time()
else: else:
self.window = None self.window = None
@ -56,7 +54,6 @@ class Scene(object):
self.time = 0 self.time = 0
self.skip_time = 0 self.skip_time = 0
self.original_skipping_status = self.skip_animations self.original_skipping_status = self.skip_animations
self.time_of_last_frame = time.time()
# Items associated with interaction # Items associated with interaction
self.mouse_point = Point() self.mouse_point = Point()
@ -64,12 +61,15 @@ class Scene(object):
self.zoom_on_scroll = False self.zoom_on_scroll = False
self.quit_interaction = False self.quit_interaction = False
# Much nice to work with deterministic scenes # Much nicer to work with deterministic scenes
if self.random_seed is not None: if self.random_seed is not None:
random.seed(self.random_seed) random.seed(self.random_seed)
np.random.seed(self.random_seed) np.random.seed(self.random_seed)
def run(self): def run(self):
self.virtual_animation_start_time = 0
self.real_animation_start_time = time.time()
self.setup() self.setup()
try: try:
self.construct() self.construct()
@ -134,6 +134,10 @@ class Scene(object):
def get_image(self): def get_image(self):
return self.camera.get_image() return self.camera.get_image()
def show(self):
self.update_frame(ignore_skipping=True)
self.get_image().show()
def update_frame(self, dt=0, ignore_skipping=False): def update_frame(self, dt=0, ignore_skipping=False):
self.increment_time(dt) self.increment_time(dt)
self.update_mobjects(dt) self.update_mobjects(dt)
@ -156,8 +160,7 @@ class Scene(object):
if not self.skip_animations: if not self.skip_animations:
self.file_writer.write_frame(self.camera) self.file_writer.write_frame(self.camera)
### # Related to updating
def update_mobjects(self, dt): def update_mobjects(self, dt):
for mobject in self.mobjects: for mobject in self.mobjects:
mobject.update(dt) mobject.update(dt)
@ -168,15 +171,14 @@ class Scene(object):
for mob in self.mobjects for mob in self.mobjects
]) ])
### # Related to time
def get_time(self): def get_time(self):
return self.time return self.time
def increment_time(self, dt): def increment_time(self, dt):
self.time += dt self.time += dt
### # Related to internal mobject organization
def get_top_level_mobjects(self): def get_top_level_mobjects(self):
# Return only those which are not in the family # Return only those which are not in the family
# of another mobject from the scene # of another mobject from the scene
@ -240,6 +242,21 @@ class Scene(object):
def get_mobject_copies(self): def get_mobject_copies(self):
return [m.copy() for m in self.mobjects] return [m.copy() for m in self.mobjects]
# Related to skipping
def update_skipping_status(self):
if self.start_at_animation_number is not None:
if self.num_plays == self.start_at_animation_number:
self.stop_skipping()
if self.end_at_animation_number is not None:
if self.num_plays >= self.end_at_animation_number:
raise EndSceneEarlyException()
def stop_skipping(self):
if self.skip_animations:
self.skip_animations = False
self.skip_time += self.time
# Methods associated with running animations
def get_time_progression(self, run_time, n_iterations=None, override_skip_animations=False): def get_time_progression(self, run_time, n_iterations=None, override_skip_animations=False):
if self.skip_animations and not override_skip_animations: if self.skip_animations and not override_skip_animations:
times = [run_time] times = [run_time]
@ -266,6 +283,23 @@ class Scene(object):
])) ]))
return time_progression return time_progression
def get_wait_time_progression(self, duration, stop_condition):
if stop_condition is not None:
time_progression = self.get_time_progression(
duration,
n_iterations=-1, # So it doesn't show % progress
override_skip_animations=True
)
time_progression.set_description(
"Waiting for {}".format(stop_condition.__name__)
)
else:
time_progression = self.get_time_progression(duration)
time_progression.set_description(
"Waiting {}".format(self.num_plays)
)
return time_progression
def anims_from_play_args(self, *args, **kwargs): def anims_from_play_args(self, *args, **kwargs):
""" """
Each arg can either be an animation, or a mobject method Each arg can either be an animation, or a mobject method
@ -333,20 +367,6 @@ class Scene(object):
return animations return animations
def update_skipping_status(self):
if self.start_at_animation_number is not None:
if self.num_plays == self.start_at_animation_number:
self.stop_skipping()
if self.end_at_animation_number is not None:
if self.num_plays >= self.end_at_animation_number:
raise EndSceneEarlyException()
def stop_skipping(self):
if self.skip_animations:
self.skip_animations = False
self.skip_time += self.time
# Methods associated with running animations
def handle_play_like_call(func): def handle_play_like_call(func):
def wrapper(self, *args, **kwargs): def wrapper(self, *args, **kwargs):
self.update_skipping_status() self.update_skipping_status()
@ -389,9 +409,8 @@ class Scene(object):
# animated mobjects that are in the family of # animated mobjects that are in the family of
# those on screen, this can result in a restructuring # those on screen, this can result in a restructuring
# of the scene.mobjects list, which is usually desired. # of the scene.mobjects list, which is usually desired.
mob = animation.mobject if animation.mobject not in self.mobjects:
if mob not in self.mobjects: self.add(animation.mobject)
self.add(mob)
def progress_through_animations(self, animations): def progress_through_animations(self, animations):
last_t = 0 last_t = 0
@ -409,9 +428,6 @@ class Scene(object):
for animation in animations: for animation in animations:
animation.finish() animation.finish()
animation.clean_up_from_scene(self) animation.clean_up_from_scene(self)
self.mobjects_from_last_animation = [
anim.mobject for anim in animations
]
if self.skip_animations: if self.skip_animations:
self.update_mobjects(self.get_run_time(animations)) self.update_mobjects(self.get_run_time(animations))
else: else:
@ -420,7 +436,10 @@ class Scene(object):
@handle_play_like_call @handle_play_like_call
def play(self, *args, **kwargs): def play(self, *args, **kwargs):
if len(args) == 0: if len(args) == 0:
warnings.warn("Called Scene.play with no animations") logging.log(
logging.WARNING,
"Called Scene.play with no animations"
)
return return
animations = self.anims_from_play_args(*args, **kwargs) animations = self.anims_from_play_args(*args, **kwargs)
self.lock_static_mobject_data(*animations) self.lock_static_mobject_data(*animations)
@ -429,33 +448,6 @@ class Scene(object):
self.finish_animations(animations) self.finish_animations(animations)
self.unlock_mobject_data() self.unlock_mobject_data()
def clean_up_animations(self, *animations):
for animation in animations:
animation.clean_up_from_scene(self)
return self
def get_mobjects_from_last_animation(self):
if hasattr(self, "mobjects_from_last_animation"):
return self.mobjects_from_last_animation
return []
def get_wait_time_progression(self, duration, stop_condition):
if stop_condition is not None:
time_progression = self.get_time_progression(
duration,
n_iterations=-1, # So it doesn't show % progress
override_skip_animations=True
)
time_progression.set_description(
"Waiting for {}".format(stop_condition.__name__)
)
else:
time_progression = self.get_time_progression(duration)
time_progression.set_description(
"Waiting {}".format(self.num_plays)
)
return time_progression
@handle_play_like_call @handle_play_like_call
def wait(self, duration=DEFAULT_WAIT_TIME, stop_condition=None): def wait(self, duration=DEFAULT_WAIT_TIME, stop_condition=None):
self.update_mobjects(dt=0) # Any problems with this? self.update_mobjects(dt=0) # Any problems with this?
@ -501,10 +493,6 @@ class Scene(object):
time = self.get_time() + time_offset time = self.get_time() + time_offset
self.file_writer.add_sound(sound_file, time, gain, **kwargs) self.file_writer.add_sound(sound_file, time, gain, **kwargs)
def show(self):
self.update_frame(ignore_skipping=True)
self.get_image().show()
# Helpers for interactive development # Helpers for interactive development
def save_state(self): def save_state(self):
self.saved_state = { self.saved_state = {