Skip to content

Commit 9ff6d41

Browse files
foxed skip_animations dlag that ManimCommunity#98 broke
1 parent 3fb8fe2 commit 9ff6d41

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

manim/scene/scene.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,8 @@ def handle_caching_play(func):
853853
**kwargs :
854854
named parameters affecting what was passed in *args e.g run_time, lag_ratio etc.
855855
"""
856-
def wrapper(self, *args, **kwargs):
856+
def wrapper(self, *args, **kwargs):
857+
self.revert_to_original_skipping_status()
857858
animations = self.compile_play_args_to_animation_list(
858859
*args, **kwargs
859860
)
@@ -886,15 +887,16 @@ def handle_caching_wait(func):
886887
named parameters affecting what was passed in *args e.g run_time, lag_ratio etc.
887888
"""
888889
def wrapper(self, duration=DEFAULT_WAIT_TIME, stop_condition=None):
890+
self.revert_to_original_skipping_status()
889891
if not file_writer_config['disable_caching']:
890892
hash_wait = get_hash_from_wait_call(self.__dict__['camera'], duration, stop_condition, self.get_mobjects())
891-
self.play_hashes_list .append(hash_wait)
893+
self.play_hashes_list.append(hash_wait)
892894
if self.file_writer.is_already_cached(hash_wait):
893895
logger.info(f'Wait {self.num_plays} : Using cached data (hash : {hash_wait})')
894896
file_writer_config['skip_animations'] = True
895897
else :
896-
hash_play = "uncached_{:05}".format(self.num_plays)
897-
self.play_hashes_list.append(hash_play)
898+
hash_wait = "uncached_{:05}".format(self.num_plays)
899+
self.play_hashes_list.append(hash_wait)
898900
self.revert_to_original_skipping_status()
899901
func(self, duration, stop_condition)
900902
return wrapper
@@ -1171,8 +1173,8 @@ def force_skipping(self):
11711173
Scene
11721174
The Scene, with skipping turned on.
11731175
"""
1174-
self.original_skipping_status = self.SKIP_ANIMATIONS
1175-
self.SKIP_ANIMATIONS = True
1176+
self.original_skipping_status = file_writer_config['skip_animations']
1177+
file_writer_config['skip_animations'] = True
11761178
return self
11771179

11781180
def revert_to_original_skipping_status(self):
@@ -1187,7 +1189,7 @@ def revert_to_original_skipping_status(self):
11871189
The Scene, with the original skipping status.
11881190
"""
11891191
if hasattr(self, "original_skipping_status"):
1190-
self.SKIP_ANIMATIONS = self.original_skipping_status
1192+
file_writer_config['skip_animations'] = self.original_skipping_status
11911193
return self
11921194

11931195
def add_frames(self, *frames):
@@ -1222,7 +1224,7 @@ def add_sound(self, sound_file, time_offset=0, gain=None, **kwargs):
12221224
gain :
12231225
12241226
"""
1225-
if self.SKIP_ANIMATIONS:
1227+
if file_writer_config['skip_animations']:
12261228
return
12271229
time = self.get_time() + time_offset
12281230
self.file_writer.add_sound(sound_file, time, gain, **kwargs)

0 commit comments

Comments
 (0)