Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Js tweening (#952)

Devin Neal57f228b8eb96
diff --git a/.gitattributes b/.gitattributes
index 67d1b87e3..51179733b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-manim/grpc/gen/* linguist-generated=true
+manim/grpc/gen/** linguist-generated=true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f61bdae2d..41a2684c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -112,7 +112,7 @@ jobs:
- name: Install manim
run: |
- poetry install -E js_renderer
+ poetry install -E webgl_renderer
- name: Run tests
run: poetry run pytest
diff --git a/docs/source/tutorials/configuration.rst b/docs/source/tutorials/configuration.rst
index 8de132014..40e295e9b 100644
--- a/docs/source/tutorials/configuration.rst
+++ b/docs/source/tutorials/configuration.rst
@@ -351,14 +351,14 @@ A list of all config options
'custom_folders', 'disable_caching', 'dry_run', 'ffmpeg_loglevel', 'flush_cache',
'frame_height', 'frame_rate', 'frame_size', 'frame_width', 'frame_x_radius',
'frame_y_radius', 'from_animation_number', 'images_dir', 'input_file',
- 'js_renderer_path', 'leave_progress_bars', 'left_side', 'log_dir', 'log_to_file',
+ 'leave_progress_bars', 'left_side', 'log_dir', 'log_to_file',
'max_files_cached', 'media_dir', 'movie_file_extension', 'output_file',
'partial_movie_dir', 'pixel_height', 'pixel_width', 'plugins', 'png_mode',
'preview', 'progress_bar', 'quality', 'right_side', 'save_as_gif', 'save_last_frame',
'save_pngs', 'scene_names', 'show_in_file_browser', 'sound', 'tex_dir',
'tex_template', 'tex_template_file', 'text_dir', 'top', 'transparent',
- 'upto_animation_number', 'use_js_renderer', 'verbosity', 'video_dir',
- 'write_all', 'write_to_movie']
+ 'upto_animation_number', 'use_webgl_renderer', 'verbosity', 'video_dir',
+ 'webgl_renderer_path', 'webgl_updater_fps', 'write_all', 'write_to_movie']
A list of all CLI flags
@@ -429,9 +429,11 @@ A list of all CLI flags
-n FROM_ANIMATION_NUMBER, --from_animation_number FROM_ANIMATION_NUMBER
Start rendering at the specified animation index, instead of the first animation. If you pass in two comma separated values, e.g. '3,6', it will end
the rendering at the second value
- --use_js_renderer Render animations using the javascript frontend
- --js_renderer_path JS_RENDERER_PATH
- Path to the javascript frontend
+ --use_webgl_renderer Render animations using the WebGL frontend
+ --webgl_renderer_path WEBGL_RENDERER_PATH
+ Path to the WebGL frontend
+ --webgl_updater_fps WEBGL_UPDATER_FPS
+ Frame rate to use when generating keyframe data for animations that use updaters while using the WebGL frontend
--config_file CONFIG_FILE
Specify the configuration file
--custom_folders Use the folders defined in the [custom_folders] section of the config file to define the output folder structure
diff --git a/manim/__init__.py b/manim/__init__.py
index f9badcf48..33e71e04d 100644
--- a/manim/__init__.py
+++ b/manim/__init__.py
@@ -59,10 +59,6 @@ from .scene.graph_scene import *
from .scene.moving_camera_scene import *
from .scene.reconfigurable_scene import *
-try:
- from .scene.js_scene import *
-except ModuleNotFoundError:
- pass # optional deps
from .scene.scene import *
from .scene.sample_space_scene import *
from .scene.three_d_scene import *
diff --git a/manim/__main__.py b/manim/__main__.py
index 642720066..7d603de10 100644
--- a/manim/__main__.py
+++ b/manim/__main__.py
@@ -12,11 +12,6 @@ from manim.utils.module_ops import (
from manim.utils.file_ops import open_file as open_media_file
from manim._config.main_utils import parse_args
-try:
- from manim.grpc.impl import frame_server_impl
-except ImportError:
- frame_server_impl = None
-
def open_file_if_needed(file_writer):
if config["verbosity"] != "DEBUG":
@@ -77,16 +72,20 @@ def main():
else:
config.digest_args(args)
input_file = config.get_dir("input_file")
- if config["use_js_renderer"]:
+ if config["use_webgl_renderer"]:
try:
- if frame_server_impl is None:
- raise ImportError("Dependencies for JS renderer is not installed.")
+ from manim.grpc.impl import frame_server_impl
+
server = frame_server_impl.get(input_file)
server.start()
server.wait_for_termination()
- except Exception:
+ except ModuleNotFoundError as e:
print("\n\n")
- traceback.print_exc()
+ print(
+ "Dependencies for the WebGL render are missing. Run "
+ "pip install manim[webgl_renderer] to install them."
+ )
+ print(e)
print("\n\n")
else:
for SceneClass in scene_classes_from_file(input_file):
diff --git a/manim/_config/default.cfg b/manim/_config/default.cfg
index da65017b1..36aa8dc47 100644
--- a/manim/_config/default.cfg
+++ b/manim/_config/default.cfg
@@ -84,11 +84,14 @@ tex_dir = {media_dir}/Tex
text_dir = {media_dir}/texts
partial_movie_dir = {video_dir}/partial_movie_files/{scene_name}
-# --use_js_renderer
-use_js_renderer = False
+# --use_webgl_renderer
+use_webgl_renderer = False
-# --js_renderer_path
-js_renderer_path =
+# --webgl_renderer_path
+webgl_renderer_path =
+
+# --webgl_updater_fps
+webgl_updater_fps = 15
# If the -t (--transparent) flag is used, these will be replaced with the
# values specified in the [TRANSPARENT] section later in this file.
diff --git a/manim/_config/main_utils.py b/manim/_config/main_utils.py
index 858648783..8c2659516 100644
--- a/manim/_config/main_utils.py
+++ b/manim/_config/main_utils.py
@@ -412,15 +412,21 @@ def _parse_args_no_subcmd(args: list) -> argparse.Namespace:
)
parser.add_argument(
- "--use_js_renderer",
- help="Render animations using the javascript frontend",
+ "--use_webgl_renderer",
+ help="Render animations using the WebGL frontend",
action="store_const",
const=True,
)
parser.add_argument(
- "--js_renderer_path",
- help="Path to the javascript frontend",
+ "--webgl_renderer_path",
+ help="Path to the WebGL frontend",
+ )
+
+ parser.add_argument(
+ "--webgl_updater_fps",
+ type=int,
+ help="Frame rate to use when generating keyframe data for animations that use updaters while using the WebGL frontend",
)
# Specify the manim.cfg file
diff --git a/manim/_config/utils.py b/manim/_config/utils.py
index ed6b4daf7..edb7b592e 100644
--- a/manim/_config/utils.py
+++ b/manim/_config/utils.py
@@ -262,7 +262,7 @@ class ManimConfig(MutableMapping):
"from_animation_number",
"images_dir",
"input_file",
- "js_renderer_path",
+ "webgl_renderer_path",
"leave_progress_bars",
"log_dir",
"log_to_file",
@@ -286,7 +286,8 @@ class ManimConfig(MutableMapping):
"tex_template_file",
"text_dir",
"upto_animation_number",
- "use_js_renderer",
+ "use_webgl_renderer",
+ "webgl_updater_fps",
"verbosity",
"video_dir",
"write_all",
@@ -508,7 +509,7 @@ class ManimConfig(MutableMapping):
"disable_caching",
"flush_cache",
"custom_folders",
- "use_js_renderer",
+ "use_webgl_renderer",
]:
setattr(self, key, parser["CLI"].getboolean(key, fallback=False))
@@ -521,6 +522,7 @@ class ManimConfig(MutableMapping):
# the next two must be set BEFORE digesting frame_width and frame_height
"pixel_height",
"pixel_width",
+ "webgl_updater_fps",
]:
setattr(self, key, parser["CLI"].getint(key))
@@ -540,7 +542,7 @@ class ManimConfig(MutableMapping):
"png_mode",
"movie_file_extension",
"background_color",
- "js_renderer_path",
+ "webgl_renderer_path",
]:
setattr(self, key, parser["CLI"].get(key, fallback="", raw=True))
@@ -623,7 +625,8 @@ class ManimConfig(MutableMapping):
"scene_names",
"verbosity",
"background_color",
- "use_js_renderer",
+ "use_webgl_renderer",
+ "webgl_updater_fps",
]:
if hasattr(args, key):
attr = getattr(args, key)
@@ -1029,20 +1032,26 @@ class ManimConfig(MutableMapping):
)
@property
- def use_js_renderer(self):
- """Whether to use JS renderer or not (default)."""
- return self._d["use_js_renderer"]
+ def use_webgl_renderer(self):
+ """Whether to use WebGL renderer or not (default)."""
+ return self._d["use_webgl_renderer"]
- @use_js_renderer.setter
- def use_js_renderer(self, val: bool) -> None:
- self._d["use_js_renderer"] = val
+ @use_webgl_renderer.setter
+ def use_webgl_renderer(self, val: bool) -> None:
+ self._d["use_webgl_renderer"] = val
if val:
self["disable_caching"] = True
- js_renderer_path = property(
- lambda self: self._d["js_renderer_path"],
- lambda self, val: self._d.__setitem__("js_renderer_path", val),
- doc="Path to JS renderer.",
+ webgl_renderer_path = property(
+ lambda self: self._d["webgl_renderer_path"],
+ lambda self, val: self._d.__setitem__("webgl_renderer_path", val),
+ doc="Path to WebGL renderer.",
+ )
+
+ webgl_updater_fps = property(
+ lambda self: self._d["webgl_updater_fps"],
+ lambda self, val: self._d.__setitem__("webgl_updater_fps", val),
+ doc="Frame rate to use when generating keyframe data for animations that use updaters while using the WebGL frontend.",
)
media_dir = property(
diff --git a/manim/animation/transform.py b/manim/animation/transform.py
index 8e37cb891..9fb99ca24 100644
--- a/manim/animation/transform.py
+++ b/manim/animation/transform.py
@@ -189,7 +189,8 @@ class MoveToTarget(Transform):
class _MethodAnimation(MoveToTarget):
- def __init__(self, mobject):
+ def __init__(self, mobject, methods):
+ self.methods = methods
super().__init__(mobject)
diff --git a/manim/camera/js_camera.py b/manim/camera/webgl_camera.py
similarity index 97%
rename from manim/camera/js_camera.py
rename to manim/camera/webgl_camera.py
index f97fcc858..48d31eb20 100644
--- a/manim/camera/js_camera.py
+++ b/manim/camera/webgl_camera.py
@@ -2,7 +2,7 @@ from .camera import Camera
import copy
-class JsCamera(Camera):
+class WebGLCamera(Camera):
def __init__(self, **kwargs):
super().__init__(self, **kwargs)
self.serialized_frame = []
diff --git a/manim/constants.py b/manim/constants.py
index e70f006de..bae77174b 100644
--- a/manim/constants.py
+++ b/manim/constants.py
@@ -128,11 +128,11 @@ FFMPEG_VERBOSITY_MAP: typing.Dict[str, str] = {
"CRITICAL": "fatal",
}
VERBOSITY_CHOICES = FFMPEG_VERBOSITY_MAP.keys()
-JS_RENDERER_INFO: str = (
+WEBGL_RENDERER_INFO: str = (
"The Electron frontend to Manim is hosted at "
"https://github.com/ManimCommunity/manim-renderer. After cloning and building it, "
"you can either start it prior to running Manim or specify the path to the "
- "executable with the --js_renderer_path flag."
+ "executable with the --webgl_renderer_path flag."
)
# Video qualities
diff --git a/manim/grpc/gen/frameserver_pb2.py b/manim/grpc/gen/frameserver_pb2.py
index a1188685c..18fecfa5a 100644
--- a/manim/grpc/gen/frameserver_pb2.py
+++ b/manim/grpc/gen/frameserver_pb2.py
@@ -18,49 +18,10 @@ DESCRIPTOR = _descriptor.FileDescriptor(
syntax="proto3",
serialized_options=None,
create_key=_descriptor._internal_create_key,
- serialized_pb=b'\n\x11\x66rameserver.proto\x12\x0b\x66rameserver";\n\x16\x46\x65tchSceneDataResponse\x12!\n\x05scene\x18\x01 \x01(\x0b\x32\x12.frameserver.Scene"[\n\x05Scene\x12\x0c\n\x04name\x18\x01 \x01(\t\x12*\n\nanimations\x18\x02 \x03(\x0b\x32\x16.frameserver.Animation\x12\x18\n\x10\x62\x61\x63kground_color\x18\x03 \x01(\t"+\n\tAnimation\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x64uration\x18\x02 \x01(\x02"\xd5\x01\n\x0c\x46rameRequest\x12\x13\n\x0btime_offset\x18\x01 \x01(\x02\x12\x13\n\x0bstart_index\x18\x02 \x01(\x05\x12\x11\n\tend_index\x18\x03 \x01(\x05\x12\x13\n\x0bimage_index\x18\x04 \x01(\x05\x12;\n\x0cpreview_mode\x18\x05 \x01(\x0e\x32%.frameserver.FrameRequest.PreviewMode"6\n\x0bPreviewMode\x12\x07\n\x03\x41LL\x10\x00\x12\x13\n\x0f\x41NIMATION_RANGE\x10\x01\x12\t\n\x05IMAGE\x10\x02"u\n\x05Style\x12\x12\n\nfill_color\x18\x01 \x01(\t\x12\x14\n\x0c\x66ill_opacity\x18\x02 \x01(\x02\x12\x14\n\x0cstroke_color\x18\x03 \x01(\t\x12\x16\n\x0estroke_opacity\x18\x04 \x01(\x02\x12\x14\n\x0cstroke_width\x18\x05 \x01(\x02"(\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02"\x97\x02\n\x0bMobjectData\x12\n\n\x02id\x18\x01 \x01(\x03\x12!\n\x05style\x18\x02 \x01(\x0b\x32\x12.frameserver.Style\x12\x32\n\x04type\x18\x03 \x01(\x0e\x32$.frameserver.MobjectData.MobjectType\x12:\n\x17vectorized_mobject_data\x18\x04 \x01(\x0b\x32\x19.frameserver.VMobjectData\x12\x39\n\x12image_mobject_data\x18\x05 \x01(\x0b\x32\x1d.frameserver.ImageMobjectData".\n\x0bMobjectType\x12\x0c\n\x08VMOBJECT\x10\x00\x12\x11\n\rIMAGE_MOBJECT\x10\x01"H\n\x0cVMobjectData\x12"\n\x06points\x18\x01 \x03(\x0b\x32\x12.frameserver.Point\x12\x14\n\x0cneeds_redraw\x18\x02 \x01(\x08"c\n\x10ImageMobjectData\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x0e\n\x06height\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12"\n\x06\x63\x65nter\x18\x04 \x01(\x0b\x32\x12.frameserver.Point"\xdf\x01\n\rFrameResponse\x12*\n\x08mobjects\x18\x01 \x03(\x0b\x32\x18.frameserver.MobjectData\x12\x15\n\rframe_pending\x18\x02 \x01(\x08\x12\x1a\n\x12\x61nimation_finished\x18\x03 \x01(\x08\x12\x16\n\x0escene_finished\x18\x04 \x01(\x08\x12\x10\n\x08\x64uration\x18\x05 \x01(\x02\x12\x12\n\nanimations\x18\x06 \x03(\t\x12\x17\n\x0f\x61nimation_index\x18\x07 \x01(\x05\x12\x18\n\x10\x61nimation_offset\x18\x08 \x01(\x02"\x0e\n\x0c\x45mptyRequest"\x0f\n\rEmptyResponse2\xa8\x01\n\x0b\x46rameServer\x12G\n\x0eGetFrameAtTime\x12\x19.frameserver.FrameRequest\x1a\x1a.frameserver.FrameResponse\x12P\n\x0e\x46\x65tchSceneData\x12\x19.frameserver.EmptyRequest\x1a#.frameserver.FetchSceneDataResponseb\x06proto3',
+ serialized_pb=b'\n\x11\x66rameserver.proto\x12\x0b\x66rameserver";\n\x16\x46\x65tchSceneDataResponse\x12!\n\x05scene\x18\x01 \x01(\x0b\x32\x12.frameserver.Scene"[\n\x05Scene\x12\x0c\n\x04name\x18\x01 \x01(\t\x12*\n\nanimations\x18\x02 \x03(\x0b\x32\x16.frameserver.Animation\x12\x18\n\x10\x62\x61\x63kground_color\x18\x03 \x01(\t"\xfd\x02\n\tAnimation\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x64uration\x18\x02 \x01(\x02\x12\x17\n\x0f\x65\x61sing_function\x18\x03 \x01(\t\x12G\n\x14\x61ttribute_tween_data\x18\x04 \x03(\x0b\x32).frameserver.Animation.AttributeTweenData\x12\x43\n\x12mobject_tween_data\x18\x05 \x03(\x0b\x32\'.frameserver.Animation.MobjectTweenData\x12\x1d\n\x15\x66lickered_mobject_ids\x18\x06 \x03(\t\x1aM\n\x12\x41ttributeTweenData\x12\x11\n\tattribute\x18\x01 \x01(\t\x12\x12\n\nstart_data\x18\x02 \x03(\x02\x12\x10\n\x08\x65nd_data\x18\x03 \x03(\x02\x1a;\n\x10MobjectTweenData\x12\n\n\x02id\x18\x01 \x01(\t\x12\x1b\n\x13root_mobject_offset\x18\x02 \x03(\x02"(\n\x07Updater\x12\x1d\n\x15\x66lickered_mobject_ids\x18\x01 \x03(\t"k\n\x0c\x46rameRequest\x12\x11\n\tend_index\x18\x01 \x01(\x05\x12\x15\n\rfirst_request\x18\x02 \x01(\x08\x12\x17\n\x0f\x61nimation_index\x18\x03 \x01(\x05\x12\x18\n\x10\x61nimation_offset\x18\x04 \x01(\x02"u\n\x05Style\x12\x12\n\nfill_color\x18\x01 \x01(\t\x12\x14\n\x0c\x66ill_opacity\x18\x02 \x01(\x02\x12\x14\n\x0cstroke_color\x18\x03 \x01(\t\x12\x16\n\x0estroke_opacity\x18\x04 \x01(\x02\x12\x14\n\x0cstroke_width\x18\x05 \x01(\x02"(\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02"\xb4\x02\n\x0bMobjectData\x12\n\n\x02id\x18\x01 \x01(\t\x12!\n\x05style\x18\x02 \x01(\x0b\x32\x12.frameserver.Style\x12\x32\n\x04type\x18\x03 \x01(\x0e\x32$.frameserver.MobjectData.MobjectType\x12:\n\x17vectorized_mobject_data\x18\x04 \x01(\x0b\x32\x19.frameserver.VMobjectData\x12\x39\n\x12image_mobject_data\x18\x05 \x01(\x0b\x32\x1d.frameserver.ImageMobjectData\x12\x1b\n\x13root_mobject_offset\x18\x06 \x03(\x02".\n\x0bMobjectType\x12\x0c\n\x08VMOBJECT\x10\x00\x12\x11\n\rIMAGE_MOBJECT\x10\x01"H\n\x0cVMobjectData\x12"\n\x06points\x18\x01 \x03(\x0b\x32\x12.frameserver.Point\x12\x14\n\x0cneeds_redraw\x18\x02 \x01(\x08"c\n\x10ImageMobjectData\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x0e\n\x06height\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12"\n\x06\x63\x65nter\x18\x04 \x01(\x0b\x32\x12.frameserver.Point"l\n\tFrameData\x12\x0e\n\x06remove\x18\x01 \x03(\t\x12%\n\x03\x61\x64\x64\x18\x02 \x03(\x0b\x32\x18.frameserver.MobjectData\x12(\n\x06update\x18\x03 \x03(\x0b\x32\x18.frameserver.MobjectData"\xfa\x01\n\rFrameResponse\x12*\n\nframe_data\x18\x01 \x01(\x0b\x32\x16.frameserver.FrameData\x12\x16\n\x0escene_finished\x18\x02 \x01(\x08\x12*\n\nanimations\x18\x03 \x03(\x0b\x32\x16.frameserver.Animation\x12&\n\x08updaters\x18\x04 \x03(\x0b\x32\x14.frameserver.Updater\x12\x17\n\x0f\x61nimation_index\x18\x05 \x01(\x05\x12\x18\n\x10\x61nimation_offset\x18\x06 \x01(\x02\x12\x1e\n\x16\x61ll_animations_tweened\x18\x07 \x01(\x08"\x0e\n\x0c\x45mptyRequest"\x0f\n\rEmptyResponse2\xa8\x01\n\x0b\x46rameServer\x12G\n\x0eGetFrameAtTime\x12\x19.frameserver.FrameRequest\x1a\x1a.frameserver.FrameResponse\x12P\n\x0e\x46\x65tchSceneData\x12\x19.frameserver.EmptyRequest\x1a#.frameserver.FetchSceneDataResponseb\x06proto3',
)
-_FRAMEREQUEST_PREVIEWMODE = _descriptor.EnumDescriptor(
- name="PreviewMode",
- full_name="frameserver.FrameRequest.PreviewMode",
- filename=None,
- file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
- values=[
- _descriptor.EnumValueDescriptor(
- name="ALL",
- index=0,
- number=0,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key,
- ),
- _descriptor.EnumValueDescriptor(
- name="ANIMATION_RANGE",
- index=1,
- number=1,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key,
- ),
- _descriptor.EnumValueDescriptor(
- name="IMAGE",
- index=2,
- number=2,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key,
- ),
- ],
- containing_type=None,
- serialized_options=None,
- serialized_start=393,
- serialized_end=447,
-)
-_sym_db.RegisterEnumDescriptor(_FRAMEREQUEST_PREVIEWMODE)
-
_MOBJECTDATA_MOBJECTTYPE = _descriptor.EnumDescriptor(
name="MobjectType",
full_name="frameserver.MobjectData.MobjectType",
@@ -87,8 +48,8 @@ _MOBJECTDATA_MOBJECTTYPE = _descriptor.EnumDescriptor(
],
containing_type=None,
serialized_options=None,
- serialized_start=844,
- serialized_end=890,
+ serialized_start=1147,
+ serialized_end=1193,
)
_sym_db.RegisterEnumDescriptor(_MOBJECTDATA_MOBJECTTYPE)
@@ -213,6 +174,143 @@ _SCENE = _descriptor.Descriptor(
)
+_ANIMATION_ATTRIBUTETWEENDATA = _descriptor.Descriptor(
+ name="AttributeTweenData",
+ full_name="frameserver.Animation.AttributeTweenData",
+ filename=None,
+ file=DESCRIPTOR,
+ containing_type=None,
+ create_key=_descriptor._internal_create_key,
+ fields=[
+ _descriptor.FieldDescriptor(
+ name="attribute",
+ full_name="frameserver.Animation.AttributeTweenData.attribute",
+ index=0,
+ number=1,
+ type=9,
+ cpp_type=9,
+ label=1,
+ has_default_value=False,
+ default_value=b"".decode("utf-8"),
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
+ _descriptor.FieldDescriptor(
+ name="start_data",
+ full_name="frameserver.Animation.AttributeTweenData.start_data",
+ index=1,
+ number=2,
+ type=2,
+ cpp_type=6,
+ label=3,
+ has_default_value=False,
+ default_value=[],
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
+ _descriptor.FieldDescriptor(
+ name="end_data",
+ full_name="frameserver.Animation.AttributeTweenData.end_data",
+ index=2,
+ number=3,
+ type=2,
+ cpp_type=6,
+ label=3,
+ has_default_value=False,
+ default_value=[],
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
+ ],
+ extensions=[],
+ nested_types=[],
+ enum_types=[],
+ serialized_options=None,
+ is_extendable=False,
+ syntax="proto3",
+ extension_ranges=[],
+ oneofs=[],
+ serialized_start=432,
+ serialized_end=509,
+)
+
+_ANIMATION_MOBJECTTWEENDATA = _descriptor.Descriptor(
+ name="MobjectTweenData",
+ full_name="frameserver.Animation.MobjectTweenData",
+ filename=None,
+ file=DESCRIPTOR,
+ containing_type=None,
+ create_key=_descriptor._internal_create_key,
+ fields=[
+ _descriptor.FieldDescriptor(
+ name="id",
+ full_name="frameserver.Animation.MobjectTweenData.id",
+ index=0,
+ number=1,
+ type=9,
+ cpp_type=9,
+ label=1,
+ has_default_value=False,
+ default_value=b"".decode("utf-8"),
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
+ _descriptor.FieldDescriptor(
+ name="root_mobject_offset",
+ full_name="frameserver.Animation.MobjectTweenData.root_mobject_offset",
+ index=1,
+ number=2,
+ type=2,
+ cpp_type=6,
+ label=3,
+ has_default_value=False,
+ default_value=[],
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
+ ],
+ extensions=[],
+ nested_types=[],
+ enum_types=[],
+ serialized_options=None,
+ is_extendable=False,
+ syntax="proto3",
+ extension_ranges=[],
+ oneofs=[],
+ serialized_start=511,
+ serialized_end=570,
+)
+
_ANIMATION = _descriptor.Descriptor(
name="Animation",
full_name="frameserver.Animation",
@@ -259,38 +357,117 @@ _ANIMATION = _descriptor.Descriptor(
file=DESCRIPTOR,
create_key=_descriptor._internal_create_key,
),
+ _descriptor.FieldDescriptor(
+ name="easing_function",
+ full_name="frameserver.Animation.easing_function",
+ index=2,
+ number=3,
+ type=9,
+ cpp_type=9,
+ label=1,
+ has_default_value=False,
+ default_value=b"".decode("utf-8"),
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
+ _descriptor.FieldDescriptor(
+ name="attribute_tween_data",
+ full_name="frameserver.Animation.attribute_tween_data",
+ index=3,
+ number=4,
+ type=11,
+ cpp_type=10,
+ label=3,
+ has_default_value=False,
+ default_value=[],
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
+ _descriptor.FieldDescriptor(
+ name="mobject_tween_data",
+ full_name="frameserver.Animation.mobject_tween_data",
+ index=4,
+ number=5,
+ type=11,
+ cpp_type=10,
+ label=3,
+ has_default_value=False,
+ default_value=[],
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
+ _descriptor.FieldDescriptor(
+ name="flickered_mobject_ids",
+ full_name="frameserver.Animation.flickered_mobject_ids",
+ index=5,
+ number=6,
+ type=9,
+ cpp_type=9,
+ label=3,
+ has_default_value=False,
+ default_value=[],
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
],
extensions=[],
- nested_types=[],
+ nested_types=[
+ _ANIMATION_ATTRIBUTETWEENDATA,
+ _ANIMATION_MOBJECTTWEENDATA,
+ ],
enum_types=[],
serialized_options=None,
is_extendable=False,
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=188,
- serialized_end=231,
+ serialized_start=189,
+ serialized_end=570,
)
-_FRAMEREQUEST = _descriptor.Descriptor(
- name="FrameRequest",
- full_name="frameserver.FrameRequest",
+_UPDATER = _descriptor.Descriptor(
+ name="Updater",
+ full_name="frameserver.Updater",
filename=None,
file=DESCRIPTOR,
containing_type=None,
create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
- name="time_offset",
- full_name="frameserver.FrameRequest.time_offset",
+ name="flickered_mobject_ids",
+ full_name="frameserver.Updater.flickered_mobject_ids",
index=0,
number=1,
- type=2,
- cpp_type=6,
- label=1,
+ type=9,
+ cpp_type=9,
+ label=3,
has_default_value=False,
- default_value=float(0),
+ default_value=[],
message_type=None,
enum_type=None,
containing_type=None,
@@ -300,11 +477,33 @@ _FRAMEREQUEST = _descriptor.Descriptor(
file=DESCRIPTOR,
create_key=_descriptor._internal_create_key,
),
+ ],
+ extensions=[],
+ nested_types=[],
+ enum_types=[],
+ serialized_options=None,
+ is_extendable=False,
+ syntax="proto3",
+ extension_ranges=[],
+ oneofs=[],
+ serialized_start=572,
+ serialized_end=612,
+)
+
+
+_FRAMEREQUEST = _descriptor.Descriptor(
+ name="FrameRequest",
+ full_name="frameserver.FrameRequest",
+ filename=None,
+ file=DESCRIPTOR,
+ containing_type=None,
+ create_key=_descriptor._internal_create_key,
+ fields=[
_descriptor.FieldDescriptor(
- name="start_index",
- full_name="frameserver.FrameRequest.start_index",
- index=1,
- number=2,
+ name="end_index",
+ full_name="frameserver.FrameRequest.end_index",
+ index=0,
+ number=1,
type=5,
cpp_type=1,
label=1,
@@ -320,15 +519,15 @@ _FRAMEREQUEST = _descriptor.Descriptor(
create_key=_descriptor._internal_create_key,
),
_descriptor.FieldDescriptor(
- name="end_index",
- full_name="frameserver.FrameRequest.end_index",
- index=2,
- number=3,
- type=5,
- cpp_type=1,
+ name="first_request",
+ full_name="frameserver.FrameRequest.first_request",
+ index=1,
+ number=2,
+ type=8,
+ cpp_type=7,
label=1,
has_default_value=False,
- default_value=0,
+ default_value=False,
message_type=None,
enum_type=None,
containing_type=None,
@@ -339,10 +538,10 @@ _FRAMEREQUEST = _descriptor.Descriptor(
create_key=_descriptor._internal_create_key,
),
_descriptor.FieldDescriptor(
- name="image_index",
- full_name="frameserver.FrameRequest.image_index",
- index=3,
- number=4,
+ name="animation_index",
+ full_name="frameserver.FrameRequest.animation_index",
+ index=2,
+ number=3,
type=5,
cpp_type=1,
label=1,
@@ -358,15 +557,15 @@ _FRAMEREQUEST = _descriptor.Descriptor(
create_key=_descriptor._internal_create_key,
),
_descriptor.FieldDescriptor(
- name="preview_mode",
- full_name="frameserver.FrameRequest.preview_mode",
- index=4,
- number=5,
- type=14,
- cpp_type=8,
+ name="animation_offset",
+ full_name="frameserver.FrameRequest.animation_offset",
+ index=3,
+ number=4,
+ type=2,
+ cpp_type=6,
label=1,
has_default_value=False,
- default_value=0,
+ default_value=float(0),
message_type=None,
enum_type=None,
containing_type=None,
@@ -379,16 +578,14 @@ _FRAMEREQUEST = _descriptor.Descriptor(
],
extensions=[],
nested_types=[],
- enum_types=[
- _FRAMEREQUEST_PREVIEWMODE,
- ],
+ enum_types=[],
serialized_options=None,
is_extendable=False,
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=234,
- serialized_end=447,
+ serialized_start=614,
+ serialized_end=721,
)
@@ -504,8 +701,8 @@ _STYLE = _descriptor.Descriptor(
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=449,
- serialized_end=566,
+ serialized_start=723,
+ serialized_end=840,
)
@@ -583,8 +780,8 @@ _POINT = _descriptor.Descriptor(
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=568,
- serialized_end=608,
+ serialized_start=842,
+ serialized_end=882,
)
@@ -601,11 +798,11 @@ _MOBJECTDATA = _descriptor.Descriptor(
full_name="frameserver.MobjectData.id",
index=0,
number=1,
- type=3,
- cpp_type=2,
+ type=9,
+ cpp_type=9,
label=1,
has_default_value=False,
- default_value=0,
+ default_value=b"".decode("utf-8"),
message_type=None,
enum_type=None,
containing_type=None,
@@ -691,6 +888,25 @@ _MOBJECTDATA = _descriptor.Descriptor(
file=DESCRIPTOR,
create_key=_descriptor._internal_create_key,
),
+ _descriptor.FieldDescriptor(
+ name="root_mobject_offset",
+ full_name="frameserver.MobjectData.root_mobject_offset",
+ index=5,
+ number=6,
+ type=2,
+ cpp_type=6,
+ label=3,
+ has_default_value=False,
+ default_value=[],
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
],
extensions=[],
nested_types=[],
@@ -702,8 +918,8 @@ _MOBJECTDATA = _descriptor.Descriptor(
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=611,
- serialized_end=890,
+ serialized_start=885,
+ serialized_end=1193,
)
@@ -762,8 +978,8 @@ _VMOBJECTDATA = _descriptor.Descriptor(
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=892,
- serialized_end=964,
+ serialized_start=1195,
+ serialized_end=1267,
)
@@ -860,26 +1076,26 @@ _IMAGEMOBJECTDATA = _descriptor.Descriptor(
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=966,
- serialized_end=1065,
+ serialized_start=1269,
+ serialized_end=1368,
)
-_FRAMERESPONSE = _descriptor.Descriptor(
- name="FrameResponse",
- full_name="frameserver.FrameResponse",
+_FRAMEDATA = _descriptor.Descriptor(
+ name="FrameData",
+ full_name="frameserver.FrameData",
filename=None,
file=DESCRIPTOR,
containing_type=None,
create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
- name="mobjects",
- full_name="frameserver.FrameResponse.mobjects",
+ name="remove",
+ full_name="frameserver.FrameData.remove",
index=0,
number=1,
- type=11,
- cpp_type=10,
+ type=9,
+ cpp_type=9,
label=3,
has_default_value=False,
default_value=[],
@@ -893,15 +1109,15 @@ _FRAMERESPONSE = _descriptor.Descriptor(
create_key=_descriptor._internal_create_key,
),
_descriptor.FieldDescriptor(
- name="frame_pending",
- full_name="frameserver.FrameResponse.frame_pending",
+ name="add",
+ full_name="frameserver.FrameData.add",
index=1,
number=2,
- type=8,
- cpp_type=7,
- label=1,
+ type=11,
+ cpp_type=10,
+ label=3,
has_default_value=False,
- default_value=False,
+ default_value=[],
message_type=None,
enum_type=None,
containing_type=None,
@@ -912,15 +1128,56 @@ _FRAMERESPONSE = _descriptor.Descriptor(
create_key=_descriptor._internal_create_key,
),
_descriptor.FieldDescriptor(
- name="animation_finished",
- full_name="frameserver.FrameResponse.animation_finished",
+ name="update",
+ full_name="frameserver.FrameData.update",
index=2,
number=3,
- type=8,
- cpp_type=7,
+ type=11,
+ cpp_type=10,
+ label=3,
+ has_default_value=False,
+ default_value=[],
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
+ ],
+ extensions=[],
+ nested_types=[],
+ enum_types=[],
+ serialized_options=None,
+ is_extendable=False,
+ syntax="proto3",
+ extension_ranges=[],
+ oneofs=[],
+ serialized_start=1370,
+ serialized_end=1478,
+)
+
+
+_FRAMERESPONSE = _descriptor.Descriptor(
+ name="FrameResponse",
+ full_name="frameserver.FrameResponse",
+ filename=None,
+ file=DESCRIPTOR,
+ containing_type=None,
+ create_key=_descriptor._internal_create_key,
+ fields=[
+ _descriptor.FieldDescriptor(
+ name="frame_data",
+ full_name="frameserver.FrameResponse.frame_data",
+ index=0,
+ number=1,
+ type=11,
+ cpp_type=10,
label=1,
has_default_value=False,
- default_value=False,
+ default_value=None,
message_type=None,
enum_type=None,
containing_type=None,
@@ -933,8 +1190,8 @@ _FRAMERESPONSE = _descriptor.Descriptor(
_descriptor.FieldDescriptor(
name="scene_finished",
full_name="frameserver.FrameResponse.scene_finished",
- index=3,
- number=4,
+ index=1,
+ number=2,
type=8,
cpp_type=7,
label=1,
@@ -950,15 +1207,15 @@ _FRAMERESPONSE = _descriptor.Descriptor(
create_key=_descriptor._internal_create_key,
),
_descriptor.FieldDescriptor(
- name="duration",
- full_name="frameserver.FrameResponse.duration",
- index=4,
- number=5,
- type=2,
- cpp_type=6,
- label=1,
+ name="animations",
+ full_name="frameserver.FrameResponse.animations",
+ index=2,
+ number=3,
+ type=11,
+ cpp_type=10,
+ label=3,
has_default_value=False,
- default_value=float(0),
+ default_value=[],
message_type=None,
enum_type=None,
containing_type=None,
@@ -969,12 +1226,12 @@ _FRAMERESPONSE = _descriptor.Descriptor(
create_key=_descriptor._internal_create_key,
),
_descriptor.FieldDescriptor(
- name="animations",
- full_name="frameserver.FrameResponse.animations",
- index=5,
- number=6,
- type=9,
- cpp_type=9,
+ name="updaters",
+ full_name="frameserver.FrameResponse.updaters",
+ index=3,
+ number=4,
+ type=11,
+ cpp_type=10,
label=3,
has_default_value=False,
default_value=[],
@@ -990,8 +1247,8 @@ _FRAMERESPONSE = _descriptor.Descriptor(
_descriptor.FieldDescriptor(
name="animation_index",
full_name="frameserver.FrameResponse.animation_index",
- index=6,
- number=7,
+ index=4,
+ number=5,
type=5,
cpp_type=1,
label=1,
@@ -1009,8 +1266,8 @@ _FRAMERESPONSE = _descriptor.Descriptor(
_descriptor.FieldDescriptor(
name="animation_offset",
full_name="frameserver.FrameResponse.animation_offset",
- index=7,
- number=8,
+ index=5,
+ number=6,
type=2,
cpp_type=6,
label=1,
@@ -1025,6 +1282,25 @@ _FRAMERESPONSE = _descriptor.Descriptor(
file=DESCRIPTOR,
create_key=_descriptor._internal_create_key,
),
+ _descriptor.FieldDescriptor(
+ name="all_animations_tweened",
+ full_name="frameserver.FrameResponse.all_animations_tweened",
+ index=6,
+ number=7,
+ type=8,
+ cpp_type=7,
+ label=1,
+ has_default_value=False,
+ default_value=False,
+ message_type=None,
+ enum_type=None,
+ containing_type=None,
+ is_extension=False,
+ extension_scope=None,
+ serialized_options=None,
+ file=DESCRIPTOR,
+ create_key=_descriptor._internal_create_key,
+ ),
],
extensions=[],
nested_types=[],
@@ -1034,8 +1310,8 @@ _FRAMERESPONSE = _descriptor.Descriptor(
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=1068,
- serialized_end=1291,
+ serialized_start=1481,
+ serialized_end=1731,
)
@@ -1055,8 +1331,8 @@ _EMPTYREQUEST = _descriptor.Descriptor(
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=1293,
- serialized_end=1307,
+ serialized_start=1733,
+ serialized_end=1747,
)
@@ -1076,14 +1352,20 @@ _EMPTYRESPONSE = _descriptor.Descriptor(
syntax="proto3",
extension_ranges=[],
oneofs=[],
- serialized_start=1309,
- serialized_end=1324,
+ serialized_start=1749,
+ serialized_end=1764,
)
_FETCHSCENEDATARESPONSE.fields_by_name["scene"].message_type = _SCENE
_SCENE.fields_by_name["animations"].message_type = _ANIMATION
-_FRAMEREQUEST.fields_by_name["preview_mode"].enum_type = _FRAMEREQUEST_PREVIEWMODE
-_FRAMEREQUEST_PREVIEWMODE.containing_type = _FRAMEREQUEST
+_ANIMATION_ATTRIBUTETWEENDATA.containing_type = _ANIMATION
+_ANIMATION_MOBJECTTWEENDATA.containing_type = _ANIMATION
+_ANIMATION.fields_by_name[
+ "attribute_tween_data"
+].message_type = _ANIMATION_ATTRIBUTETWEENDATA
+_ANIMATION.fields_by_name[
+ "mobject_tween_data"
+].message_type = _ANIMATION_MOBJECTTWEENDATA
_MOBJECTDATA.fields_by_name["style"].message_type = _STYLE
_MOBJECTDATA.fields_by_name["type"].enum_type = _MOBJECTDATA_MOBJECTTYPE
_MOBJECTDATA.fields_by_name["vectorized_mobject_data"].message_type = _VMOBJECTDATA
@@ -1091,16 +1373,22 @@ _MOBJECTDATA.fields_by_name["image_mobject_data"].message_type = _IMAGEMOBJECTDA
_MOBJECTDATA_MOBJECTTYPE.containing_type = _MOBJECTDATA
_VMOBJECTDATA.fields_by_name["points"].message_type = _POINT
_IMAGEMOBJECTDATA.fields_by_name["center"].message_type = _POINT
-_FRAMERESPONSE.fields_by_name["mobjects"].message_type = _MOBJECTDATA
+_FRAMEDATA.fields_by_name["add"].message_type = _MOBJECTDATA
+_FRAMEDATA.fields_by_name["update"].message_type = _MOBJECTDATA
+_FRAMERESPONSE.fields_by_name["frame_data"].message_type = _FRAMEDATA
+_FRAMERESPONSE.fields_by_name["animations"].message_type = _ANIMATION
+_FRAMERESPONSE.fields_by_name["updaters"].message_type = _UPDATER
DESCRIPTOR.message_types_by_name["FetchSceneDataResponse"] = _FETCHSCENEDATARESPONSE
DESCRIPTOR.message_types_by_name["Scene"] = _SCENE
DESCRIPTOR.message_types_by_name["Animation"] = _ANIMATION
+DESCRIPTOR.message_types_by_name["Updater"] = _UPDATER
DESCRIPTOR.message_types_by_name["FrameRequest"] = _FRAMEREQUEST
DESCRIPTOR.message_types_by_name["Style"] = _STYLE
DESCRIPTOR.message_types_by_name["Point"] = _POINT
DESCRIPTOR.message_types_by_name["MobjectData"] = _MOBJECTDATA
DESCRIPTOR.message_types_by_name["VMobjectData"] = _VMOBJECTDATA
DESCRIPTOR.message_types_by_name["ImageMobjectData"] = _IMAGEMOBJECTDATA
+DESCRIPTOR.message_types_by_name["FrameData"] = _FRAMEDATA
DESCRIPTOR.message_types_by_name["FrameResponse"] = _FRAMERESPONSE
DESCRIPTOR.message_types_by_name["EmptyRequest"] = _EMPTYREQUEST
DESCRIPTOR.message_types_by_name["EmptyResponse"] = _EMPTYRESPONSE
@@ -1132,12 +1420,43 @@ Animation = _reflection.GeneratedProtocolMessageType(
"Animation",
(_message.Message,),
{
+ "AttributeTweenData": _reflection.GeneratedProtocolMessageType(
+ "AttributeTweenData",
+ (_message.Message,),
+ {
+ "DESCRIPTOR": _ANIMATION_ATTRIBUTETWEENDATA,
+ "__module__": "frameserver_pb2"
+ # @@protoc_insertion_point(class_scope:frameserver.Animation.AttributeTweenData)
+ },
+ ),
+ "MobjectTweenData": _reflection.GeneratedProtocolMessageType(
+ "MobjectTweenData",
+ (_message.Message,),
+ {
+ "DESCRIPTOR": _ANIMATION_MOBJECTTWEENDATA,
+ "__module__": "frameserver_pb2"
+ # @@protoc_insertion_point(class_scope:frameserver.Animation.MobjectTweenData)
+ },
+ ),
"DESCRIPTOR": _ANIMATION,
"__module__": "frameserver_pb2"
# @@protoc_insertion_point(class_scope:frameserver.Animation)
},
)
_sym_db.RegisterMessage(Animation)
+_sym_db.RegisterMessage(Animation.AttributeTweenData)
+_sym_db.RegisterMessage(Animation.MobjectTweenData)
+
+Updater = _reflection.GeneratedProtocolMessageType(
+ "Updater",
+ (_message.Message,),
+ {
+ "DESCRIPTOR": _UPDATER,
+ "__module__": "frameserver_pb2"
+ # @@protoc_insertion_point(class_scope:frameserver.Updater)
+ },
+)
+_sym_db.RegisterMessage(Updater)
FrameRequest = _reflection.GeneratedProtocolMessageType(
"FrameRequest",
@@ -1205,6 +1524,17 @@ ImageMobjectData = _reflection.GeneratedProtocolMessageType(
)
_sym_db.RegisterMessage(ImageMobjectData)
+FrameData = _reflection.GeneratedProtocolMessageType(
+ "FrameData",
+ (_message.Message,),
+ {
+ "DESCRIPTOR": _FRAMEDATA,
+ "__module__": "frameserver_pb2"
+ # @@protoc_insertion_point(class_scope:frameserver.FrameData)
+ },
+)
+_sym_db.RegisterMessage(FrameData)
+
FrameResponse = _reflection.GeneratedProtocolMessageType(
"FrameResponse",
(_message.Message,),
@@ -1246,8 +1576,8 @@ _FRAMESERVER = _descriptor.ServiceDescriptor(
index=0,
serialized_options=None,
create_key=_descriptor._internal_create_key,
- serialized_start=1327,
- serialized_end=1495,
+ serialized_start=1767,
+ serialized_end=1935,
methods=[
_descriptor.MethodDescriptor(
name="GetFrameAtTime",
diff --git a/manim/grpc/impl/frame_server_impl.py b/manim/grpc/impl/frame_server_impl.py
index 7f5579928..08f9617b2 100644
--- a/manim/grpc/impl/frame_server_impl.py
+++ b/manim/grpc/impl/frame_server_impl.py
@@ -11,6 +11,7 @@ import subprocess as sp
import threading
import time
import traceback
+import types
from ...utils.module_ops import (
get_module,
get_scene_classes_from_module,
@@ -18,8 +19,8 @@ from ...utils.module_ops import (
scene_classes_from_file,
)
from ... import logger
-from ...constants import JS_RENDERER_INFO
-from ...renderer.js_renderer import JsRenderer
+from ...constants import WEBGL_RENDERER_INFO
+from ...renderer.webgl_renderer import WebGLRenderer
from ...utils.family import extract_mobject_family_members
import logging
import copy
@@ -54,7 +55,7 @@ class ScriptUpdateHandler(FileSystemEventHandler):
self.frame_server.update_renderer_scene_data()
except grpc._channel._InactiveRpcError:
logger.warning("No frontend was detected at localhost:50052.")
- sp.Popen(config["js_renderer_path"])
+ sp.Popen(config["webgl_renderer_path"])
class FrameServer(frameserver_pb2_grpc.FrameServerServicer):
@@ -75,7 +76,7 @@ class FrameServer(frameserver_pb2_grpc.FrameServerServicer):
except grpc._channel._InactiveRpcError:
logger.warning("No frontend was detected at localhost:50052.")
try:
- sp.Popen(config["js_renderer_path"])
+ sp.Popen(config["webgl_renderer_path"])
except PermissionError:
logger.info(JS_RENDERER_INFO)
self.server.stop(None)
@@ -83,82 +84,172 @@ class FrameServer(frameserver_pb2_grpc.FrameServerServicer):
def GetFrameAtTime(self, request, context):
try:
- # Determine start and end indices.
- if (
- request.preview_mode
- == frameserver_pb2.FrameRequest.PreviewMode.ANIMATION_RANGE
- ):
- requested_scene_index = request.start_index
- elif request.preview_mode == frameserver_pb2.FrameRequest.PreviewMode.ALL:
- requested_scene_index = 0
- elif request.preview_mode == frameserver_pb2.FrameRequest.PreviewMode.IMAGE:
- requested_scene_index = request.image_index
-
- if (
- request.preview_mode
- == frameserver_pb2.FrameRequest.PreviewMode.ANIMATION_RANGE
- and request.end_index > request.start_index
- ):
- requested_end_index = request.end_index
- elif request.preview_mode == frameserver_pb2.FrameRequest.PreviewMode.ALL:
- requested_end_index = len(self.keyframes)
- elif request.preview_mode == frameserver_pb2.FrameRequest.PreviewMode.IMAGE:
- requested_end_index = len(self.keyframes)
+ requested_scene_index = request.animation_index
# Find the requested scene.
- requested_scene = self.keyframes[requested_scene_index]
- requested_scene_end_time = requested_scene.duration
scene_finished = False
- while requested_scene_end_time < request.time_offset:
- if requested_scene_index + 1 < requested_end_index:
+ if requested_scene_index == request.end_index:
+ scene_finished = True
+
+ if (
+ request.animation_offset
+ <= self.keyframes[requested_scene_index].duration
+ ):
+ animation_offset = request.animation_offset
+ else:
+ if requested_scene_index + 1 < request.end_index:
requested_scene_index += 1
- requested_scene = self.keyframes[requested_scene_index]
- requested_scene_end_time += requested_scene.duration
+ animation_offset = 0
else:
scene_finished = True
- break
+ animation_offset = self.keyframes[requested_scene_index].duration
if requested_scene_index == self.previous_scene_index:
requested_scene = self.previous_scene
+ update_previous_scene = False
else:
- requested_scene = copy.deepcopy(requested_scene)
- self.previous_scene = requested_scene
- self.previous_scene_index = requested_scene_index
+ requested_scene = copy.deepcopy(self.keyframes[requested_scene_index])
+ update_previous_scene = True
- # Update to the requested time.
- if not scene_finished:
- requested_scene_start_time = (
- requested_scene_end_time - requested_scene.duration
- )
- animation_offset = request.time_offset - requested_scene_start_time
- else:
- animation_offset = requested_scene.duration
requested_scene.update_to_time(animation_offset)
- # Serialize the scene's mobjects.
- mobjects = extract_mobject_family_members(
- requested_scene.mobjects, only_those_with_points=True
- )
- serialized_mobjects = [
- serialize_mobject(mobject)
- for mobject in mobjects
- if not isinstance(mobject, ValueTracker)
- ]
+ ids_to_remove = []
+ mobjects_to_add = []
+ animations = []
+ updaters = []
+ update_data = []
+ # TODO: Only remove/add changed mobjects rather than all of them.
+ if self.previous_scene is not None and (
+ request.first_request or self.previous_scene != requested_scene
+ ):
+ previous_mobjects = extract_mobject_family_members(
+ self.previous_scene.mobjects, only_those_with_points=True
+ )
+ # Remove everything from the previous scene.
+ ids_to_remove = [
+ mob.original_id
+ for mob in previous_mobjects
+ if not isinstance(mob, ValueTracker)
+ ]
+
+ if request.first_request or self.previous_scene != requested_scene:
+ # Add everything from the requested scene.
+ mobjects_to_add = [
+ serialize_mobject(mobject)
+ for mobject in extract_mobject_family_members(
+ requested_scene.mobjects, only_those_with_points=True
+ )
+ if not isinstance(mobject, ValueTracker)
+ ]
+
+ # Send animation and updater info.
+ all_animations_tweened = True
+ for animation in requested_scene.animations:
+ attribute_tween_data = generate_attribute_tween_data(animation)
+ mobject_tween_data_list = []
+ flickered_mobject_ids = []
+ if attribute_tween_data is None:
+ all_animations_tweened = False
+ flickered_mobject_ids = [
+ mob.original_id
+ for mob in extract_mobject_family_members(
+ animation.mobject, only_those_with_points=True
+ )
+ ]
+ else:
+ if animation.mobject is not None:
+ # Add offset vector to submobjects.
+ root_mobject_center = animation.mobject.get_center()
+ for updated_mobject in extract_mobject_family_members(
+ animation.mobject, only_those_with_points=True
+ ):
+ mobject_tween_data_list.append(
+ frameserver_pb2.Animation.MobjectTweenData(
+ id=updated_mobject.original_id,
+ root_mobject_offset=updated_mobject.get_center()
+ - root_mobject_center,
+ )
+ )
+ animation_proto = frameserver_pb2.Animation(
+ name=animation.__class__.__name__,
+ duration=requested_scene.duration,
+ easing_function=animation.rate_func.__name__,
+ attribute_tween_data=attribute_tween_data,
+ mobject_tween_data=mobject_tween_data_list,
+ flickered_mobject_ids=flickered_mobject_ids,
+ )
+ animations.append(animation_proto)
+ for (
+ updated_mobject,
+ updater_list,
+ ) in requested_scene.mobject_updater_lists:
+ all_updaters_tweened = True
+ for updater in updater_list:
+ attribute_tween_data = generate_attribute_tween_data(updater)
+ if attribute_tween_data is None:
+ all_animations_tweened = False
+ all_updaters_tweened = False
+ updaters.append(
+ frameserver_pb2.Updater(
+ flickered_mobject_ids=[
+ mob.original_id
+ for mob in extract_mobject_family_members(
+ updated_mobject, only_those_with_points=True
+ )
+ ]
+ )
+ )
+ break
+ else:
+ raise NotImplementedError("Add tween data for updaters.")
+ if all_updaters_tweened:
+ # Append an updater with tween data.
+ pass
+ else:
+ all_animations_tweened = False
+ for animation in requested_scene.animations:
+ # Only send update data for animations that don't have tween data.
+ if generate_attribute_tween_data(animation) is None:
+ update_data.extend(
+ [
+ serialize_mobject(mobject)
+ for mobject in extract_mobject_family_members(
+ animation.mobject, only_those_with_points=True
+ )
+ if not isinstance(mobject, ValueTracker)
+ ]
+ )
+ for (
+ updated_mobject,
+ updater_list,
+ ) in requested_scene.mobject_updater_lists:
+ for updater in updater_list:
+ # Only send update data for updaters that don't have tween data.
+ if generate_attribute_tween_data(updater) is None:
+ update_data.extend(
+ [
+ serialize_mobject(mobject)
+ for mobject in extract_mobject_family_members(
+ updated_mobject, only_those_with_points=True
+ )
+ if not isinstance(mobject, ValueTracker)
+ ]
+ )
resp = frameserver_pb2.FrameResponse(
- mobjects=serialized_mobjects,
- frame_pending=False,
- animation_finished=False,
- scene_finished=scene_finished
- or request.preview_mode
- == frameserver_pb2.FrameRequest.PreviewMode.IMAGE,
- duration=requested_scene.duration,
- animations=map(
- lambda anim: anim.__class__.__name__, requested_scene.animations
+ frame_data=frameserver_pb2.FrameData(
+ remove=ids_to_remove, add=mobjects_to_add, update=update_data
),
+ scene_finished=scene_finished,
+ animations=animations,
+ updaters=updaters,
animation_index=requested_scene_index,
animation_offset=animation_offset,
+ all_animations_tweened=all_animations_tweened,
)
+ if update_previous_scene:
+ self.previous_scene = requested_scene
+ self.previous_scene_index = requested_scene_index
return resp
except Exception as e:
traceback.print_exc()
@@ -199,7 +290,7 @@ class FrameServer(frameserver_pb2_grpc.FrameServerServicer):
self.keyframes = []
self.previous_scene_index = None
self.previous_scene = None
- self.renderer = JsRenderer(self)
+ self.renderer = WebGLRenderer(self)
self.scene = self.scene_class(self.renderer)
self.scene.render()
@@ -235,14 +326,51 @@ class FrameServer(frameserver_pb2_grpc.FrameServerServicer):
stub.UpdateSceneData(request)
+def generate_attribute_tween_data(animation):
+ if isinstance(animation, types.FunctionType):
+ return None
+ animation_name = animation.__class__.__name__
+ if animation_name == "_MethodAnimation":
+ tween_data_array = []
+ for method in animation.methods:
+ if method.__name__ in ["shift", "to_edge"]:
+ tween_data_array.append(
+ frameserver_pb2.Animation.AttributeTweenData(
+ attribute="position",
+ start_data=animation.starting_mobject.get_center(),
+ end_data=animation.target_mobject.get_center(),
+ )
+ )
+ else:
+ return None
+ return tween_data_array
+ elif animation_name == "FadeIn":
+ return [
+ frameserver_pb2.Animation.AttributeTweenData(
+ attribute="fill_opacity",
+ start_data=[animation.starting_mobject.fill_opacity],
+ end_data=[animation.target_copy.fill_opacity],
+ ),
+ frameserver_pb2.Animation.AttributeTweenData(
+ attribute="stroke_opacity",
+ start_data=[animation.starting_mobject.stroke_opacity],
+ end_data=[animation.target_copy.stroke_opacity],
+ ),
+ ]
+ elif animation_name == "Wait":
+ return []
+ else:
+ return None
+
+
def animations_to_name(animations):
if len(animations) == 1:
return str(animations[0].__class__.__name__)
- return f"{str(animations[0])}..."
+ return f"{str(animations[0].__class__.__name__)}..."
def serialize_mobject(mobject):
- mob_proto = frameserver_pb2.MobjectData()
+ mob_proto = frameserver_pb2.MobjectData(id=mobject.original_id)
if isinstance(mobject, VMobject):
needs_redraw = False
@@ -264,8 +392,6 @@ def serialize_mobject(mobject):
mob_proto.style.stroke_color = mob_style["stroke_color"]
mob_proto.style.stroke_opacity = float(mob_style["stroke_opacity"])
mob_proto.style.stroke_width = float(mob_style["stroke_width"])
-
- mob_proto.id = id(mobject)
elif isinstance(mobject, ImageMobject):
mob_proto.type = frameserver_pb2.MobjectData.MobjectType.IMAGE_MOBJECT
mob_style = mobject.get_style()
diff --git a/manim/grpc/proto/frameserver.proto b/manim/grpc/proto/frameserver.proto
index 15ef5a892..8dff0e5ce 100644
--- a/manim/grpc/proto/frameserver.proto
+++ b/manim/grpc/proto/frameserver.proto
@@ -23,20 +23,32 @@ message Scene {
message Animation {
string name = 1;
float duration = 2;
+ string easing_function = 3;
+
+ message AttributeTweenData {
+ string attribute = 1;
+ repeated float start_data = 2;
+ repeated float end_data = 3;
+ }
+ repeated AttributeTweenData attribute_tween_data = 4;
+
+ message MobjectTweenData {
+ string id = 1;
+ repeated float root_mobject_offset = 2;
+ }
+ repeated MobjectTweenData mobject_tween_data = 5;
+ repeated string flickered_mobject_ids = 6;
+}
+
+message Updater {
+ repeated string flickered_mobject_ids = 1;
}
message FrameRequest {
- float time_offset = 1;
- int32 start_index = 2;
- int32 end_index = 3;
- int32 image_index = 4;
-
- enum PreviewMode {
- ALL = 0;
- ANIMATION_RANGE = 1;
- IMAGE = 2;
- }
- PreviewMode preview_mode = 5;
+ int32 end_index = 1;
+ bool first_request = 2;
+ int32 animation_index = 3;
+ float animation_offset = 4;
}
message Style {
@@ -54,7 +66,7 @@ message Point {
}
message MobjectData {
- int64 id = 1;
+ string id = 1;
Style style = 2;
enum MobjectType {
VMOBJECT = 0;
@@ -63,6 +75,7 @@ message MobjectData {
MobjectType type = 3;
VMobjectData vectorized_mobject_data = 4;
ImageMobjectData image_mobject_data = 5;
+ repeated float root_mobject_offset = 6;
}
message VMobjectData {
@@ -77,15 +90,20 @@ message ImageMobjectData {
Point center = 4;
}
+message FrameData {
+ repeated string remove = 1;
+ repeated MobjectData add = 2;
+ repeated MobjectData update = 3;
+}
+
message FrameResponse {
- repeated MobjectData mobjects = 1;
- bool frame_pending = 2;
- bool animation_finished = 3;
- bool scene_finished = 4;
- float duration = 5;
- repeated string animations = 6;
- int32 animation_index = 7;
- float animation_offset = 8;
+ FrameData frame_data = 1;
+ bool scene_finished = 2;
+ repeated Animation animations = 3;
+ repeated Updater updaters = 4;
+ int32 animation_index = 5;
+ float animation_offset = 6;
+ bool all_animations_tweened = 7;
}
message EmptyRequest {}
diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.py
index 9ff5d4831..7f726554a 100644
--- a/manim/mobject/mobject.py
+++ b/manim/mobject/mobject.py
@@ -106,6 +106,15 @@ class Mobject(Container):
"""
return _AnimationBuilder(self)
+ def __deepcopy__(self, clone_from_id):
+ cls = self.__class__
+ result = cls.__new__(cls)
+ clone_from_id[id(self)] = result
+ for k, v in self.__dict__.items():
+ setattr(result, k, copy.deepcopy(v, clone_from_id))
+ result.original_id = str(id(self))
+ return result
+
def __repr__(self):
return str(self.name)
@@ -1352,9 +1361,11 @@ class _AnimationBuilder:
self.overridden_animation = None
self.mobject.generate_target()
self.is_chaining = False
+ self.methods = []
def __getattr__(self, method_name):
method = getattr(self.mobject.target, method_name)
+ self.methods.append(method)
has_overridden_animation = hasattr(method, "_override_animate")
if (self.is_chaining and has_overridden_animation) or self.overridden_animation:
@@ -1381,7 +1392,7 @@ class _AnimationBuilder:
if self.overridden_animation:
return self.overridden_animation
- return _MethodAnimation(self.mobject)
+ return _MethodAnimation(self.mobject, self.methods)
def override_animate(method):
diff --git a/manim/mobject/numbers.py b/manim/mobject/numbers.py
index 85a56431d..a7982bf43 100644
--- a/manim/mobject/numbers.py
+++ b/manim/mobject/numbers.py
@@ -3,6 +3,9 @@
__all__ = ["DecimalNumber", "Integer", "Variable"]
+import copy
+import uuid
+from ..utils.family import extract_mobject_family_members
from ..constants import *
from ..mobject.svg.tex_mobject import MathTex, SingleStringMathTex
from ..mobject.types.vectorized_mobject import VMobject
@@ -169,6 +172,20 @@ class DecimalNumber(VMobject):
full_config.update(self.initial_config)
full_config.update(config)
new_decimal = DecimalNumber(number, **full_config)
+
+ if hasattr(self, "original_id"):
+ if not hasattr(self, "generated_original_ids"):
+ self.generated_original_ids = []
+ new_submobjects = extract_mobject_family_members(
+ new_decimal, only_those_with_points=True
+ )
+ while len(self.generated_original_ids) < len(new_submobjects):
+ self.generated_original_ids.append(str(uuid.uuid4()))
+ for new_submobject, generated_id in zip(
+ new_submobjects, self.generated_original_ids
+ ):
+ new_submobject.original_id = generated_id
+
# Make sure last digit has constant height
new_decimal.scale(self[-1].get_height() / new_decimal[-1].get_height())
new_decimal.move_to(self, self.edge_to_fix)
diff --git a/manim/renderer/js_renderer.py b/manim/renderer/webgl_renderer.py
similarity index 66%
rename from manim/renderer/js_renderer.py
rename to manim/renderer/webgl_renderer.py
index 21918e365..2aa8a5b64 100644
--- a/manim/renderer/js_renderer.py
+++ b/manim/renderer/webgl_renderer.py
@@ -1,11 +1,13 @@
import copy
+from ..utils.family import extract_mobject_family_members
+from manim import config
-class JsRenderer:
+class WebGLRenderer:
def __init__(self, frame_server):
self.skip_animations = True
self.frame_server = frame_server
- self.camera = JsCamera()
+ self.camera = WebGLCamera()
self.num_plays = 0
def init_scene(self, scene):
@@ -16,11 +18,19 @@ class JsRenderer:
def play(self, scene, *args, **kwargs):
self.num_plays += 1
+ # If the scene contains an updater it must be updated frame by frame.
+ for mob in extract_mobject_family_members(scene.mobjects):
+ if len(mob.updaters) > 0:
+ self.skip_animations = False
+ break
s = scene.compile_animation_data(*args, skip_rendering=True, **kwargs)
+ self.skip_animations = True
+
scene_copy = copy.deepcopy(scene)
scene_copy.renderer = self
self.frame_server.keyframes.append(scene_copy)
if s is None:
+ # Nothing happens in this animation, so there's no need to update it.
scene_copy.is_static = True
else:
scene_copy.is_static = False
@@ -46,6 +56,7 @@ class JsRenderer:
pass
-class JsCamera:
+class WebGLCamera:
def __init__(self, use_z_index=True):
self.use_z_index = use_z_index
+ self.frame_rate = config["webgl_updater_fps"]
diff --git a/manim/scene/js_scene.py b/manim/scene/js_scene.py
deleted file mode 100644
index 8acd9df0e..000000000
--- a/manim/scene/js_scene.py
+++ /dev/null
@@ -1,144 +0,0 @@
-from . import scene
-from ..camera.camera import Camera
-from ..camera.js_camera import JsCamera
-from .. import config
-from ..grpc.gen import renderserver_pb2
-from ..grpc.gen import renderserver_pb2_grpc
-from ..grpc.impl.frame_server_impl import FrameServer
-from ..mobject.mobject import Mobject
-from ..constants import DEFAULT_WAIT_TIME
-from threading import Event
-import copy
-import grpc
-import inspect
-import random
-import string
-import types
-from .. import logger
-
-
-def get_random_name(name_map):
- while True:
- random_name = "".join(random.sample(string.ascii_lowercase, k=10))
- if random_name not in name_map:
- return random_name
-
-
-class JsScene(scene.Scene):
- def __init__(self, frame_server):
- super().__init__(camera_class=JsCamera)
- self.frame_server = frame_server
- self.start_animation = 0
- self.reached_start_animation = Event()
- self.animation_finished = Event()
- self.renderer_waiting = False
-
- def __deepcopy__(self, memo):
- cls = self.__class__
- result = cls.__new__(cls)
- memo[id(self)] = result
- for k, v in self.__dict__.items():
- if type(v) in [FrameServer, Event, Camera]:
- continue
- setattr(result, k, copy.deepcopy(v, memo))
-
- # Update updaters
- for mobject in self.mobjects:
- cloned_updaters = []
- for updater in mobject.updaters:
- # Make the cloned updater use the cloned Mobjects as free variables
- # rather than the original ones.
- # TODO: The the same for function calls recursively.
- free_variable_map = inspect.getclosurevars(updater).nonlocals
- cloned_co_freevars = []
- cloned_closure = []
- for i, free_variable_name in enumerate(updater.__code__.co_freevars):
- free_variable_value = free_variable_map[free_variable_name]
- if isinstance(free_variable_value, Mobject):
- random_name = get_random_name(free_variable_map)
-
- # Put the cloned Mobject in the function's scope.
- free_variable_map[random_name] = memo[id(free_variable_value)]
-
- # Add the cloned Mobject's name to the free variable list.
- cloned_co_freevars.append(random_name)
-
- # Add a cell containing the cloned Mobject's reference to the
- # closure list.
- cloned_closure.append(
- types.CellType(memo[id(free_variable_value)])
- )
- else:
- cloned_co_freevars.append(free_variable_name)
- cloned_closure.append(updater.__closure__[i])
-
- cloned_updater = types.FunctionType(
- updater.__code__.replace(co_freevars=tuple(cloned_co_freevars)),
- updater.__globals__,
- updater.__name__,
- updater.__defaults__,
- tuple(cloned_closure),
- )
- cloned_updaters.append(cloned_updater)
- memo[id(mobject)].updaters = cloned_updaters
- return result
-
- def render(self):
- try:
- self.construct()
- except scene.EndSceneEarlyException:
- pass
-
- self.frame_server.scene_finished = True
- with grpc.insecure_channel("localhost:50052") as channel:
- stub = renderserver_pb2_grpc.RenderServerStub(channel)
- try:
- stub.SceneFinished(renderserver_pb2.EmptyRequest())
- except grpc._channel._InactiveRpcError as e:
- logger.error(e)
-
- def progress_through_animations(self):
- self.frame_server.keyframes.append(copy.deepcopy(self))
- self.animation_finished.clear()
- if self.num_plays == self.start_animation:
- with grpc.insecure_channel("localhost:50052") as channel:
- stub = renderserver_pb2_grpc.RenderServerStub(channel)
- try:
- stub.AnimationStatus(renderserver_pb2.EmptyRequest())
- except grpc._channel._InactiveRpcError as e:
- logger.error(e)
- self.animation_finished.wait()
-
- def wait(self, duration=DEFAULT_WAIT_TIME, stop_condition=None):
- self.update_mobjects(dt=0) # Any problems with this?
- self.animations = []
- self.duration = duration
- self.stop_condition = stop_condition
- self.last_t = 0
-
- self.frame_server.keyframes.append(copy.deepcopy(self))
- self.animation_finished.clear()
- if self.num_plays == self.start_animation:
- with grpc.insecure_channel("localhost:50052") as channel:
- stub = renderserver_pb2_grpc.RenderServerStub(channel)
- try:
- stub.AnimationStatus(renderserver_pb2.EmptyRequest())
- except grpc._channel._InactiveRpcError as e:
- logger.error(e)
- self.animation_finished.wait()
-
- def add_frame(self, serialized_frame, num_frames=1):
- dt = 1 / self.camera.frame_rate
- self.increment_time(num_frames * dt)
- if num_frames != 1:
- duration = num_frames / self.camera.frame_rate
- else:
- duration = 0
- return self.camera.serialized_frame, duration
-
- def get_frame(self):
- return self.camera.serialized_frame
-
-
-if config["use_js_renderer"]:
- scene.Scene = JsScene
diff --git a/manim/scene/scene.py b/manim/scene/scene.py
index 567f7abb5..47566fb23 100644
--- a/manim/scene/scene.py
+++ b/manim/scene/scene.py
@@ -112,6 +112,7 @@ class Scene(Container):
if k == "camera_class":
setattr(result, k, v)
setattr(result, k, copy.deepcopy(v, clone_from_id))
+ result.mobject_updater_lists = []
# Update updaters
for mobject in self.mobjects:
@@ -153,7 +154,10 @@ class Scene(Container):
tuple(cloned_closure),
)
cloned_updaters.append(cloned_updater)
- clone_from_id[id(mobject)].updaters = cloned_updaters
+ mobject_clone = clone_from_id[id(mobject)]
+ mobject_clone.updaters = cloned_updaters
+ if len(cloned_updaters) > 0:
+ result.mobject_updater_lists.append((mobject_clone, cloned_updaters))
return result
def render(self):
@@ -607,9 +611,9 @@ class Scene(Container):
kwargs with kwargs passed to play().
Parameters
----------
- *animations : Tuple[:class:`Animation`]
+ *args : Tuple[:class:`Animation`]
Animations to be played.
- **play_kwargs
+ **kwargs
Configuration for the call to play().
Returns
-------
diff --git a/poetry.lock b/poetry.lock
index 473bfb6f5..eddff62bf 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1409,7 +1409,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"]
[extras]
-js_renderer = ["grpcio", "grpcio-tools", "watchdog"]
+webgl_renderer = ["grpcio", "grpcio-tools", "watchdog"]
jupyterlab = ["jupyterlab"]
[metadata]
diff --git a/pyproject.toml b/pyproject.toml
index 3e1b9cccc..2105e2c91 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,7 +44,7 @@ watchdog = { version = "*", optional = true }
jupyterlab = { version = "^3.0", optional = true }
[tool.poetry.extras]
-js_renderer = ["grpcio","grpcio-tools","watchdog"]
+webgl_renderer = ["grpcio","grpcio-tools","watchdog"]
jupyterlab = ["jupyterlab"]
[tool.poetry.dev-dependencies]