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

Tweaks and fixes to InteractiveScene

Browse source
This commit is contained in:
Grant Sanderson 2022-04-27 09:55:46 -07:00
parent c311204993
commit 7c233123a1
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
manimlib/scene/interactive_scene.py
View file

@ -87,7 +87,7 @@ class InteractiveScene(Scene):
self.cursor_location_label, self.cursor_location_label,
self.camera.frame self.camera.frame
] ]
self.select_top_level_mobs = True self.select_top_level_mobs = False
self.regenerate_selection_search_set() self.regenerate_selection_search_set()
self.is_selecting = False self.is_selecting = False
@ -190,7 +190,7 @@ class InteractiveScene(Scene):
if mobject.get_depth() < 1e-2: if mobject.get_depth() < 1e-2:
vects = [DL, UL, UR, DR] vects = [DL, UL, UR, DR]
else: else:
vects = list(it.product(*3 * [[-1, 1]])) vects = np.array(list(it.product(*3 * [[-1, 1]])))
dots.add_updater(lambda d: d.set_points([ dots.add_updater(lambda d: d.set_points([
mobject.get_corner(v) + v * radius mobject.get_corner(v) + v * radius
for v in vects for v in vects
@ -200,7 +200,7 @@ class InteractiveScene(Scene):
def get_highlight(self, mobject: Mobject) -> Mobject: def get_highlight(self, mobject: Mobject) -> Mobject:
if isinstance(mobject, VMobject) and mobject.has_points() and not self.select_top_level_mobs: if isinstance(mobject, VMobject) and mobject.has_points() and not self.select_top_level_mobs:
result = VHighlight(mobject) result = VHighlight(mobject)
result.add_updater(lambda m: m.replace(mobject)) result.add_updater(lambda m: m.replace(mobject, stretch=True))
return result return result
else: else:
return self.get_corner_dots(mobject) return self.get_corner_dots(mobject)
@ -212,12 +212,15 @@ class InteractiveScene(Scene):
self.get_highlight(mob) self.get_highlight(mob)
for mob in self.selection for mob in self.selection
]) ])
index = min(( try:
i for i, mob in enumerate(self.mobjects) index = min((
for sm in self.selection i for i, mob in enumerate(self.mobjects)
if sm in mob.get_family() for sm in self.selection
)) if sm in mob.get_family()
self.mobjects.insert(index, self.selection_highlight) ))
self.mobjects.insert(index, self.selection_highlight)
except ValueError:
pass
def add_to_selection(self, *mobjects): def add_to_selection(self, *mobjects):
mobs = list(filter( mobs = list(filter(
@ -260,13 +263,15 @@ class InteractiveScene(Scene):
def disable_interaction(self, *mobjects: Mobject): def disable_interaction(self, *mobjects: Mobject):
for mob in mobjects: for mob in mobjects:
self.unselectables.append(mob) for sm in mob.get_family():
self.unselectables.append(sm)
self.regenerate_selection_search_set() self.regenerate_selection_search_set()
def enable_interaction(self, *mobjects: Mobject): def enable_interaction(self, *mobjects: Mobject):
for mob in mobjects: for mob in mobjects:
if mob in self.unselectables: for sm in mob.get_family():
self.unselectables.remove(mob) if sm in self.unselectables:
self.unselectables.remove(sm)
# Functions for keyboard actions # Functions for keyboard actions
@ -323,6 +328,9 @@ class InteractiveScene(Scene):
for mob in reversed(self.get_selection_search_set()): for mob in reversed(self.get_selection_search_set()):
if self.selection_rectangle.is_touching(mob): if self.selection_rectangle.is_touching(mob):
additions.append(mob) additions.append(mob)
# If it was just a click, not a drag, add only one item
if self.selection_rectangle.get_width() < 1e-3:
break
self.add_to_selection(*additions) self.add_to_selection(*additions)
def prepare_grab(self): def prepare_grab(self):
@ -445,6 +453,8 @@ class InteractiveScene(Scene):
self.selection.set_y(diff[1]) self.selection.set_y(diff[1])
def handle_resizing(self, point: np.ndarray): def handle_resizing(self, point: np.ndarray):
if not hasattr(self, "scale_about_point"):
return
vect = point - self.scale_about_point vect = point - self.scale_about_point
if self.window.is_key_pressed(CTRL_SYMBOL): if self.window.is_key_pressed(CTRL_SYMBOL):
for i in (0, 1): for i in (0, 1):