Remove "preview" as a scene parameter, just look for whether window is None

This commit is contained in:
Grant Sanderson 2024-12-06 09:54:14 -06:00
parent 2e49c60148
commit dd251ab8c2
3 changed files with 4 additions and 8 deletions

View file

@ -477,7 +477,6 @@ def get_scene_config(args: Namespace) -> dict:
"skip_animations": args.skip_animations, "skip_animations": args.skip_animations,
"start_at_animation_number": start, "start_at_animation_number": start,
"end_at_animation_number": end, "end_at_animation_number": end,
"preview": not args.write_file,
"presenter_mode": args.presenter_mode, "presenter_mode": args.presenter_mode,
"leave_progress_bars": args.leave_progress_bars, "leave_progress_bars": args.leave_progress_bars,
"show_animation_progress": args.show_animation_progress, "show_animation_progress": args.show_animation_progress,
@ -495,4 +494,5 @@ def get_run_config(args: Namespace):
"quiet": args.quiet or args.write_all, "quiet": args.quiet or args.write_all,
"write_all": args.write_all, "write_all": args.write_all,
"window_config": window_config, "window_config": window_config,
"show_in_window": not args.write_file
} }

View file

@ -69,7 +69,7 @@ class ReloadManager:
run_config = manimlib.config.get_run_config(self.args) run_config = manimlib.config.get_run_config(self.args)
# Create or reuse window # Create or reuse window
if scene_config["preview"] and not self.window: # TODO, this should be in run_config not scene_config if run_config["show_in_window"] and not self.window:
self.window = Window(**run_config["window_config"]) self.window = Window(**run_config["window_config"])
scene_config["window"] = self.window scene_config["window"] = self.window

View file

@ -82,7 +82,6 @@ class Scene(object):
start_at_animation_number: int | None = None, start_at_animation_number: int | None = None,
end_at_animation_number: int | None = None, end_at_animation_number: int | None = None,
leave_progress_bars: bool = False, leave_progress_bars: bool = False,
preview: bool = True, # TODO, remove
window: Optional[Window] = None, window: Optional[Window] = None,
presenter_mode: bool = False, presenter_mode: bool = False,
show_animation_progress: bool = False, show_animation_progress: bool = False,
@ -94,7 +93,6 @@ class Scene(object):
self.start_at_animation_number = start_at_animation_number self.start_at_animation_number = start_at_animation_number
self.end_at_animation_number = end_at_animation_number self.end_at_animation_number = end_at_animation_number
self.leave_progress_bars = leave_progress_bars self.leave_progress_bars = leave_progress_bars
self.preview = preview
self.presenter_mode = presenter_mode self.presenter_mode = presenter_mode
self.show_animation_progress = show_animation_progress self.show_animation_progress = show_animation_progress
self.embed_exception_mode = embed_exception_mode self.embed_exception_mode = embed_exception_mode
@ -212,8 +210,8 @@ class Scene(object):
close_scene_on_exit: bool = True, close_scene_on_exit: bool = True,
show_animation_progress: bool = False, show_animation_progress: bool = False,
) -> None: ) -> None:
if not self.preview: if not self.window:
# Embed is only relevant with a preview # Embed is only relevant for interactive development with a Window
return return
self.stop_skipping() self.stop_skipping()
self.update_frame(force_draw=True) self.update_frame(force_draw=True)
@ -728,8 +726,6 @@ class Scene(object):
scene_state.restore_scene(self) scene_state.restore_scene(self)
def save_state(self) -> None: def save_state(self) -> None:
if not self.preview:
return
state = self.get_state() state = self.get_state()
if self.undo_stack and state.mobjects_match(self.undo_stack[-1]): if self.undo_stack and state.mobjects_match(self.undo_stack[-1]):
return return