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

Improving embed

Browse source
This commit is contained in:
Grant Sanderson 2020-02-14 16:26:49 -08:00
parent 8402b9ea53
commit dc8eb317dd
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
manimlib/scene/scene.py
View file

@ -8,6 +8,7 @@ import numpy as np
import itertools as it import itertools as it
import time import time
from IPython.terminal.embed import InteractiveShellEmbed from IPython.terminal.embed import InteractiveShellEmbed
from traitlets.config.loader import Config
from manimlib.animation.animation import Animation from manimlib.animation.animation import Animation
from manimlib.animation.transform import MoveToTarget from manimlib.animation.transform import MoveToTarget
@ -54,8 +55,11 @@ class Scene(Container):
self.original_skipping_status = self.skip_animations self.original_skipping_status = self.skip_animations
self.time_of_last_frame = time.time() self.time_of_last_frame = time.time()
# Items associated with interaction
self.mouse_point = Point() self.mouse_point = Point()
self.mouse_drag_point = Point() self.mouse_drag_point = Point()
self.zoom_on_scroll = False
self.quit_interaction = False
if self.random_seed is not None: if self.random_seed is not None:
random.seed(self.random_seed) random.seed(self.random_seed)
@ -92,22 +96,23 @@ class Scene(Container):
# If there is a window, enter a loop # If there is a window, enter a loop
# which updates the frame while under # which updates the frame while under
# the hood calling the pyglet event loop # the hood calling the pyglet event loop
while not self.window.is_closing: self.quit_interaction = False
while not self.window.is_closing and not self.quit_interaction:
self.time = self.window.timer.time self.time = self.window.timer.time
self.update_frame() self.update_frame()
self.window.destroy() if self.window.is_closing:
self.window.destroy()
def embed(self): def embed(self):
self.stop_skipping() self.stop_skipping()
self.update_frame() self.update_frame()
caller_locals = inspect.currentframe().f_back.f_locals
caller_module = inspect.getmodule(inspect.stack()[1][0])
shell = InteractiveShellEmbed() shell = InteractiveShellEmbed()
shell( # Have the frame update after each command
local_ns=caller_locals, shell.events.register('post_run_cell', lambda *a, **kw: self.update_frame())
module=caller_module, # Stack depth of 2 means the shell will use
) # the namespace of the caller, not this method
shell(stack_depth=2)
def __str__(self): def __str__(self):
return self.__class__.__name__ return self.__class__.__name__
@ -524,17 +529,25 @@ class Scene(Container):
def on_mouse_scroll(self, point, offset): def on_mouse_scroll(self, point, offset):
frame = self.camera.frame frame = self.camera.frame
factor = 1 + np.arctan(10 * offset[1]) if self.zoom_on_scroll:
frame.scale(factor, about_point=point) factor = 1 + np.arctan(10 * offset[1])
frame.scale(factor, about_point=point)
else:
frame.shift(-30 * offset)
self.camera.refresh_shader_uniforms() self.camera.refresh_shader_uniforms()
def on_key_release(self, symbol, modifiers): def on_key_release(self, symbol, modifiers):
pass if chr(symbol) == "z":
self.zoom_on_scroll = False
def on_key_press(self, symbol, modifiers): def on_key_press(self, symbol, modifiers):
if chr(symbol) == "r": if chr(symbol) == "r":
self.camera.frame.restore() self.camera.frame.restore()
self.camera.refresh_shader_uniforms() self.camera.refresh_shader_uniforms()
elif chr(symbol) == "z":
self.zoom_on_scroll = True
elif chr(symbol) == "q":
self.quit_interaction = True
def on_resize(self, width: int, height: int): def on_resize(self, width: int, height: int):
self.camera.reset_pixel_shape(width, height) self.camera.reset_pixel_shape(width, height)