A community-maintained Python framework for creating mathematical animations.
Add dearpygui integration (#1553)
Devin Neale326a7b6110b
diff --git a/example_scenes/opengl.py b/example_scenes/opengl.pyindex 68ce6a189..5abf97d5f 100644--- a/example_scenes/opengl.py+++ b/example_scenes/opengl.py@@ -72,6 +72,49 @@ def get_plane_mesh(context):return Mesh(shader, attributes)+class GuiTest(Scene):+ def construct(self):+ mesh = get_plane_mesh(self.renderer.context)+ # mesh.attributes["in_vert"][:, 0]+ self.add(mesh)++ def update_mesh(mesh, dt):+ mesh.model_matrix = np.matmul(+ opengl.rotation_matrix(z=dt), mesh.model_matrix+ )++ mesh.add_updater(update_mesh)++ self.interactive_embed()+++class GuiTest2(Scene):+ def construct(self):+ mesh = get_plane_mesh(self.renderer.context)+ mesh.attributes["in_vert"][:, 0] -= 2+ self.add(mesh)++ mesh2 = get_plane_mesh(self.renderer.context)+ mesh2.attributes["in_vert"][:, 0] += 2+ self.add(mesh2)++ def callback(sender, data):+ mesh2.attributes["in_color"][:, 3] = dpg.get_value(sender)++ self.widgets.append(+ {+ "name": "mesh2 opacity",+ "widget": "slider_float",+ "callback": callback,+ "min_value": 0,+ "max_value": 1,+ "default_value": 1,+ }+ )++ self.interactive_embed()++class ThreeDMobjectTest(Scene):def construct(self):# config["background_color"] = "#333333"@@ -98,7 +141,9 @@ class ThreeDMobjectTest(Scene):class NamedFullScreenQuad(Scene):def construct(self):surface = FullScreenQuad(self.renderer.context, fragment_shader_name="design_3")- surface.shader.set_uniform("u_resolution", (854.0, 480.0, 0.0))+ surface.shader.set_uniform(+ "u_resolution", (config["pixel_width"], config["pixel_height"], 0.0)+ )surface.shader.set_uniform("u_time", 0)self.add(surface)@@ -127,6 +172,7 @@ class InlineFullScreenQuad(Scene):uniform vec2 u_resolution;uniform float u_time;+ out vec4 frag_color;// Function from Iñigo Quiles// https://www.shadertoy.com/view/MsS3Wc@@ -153,12 +199,13 @@ class InlineFullScreenQuad(Scene):// and the Saturation to the radiuscolor = hsb2rgb(vec3((angle/TWO_PI)+0.5,radius,1.0));- fragColor = vec4(color,1.0);+ frag_color = vec4(color,1.0);}""",- output_color_variable="fragColor",)- surface.shader.set_uniform("u_resolution", (854.0, 480.0))+ surface.shader.set_uniform(+ "u_resolution", (config["pixel_width"], config["pixel_height"])+ )shader_time = 0def update_surface(surface):@@ -182,6 +229,7 @@ class SimpleInlineFullScreenQuad(Scene):uniform float v_red;uniform float v_green;uniform float v_blue;+ out vec4 frag_color;void main() {frag_color = vec4(v_red, v_green, v_blue, 1);diff --git a/manim/_config/default.cfg b/manim/_config/default.cfgindex 29e0d7928..bbcda3c31 100644--- a/manim/_config/default.cfg+++ b/manim/_config/default.cfg@@ -98,6 +98,12 @@ webgl_renderer_path =# --use_opengl_rendereruse_opengl_renderer = False+# --enable_gui+enable_gui = False++# --gui_location+gui_location = 0,0+# If the -t (--transparent) flag is used, these will be replaced with the# values specified in the [TRANSPARENT] section later in this file.png_mode = RGBdiff --git a/manim/_config/utils.py b/manim/_config/utils.pyindex d0e8f82cc..0fac7f941 100644--- a/manim/_config/utils.py+++ b/manim/_config/utils.py@@ -15,6 +15,7 @@ import copyimport errnoimport loggingimport os+import reimport sysimport typingfrom collections.abc import Mapping, MutableMapping@@ -282,6 +283,8 @@ class ManimConfig(MutableMapping):"renderer","use_opengl_renderer","use_webgl_renderer",+ "enable_gui",+ "gui_location","verbosity","video_dir","write_all",@@ -407,6 +410,12 @@ class ManimConfig(MutableMapping):else:raise ValueError(f"{key} must be boolean")+ def _set_tuple(self, key: str, val: tuple) -> None:+ if isinstance(val, tuple):+ self._d[key] = val+ else:+ raise ValueError(f"{key} must be tuple")+def _set_str(self, key: str, val: typing.Any) -> None:"""Set ``key`` to ``val`` if ``val`` is a string."""if isinstance(val, str):@@ -509,6 +518,7 @@ class ManimConfig(MutableMapping):"custom_folders","use_opengl_renderer","use_webgl_renderer",+ "enable_gui",]:setattr(self, key, parser["CLI"].getboolean(key, fallback=False))@@ -553,6 +563,10 @@ class ManimConfig(MutableMapping):# "frame_height",]:setattr(self, key, parser["CLI"].getfloat(key))++ gui_location = tuple(map(int, re.split(";|,|-", parser["CLI"]["gui_location"])))+ setattr(self, "gui_location", gui_location)+# pluginsself.plugins = parser["CLI"].get("plugins", fallback="", raw=True).split(",")# the next two must be set AFTER digesting pixel_width and pixel_height@@ -638,6 +652,7 @@ class ManimConfig(MutableMapping):"background_color","use_opengl_renderer","use_webgl_renderer",+ "enable_gui",]:if hasattr(args, key):attr = getattr(args, key)@@ -715,6 +730,9 @@ class ManimConfig(MutableMapping):# --write_to_movie was not passed on the command line, so don't generate video.self["write_to_movie"] = False+ # Handle --gui_location flag.+ self.gui_location = args.gui_location+return selfdef digest_file(self, filename: str) -> "ManimConfig":@@ -760,7 +778,7 @@ class ManimConfig(MutableMapping):# config options are propertiespreview = property(- lambda self: self._d["preview"],+ lambda self: self._d["preview"] or self._d["enable_gui"],lambda self, val: self._set_boolean("preview", val),doc="Whether to play the rendered movie (-p).",)@@ -1129,6 +1147,18 @@ class ManimConfig(MutableMapping):doc="Main output directory. See :meth:`ManimConfig.get_dir`.",)+ enable_gui = property(+ lambda self: self._d["enable_gui"],+ lambda self, val: self._set_boolean("enable_gui", val),+ doc="Enable GUI interaction.",+ )++ gui_location = property(+ lambda self: self._d["gui_location"],+ lambda self, val: self._set_tuple("gui_location", val),+ doc="Enable GUI interaction.",+ )+def get_dir(self, key: str, **kwargs: str) -> Path:"""Resolve a config option that stores a directory.diff --git a/manim/cli/render/global_options.py b/manim/cli/render/global_options.pyindex a3257cf34..ed3dbb5c9 100644--- a/manim/cli/render/global_options.py+++ b/manim/cli/render/global_options.py@@ -1,6 +1,21 @@+import re+import clickfrom cloup import option, option_group+from ... import logger+++def validate_gui_location(ctx, param, value):+ if value:+ try:+ x_offset, y_offset = map(int, re.split(";|,|-", value))+ return (x_offset, y_offset)+ except Exception:+ logger.error("GUI location option is invalid.")+ exit()++global_options = option_group("Global options",option(@@ -36,4 +51,15 @@ global_options = option_group(default=None,help="Display warnings for outdated installation.",),+ option(+ "--enable_gui",+ is_flag=True,+ help="Enable GUI interaction.",+ ),+ option(+ "--gui_location",+ default="0,0",+ callback=validate_gui_location,+ help="Starting location for the GUI.",+ ),)diff --git a/manim/cli/render/render_options.py b/manim/cli/render/render_options.pyindex 8cd8b4dc8..991ec94f7 100644--- a/manim/cli/render/render_options.py+++ b/manim/cli/render/render_options.py@@ -26,10 +26,7 @@ def validate_resolution(ctx, param, value):if value:try:start, end = map(int, re.split(";|,|-", value))- return (- start,- end,- )+ return (start, end)except Exception:logger.error("Resolution option is invalid.")exit()diff --git a/manim/gui/__init__.py b/manim/gui/__init__.pynew file mode 100644index 000000000..e69de29bbdiff --git a/manim/gui/gui.py b/manim/gui/gui.pynew file mode 100644index 000000000..e3abae557--- /dev/null+++ b/manim/gui/gui.py@@ -0,0 +1,72 @@+from pathlib import Path++try:+ import dearpygui.core+ import dearpygui.demo+ import dearpygui.simple++ dearpygui_imported = True+except ImportError:+ dearpygui_imported = False+++from .. import config+from ..utils.module_ops import scene_classes_from_file+++def configure_pygui(renderer, widgets, update=True):+ if not dearpygui_imported:+ raise RuntimeError("Attempted to use DearPyGUI when it isn't imported.")+ if update:+ dearpygui.core.delete_item("Manim GUI")++ def rerun_callback(sender, data):+ renderer.scene.queue.put(("rerun_gui", [], {}))++ def continue_callback(sender, data):+ renderer.scene.queue.put(("exit_gui", [], {}))++ def scene_selection_callback(sender, data):+ config["scene_names"] = (dearpygui.core.get_value(sender),)+ renderer.scene.queue.put(("rerun_gui", [], {}))++ scene_classes = scene_classes_from_file(Path(config["input_file"]), full_list=True)+ scene_names = [scene_class.__name__ for scene_class in scene_classes]++ with dearpygui.simple.window(+ "Manim GUI",+ x_pos=config["gui_location"][0],+ y_pos=config["gui_location"][1],+ width=1000,+ height=500,+ ):+ dearpygui.core.set_main_window_size(width=1015, height=540)+ dearpygui.core.set_global_font_scale(2)+ dearpygui.core.add_button("Rerun", callback=rerun_callback)+ dearpygui.core.add_button("Continue", callback=continue_callback)+ dearpygui.core.add_combo(+ "Selected scene",+ items=scene_names,+ callback=scene_selection_callback,+ default_value=config["scene_names"][0],+ )+ dearpygui.core.add_separator()+ if len(widgets) != 0:+ with dearpygui.simple.collapsing_header(+ f"{config['scene_names'][0]} widgets", default_open=True+ ):+ for widget_config in widgets:+ widget_config_copy = widget_config.copy()+ name = widget_config_copy["name"]+ widget = widget_config_copy["widget"]+ if widget != "separator":+ del widget_config_copy["name"]+ del widget_config_copy["widget"]+ getattr(dearpygui.core, f"add_{widget}")(+ name, **widget_config_copy+ )+ else:+ dearpygui.core.add_separator()+ # dearpygui.demo.show_demo()+ if not update:+ dearpygui.core.start_dearpygui()diff --git a/manim/opengl/__init__.py b/manim/opengl/__init__.pyindex 5f9f7b250..cd1ea9d11 100644--- a/manim/opengl/__init__.py+++ b/manim/opengl/__init__.py@@ -1,3 +1,8 @@+try:+ from dearpygui import core as dpg+except ImportError:+ pass+from ..mobject.opengl_geometry import *from ..mobject.opengl_mobject import *from ..mobject.opengl_three_dimensions import *@@ -7,3 +12,4 @@ from ..mobject.svg.opengl_text_mobject import *from ..mobject.types.opengl_surface import *from ..mobject.types.opengl_vectorized_mobject import *from ..renderer.shader import *+from ..utils.opengl import *diff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.pyindex b3cf5e9ea..6fd626e0a 100644--- a/manim/renderer/opengl_renderer.py+++ b/manim/renderer/opengl_renderer.py@@ -1,4 +1,5 @@import itertools as it+import reimport timeimport moderngl@@ -8,7 +9,7 @@ from PIL import Imagefrom manim import configfrom manim.renderer.cairo_renderer import handle_play_like_callfrom manim.utils.caching import handle_caching_play-from manim.utils.color import color_to_rgba+from manim.utils.color import color_to_rgb, color_to_rgbafrom manim.utils.exceptions import EndSceneEarlyExceptionfrom ..constants import *@@ -36,10 +37,16 @@ class OpenGLCamera(OpenGLMobject):euler_angles=[0, 0, 0],focal_distance=2,light_source_position=[-10, 10, 10],+ orthographic=False,**kwargs,):self.use_z_index = Trueself.frame_rate = 60+ self.orthographic = orthographic+ if self.orthographic:+ self.projection_matrix = opengl.orthographic_projection_matrix()+ else:+ self.projection_matrix = opengl.perspective_projection_matrix()if frame_shape is None:self.frame_shape = (config["frame_width"], config["frame_height"])@@ -65,6 +72,7 @@ class OpenGLCamera(OpenGLMobject):self.light_source = OpenGLPoint(self.light_source_position)self.model_matrix = opengl.translation_matrix(0, 0, 11)+ self.default_model_matrix = opengl.translation_matrix(0, 0, 11)super().__init__(**kwargs)@@ -93,7 +101,7 @@ class OpenGLCamera(OpenGLMobject):self.set_height(config["frame_height"])self.set_width(config["frame_width"])self.set_euler_angles(0, 0, 0)- self.model_matrix = opengl.translation_matrix(0, 0, 11)+ self.model_matrix = self.default_model_matrixreturn selfdef refresh_rotation_matrix(self):@@ -276,7 +284,7 @@ class OpenGLRenderer:try:shader.set_uniform("u_view_matrix", self.scene.camera.get_view_matrix())shader.set_uniform(- "u_projection_matrix", opengl.orthographic_projection_matrix()+ "u_projection_matrix", self.scene.camera.projection_matrix)except KeyError:pass@@ -340,28 +348,7 @@ class OpenGLRenderer:self.window.swap_buffers()def render(self, scene, frame_offset, moving_mobjects):- def update_frame():- self.frame_buffer_object.clear(*window_background_color)- self.refresh_perspective_uniforms(scene.camera)-- for mobject in scene.mobjects:- self.render_mobject(mobject)-- view_matrix = scene.camera.get_view_matrix()- for mesh in scene.meshes:- try:- mesh.shader.set_uniform("u_view_matrix", view_matrix)- mesh.shader.set_uniform(- "u_projection_matrix", opengl.perspective_projection_matrix()- )- except KeyError:- pass- mesh.render()-- self.animation_elapsed_time = time.time() - self.animation_start_time-- window_background_color = color_to_rgba(config["background_color"])- update_frame()+ self.update_frame(scene)if self.skip_animations:return@@ -372,9 +359,35 @@ class OpenGLRenderer:if self.window is not None:self.window.swap_buffers()while self.animation_elapsed_time < frame_offset:- update_frame()+ self.update_frame(scene)self.window.swap_buffers()+ def update_frame(self, scene):+ window_background_color = color_to_rgba(config["background_color"])+ self.frame_buffer_object.clear(*window_background_color)+ self.refresh_perspective_uniforms(scene.camera)++ for mobject in scene.mobjects:+ self.render_mobject(mobject)++ view_matrix = scene.camera.get_view_matrix(format=False)+ opengl_view_matrix = opengl.matrix_to_shader_input(view_matrix)+ from moderngl.program_members.uniform import Uniform++ for obj in scene.meshes:+ for mesh in obj.get_meshes():+ mesh.shader.set_uniform(+ "model_matrix", opengl.matrix_to_shader_input(mesh.model_matrix)+ )+ mesh.shader.set_uniform("view_matrix", opengl_view_matrix)+ mesh.shader.set_uniform(+ "projection_matrix",+ scene.camera.projection_matrix,+ )+ mesh.render()++ self.animation_elapsed_time = time.time() - self.animation_start_time+def scene_finished(self, scene):self.file_writer.finish()diff --git a/manim/renderer/shader.py b/manim/renderer/shader.pyindex c7b6c422c..bfc691eb4 100644--- a/manim/renderer/shader.py+++ b/manim/renderer/shader.py@@ -14,6 +14,13 @@ SHADER_FOLDER = Path(__file__).parent / "shaders"shader_program_cache = {}file_path_to_code_map = {}+__all__ = [+ "Object3D",+ "Mesh",+ "Shader",+ "FullScreenQuad",+]+def get_shader_code_from_file(file_path):if file_path in file_path_to_code_map:@@ -33,54 +40,130 @@ def get_shader_code_from_file(file_path):return source-class Mesh:- def __init__(self, shader, attributes, indices=None, use_depth_test=True):- self.shader = shader- self.attributes = attributes- self.indices = indices- self.use_depth_test = use_depth_test- self.init_updaters()+def filter_attributes(unfiltered_attributes, attributes):+ # Construct attributes for only those needed by the shader.+ filtered_attributes_dtype = []+ for i, dtype_name in enumerate(unfiltered_attributes.dtype.names):+ if dtype_name in attributes:+ filtered_attributes_dtype.append(+ (+ dtype_name,+ unfiltered_attributes.dtype[i].subdtype[0].str,+ unfiltered_attributes.dtype[i].shape,+ )+ )- self.translation = np.zeros(3)- self.rotation = np.zeros(3)- self.scale = np.zeros(3)- self.model_matrix = np.eye(4)- self.model_matrix_needs_update = False+ filtered_attributes = np.zeros(+ unfiltered_attributes[unfiltered_attributes.dtype.names[0]].shape[0],+ dtype=filtered_attributes_dtype,+ )- def render(self):- # Set matrix uniforms.- if self.model_matrix_needs_update:- pass- try:- self.shader.set_uniform(- "u_model_matrix", opengl.matrix_to_shader_input(self.model_matrix)- )- except KeyError:- pass+ for dtype_name in unfiltered_attributes.dtype.names:+ if dtype_name in attributes:+ filtered_attributes[dtype_name] = unfiltered_attributes[dtype_name]- if self.use_depth_test:- self.shader.context.enable(moderngl.DEPTH_TEST)+ return filtered_attributes- vertex_buffer_object = self.shader.context.buffer(self.attributes.tobytes())- if self.indices is None:- index_buffer_object = None- else:- vert_index_data = self.indices.astype("i4").tobytes()- if vert_index_data:- index_buffer_object = self.shader.context.buffer(vert_index_data)- else:- index_buffer_object = None- vertex_array_object = self.shader.context.simple_vertex_array(- self.shader.shader_program,- vertex_buffer_object,- *self.attributes.dtype.names,- index_buffer=index_buffer_object,- )- vertex_array_object.render(moderngl.TRIANGLES)- vertex_buffer_object.release()- vertex_array_object.release()- if index_buffer_object is not None:- index_buffer_object.release()++class Object3D:+ def __init__(self, *children):+ self.model_matrix = np.eye(4)+ self.normal_matrix = np.eye(4)+ self.children = []+ self.parent = None+ self.add(*children)+ self.init_updaters()++ # TODO: Use path_func.+ def interpolate(self, start, end, alpha, _):+ self.model_matrix = (1 - alpha) * start.model_matrix + alpha * end.model_matrix+ self.normal_matrix = (+ 1 - alpha+ ) * start.normal_matrix + alpha * end.normal_matrix++ def single_copy(self):+ copy = Object3D()+ copy.model_matrix = self.model_matrix.copy()+ copy.normal_matrix = self.normal_matrix.copy()+ return copy++ def copy(self):+ node_to_copy = {}++ bfs = [self]+ while bfs:+ node = bfs.pop(0)+ bfs.extend(node.children)++ node_copy = node.single_copy()+ node_to_copy[node] = node_copy++ # Add the copy to the copy of the parent.+ if node.parent is not None and node is not self:+ node_to_copy[node.parent].add(node_copy)+ return node_to_copy[self]++ def add(self, *children):+ for child in children:+ if child.parent is not None:+ raise Exception(+ "Attempt to add child that's already added to another Object3D"+ )+ self.remove(*children, current_children_only=False)+ self.children.extend(children)+ for child in children:+ child.parent = self++ def remove(self, *children, current_children_only=True):+ if current_children_only:+ for child in children:+ if child.parent != self:+ raise Exception(+ "Attempt to remove child that isn't added to this Object3D"+ )+ self.children = list(filter(lambda child: child not in children, self.children))+ for child in children:+ child.parent = None++ def get_meshes(self):+ dfs = [self]+ while dfs:+ parent = dfs.pop()+ if isinstance(parent, Mesh):+ yield parent+ dfs.extend(parent.children)++ def get_family(self):+ dfs = [self]+ while dfs:+ parent = dfs.pop()+ yield parent+ dfs.extend(parent.children)++ def align_data_and_family(self, _):+ pass++ def hierarchical_model_matrix(self):+ if self.parent is None:+ return self.model_matrix++ model_matrices = [self.model_matrix]+ current_object = self+ while current_object.parent is not None:+ model_matrices.append(current_object.parent.model_matrix)+ current_object = current_object.parent+ return np.linalg.multi_dot(list(reversed(model_matrices)))++ def hierarchical_normal_matrix(self):+ if self.parent is None:+ return self.normal_matrix[:3, :3]++ normal_matrices = [self.normal_matrix]+ current_object = self+ while current_object.parent is not None:+ normal_matrices.append(current_object.parent.normal_matrix)+ current_object = current_object.parent+ return np.linalg.multi_dot(list(reversed(normal_matrices)))[:3, :3]def init_updaters(self):self.time_based_updaters = []@@ -156,6 +239,89 @@ class Mesh:return self+class Mesh(Object3D):+ def __init__(+ self,+ shader=None,+ attributes=None,+ geometry=None,+ material=None,+ indices=None,+ use_depth_test=True,+ primitive=moderngl.TRIANGLES,+ ):+ super().__init__()+ if shader is not None and attributes is not None:+ self.shader = shader+ self.attributes = attributes+ self.indices = indices+ elif geometry is not None and material is not None:+ self.shader = material+ self.attributes = geometry.attributes+ self.indices = geometry.index+ else:+ raise Exception(+ "Mesh requires either attributes and a Shader or a Geometry and a "+ "Material"+ )+ self.use_depth_test = use_depth_test+ self.primitive = primitive+ self.skip_render = False+ self.init_updaters()++ def single_copy(self):+ copy = Mesh(+ attributes=self.attributes.copy(),+ shader=self.shader,+ indices=self.indices.copy() if self.indices is not None else None,+ use_depth_test=self.use_depth_test,+ primitive=self.primitive,+ )+ copy.skip_render = self.skip_render+ copy.model_matrix = self.model_matrix.copy()+ copy.normal_matrix = self.normal_matrix.copy()+ # TODO: Copy updaters?+ return copy++ def render(self):+ if self.skip_render:+ return++ if self.use_depth_test:+ self.shader.context.enable(moderngl.DEPTH_TEST)+ else:+ self.shader.context.disable(moderngl.DEPTH_TEST)++ from moderngl.program_members.attribute import Attribute++ shader_attributes = []+ for k, v in self.shader.shader_program._members.items():+ if isinstance(v, Attribute):+ shader_attributes.append(k)+ shader_attributes = filter_attributes(self.attributes, shader_attributes)++ vertex_buffer_object = self.shader.context.buffer(shader_attributes.tobytes())+ if self.indices is None:+ index_buffer_object = None+ else:+ vert_index_data = self.indices.astype("i4").tobytes()+ if vert_index_data:+ index_buffer_object = self.shader.context.buffer(vert_index_data)+ else:+ index_buffer_object = None+ vertex_array_object = self.shader.context.simple_vertex_array(+ self.shader.shader_program,+ vertex_buffer_object,+ *shader_attributes.dtype.names,+ index_buffer=index_buffer_object,+ )+ vertex_array_object.render(self.primitive)+ vertex_buffer_object.release()+ vertex_array_object.release()+ if index_buffer_object is not None:+ index_buffer_object.release()++class Shader:def __init__(self,@@ -169,9 +335,8 @@ class Shader:# See if the program is cached.if self.name in shader_program_cache:self.shader_program = shader_program_cache[self.name]-- # Generate the shader from inline code if it was passed.- if source is not None:+ elif source is not None:+ # Generate the shader from inline code if it was passed.self.shader_program = context.program(**source)else:# Search for a file containing the shader.@@ -193,7 +358,10 @@ class Shader:shader_program_cache[self.name] = self.shader_programdef set_uniform(self, name, value):- self.shader_program[name] = value+ try:+ self.shader_program[name] = value+ except KeyError:+ passclass FullScreenQuad(Mesh):@@ -213,28 +381,15 @@ class FullScreenQuad(Mesh):fragment_shader_source = get_shader_code_from_file(shader_file_path)elif fragment_shader_source is not None:fragment_shader_source = textwrap.dedent(fragment_shader_source.lstrip())- fragment_shader_lines = fragment_shader_source.split("\n")-- # If the first line is a version string, insert after it.- insertion_index = 0- if fragment_shader_lines[0].startswith("#version"):- insertion_index += 1- fragment_shader_lines.insert(- insertion_index,- f"out vec4 {output_color_variable};",- )- fragment_shader_source = "\n".join(fragment_shader_lines)shader = Shader(context,source=dict(vertex_shader="""#version 330-in vec4 in_vert;uniform mat4 u_model_view_matrix;uniform mat4 u_projection_matrix;-void main() {{vec4 camera_space_vertex = u_model_view_matrix * in_vert;vec4 clip_space_vertex = u_projection_matrix * camera_space_vertex;@@ -244,15 +399,8 @@ class FullScreenQuad(Mesh):fragment_shader=fragment_shader_source,),)- shader.set_uniform("u_model_view_matrix", opengl.view_matrix())- shader.set_uniform(- "u_projection_matrix", opengl.orthographic_projection_matrix()- )- super().__init__(shader, None)-- def render(self):- self.attributes = np.zeros(6, dtype=[("in_vert", np.float32, (4,))])- self.attributes["in_vert"] = np.array(+ attributes = np.zeros(6, dtype=[("in_vert", np.float32, (4,))])+ attributes["in_vert"] = np.array([[-config["frame_x_radius"], -config["frame_y_radius"], 0, 1],[-config["frame_x_radius"], config["frame_y_radius"], 0, 1],@@ -262,4 +410,11 @@ class FullScreenQuad(Mesh):[config["frame_x_radius"], config["frame_y_radius"], 0, 1],],)+ shader.set_uniform("u_model_view_matrix", opengl.view_matrix())+ shader.set_uniform(+ "u_projection_matrix", opengl.orthographic_projection_matrix()+ )+ super().__init__(shader, attributes)++ def render(self):super().render()diff --git a/manim/renderer/shaders/default/vert.glsl b/manim/renderer/shaders/default/vert.glslindex b261193e4..f945e304a 100644--- a/manim/renderer/shaders/default/vert.glsl+++ b/manim/renderer/shaders/default/vert.glsl@@ -1,10 +1,10 @@#version 330-in vec4 in_vert;+in vec3 in_vert;uniform mat4 u_model_matrix;uniform mat4 u_view_matrix;uniform mat4 u_projection_matrix;void main() {- gl_Position = u_projection_matrix * u_view_matrix * u_model_matrix * in_vert;+ gl_Position = u_projection_matrix * u_view_matrix * u_model_matrix * vec4(in_vert, 1);}diff --git a/manim/renderer/shaders/vertex_colors/vert.glsl b/manim/renderer/shaders/vertex_colors/vert.glslindex 405b778c1..9d5a769a6 100644--- a/manim/renderer/shaders/vertex_colors/vert.glsl+++ b/manim/renderer/shaders/vertex_colors/vert.glsl@@ -3,11 +3,11 @@in vec4 in_vert;in vec4 in_color;out vec4 v_color;-uniform mat4 u_model_matrix;-uniform mat4 u_view_matrix;-uniform mat4 u_projection_matrix;+uniform mat4 model_matrix;+uniform mat4 view_matrix;+uniform mat4 projection_matrix;void main() {v_color = in_color;- gl_Position = u_projection_matrix * u_view_matrix * u_model_matrix * in_vert;+ gl_Position = projection_matrix * view_matrix * model_matrix * in_vert;}diff --git a/manim/scene/scene.py b/manim/scene/scene.pyindex 676192c54..1b7d3a0ce 100644--- a/manim/scene/scene.py+++ b/manim/scene/scene.py@@ -8,11 +8,20 @@ import copyimport inspectimport platformimport random+import string+import sysimport threading+import timeimport typesimport warningsfrom queue import Queue+try:+ import dearpygui.core++ dearpygui_imported = True+except ImportError:+ dearpygui_imported = Falseimport numpy as npfrom tqdm import tqdmfrom watchdog.events import FileSystemEventHandler@@ -23,9 +32,11 @@ from ..animation.animation import Animation, Wait, prepare_animationfrom ..camera.camera import Camerafrom ..constants import *from ..container import Container-from ..mobject.opengl_mobject import OpenGLPoint+from ..gui.gui import configure_pygui+from ..mobject.mobject import Mobject, _AnimationBuilder+from ..mobject.opengl_mobject import OpenGLMobject, OpenGLPointfrom ..renderer.cairo_renderer import CairoRenderer-from ..renderer.shader import Mesh+from ..renderer.shader import Mesh, Object3Dfrom ..utils import opengl, space_opsfrom ..utils.exceptions import EndSceneEarlyException, RerunSceneExceptionfrom ..utils.family import extract_mobject_family_members@@ -101,6 +112,8 @@ class Scene(Container):self.skip_animation_preview = Falseself.meshes = []self.camera_target = ORIGIN+ self.widgets = []+ self.dearpygui_imported = dearpygui_importedif config.renderer == "opengl":# Items associated with interaction@@ -308,8 +321,9 @@ class Scene(Container):mobject.update(dt)def update_meshes(self, dt):- for mesh in self.meshes:- mesh.update(dt)+ for obj in self.meshes:+ for mesh in obj.get_family():+ mesh.update(dt)def should_update_mobjects(self):"""@@ -385,7 +399,7 @@ class Scene(Container):new_mobjects = []new_meshes = []for mobject_or_mesh in mobjects:- if isinstance(mobject_or_mesh, Mesh):+ if isinstance(mobject_or_mesh, Object3D):new_meshes.append(mobject_or_mesh)else:new_mobjects.append(mobject_or_mesh)@@ -430,7 +444,7 @@ class Scene(Container):mobjects_to_remove = []meshes_to_remove = set()for mobject_or_mesh in mobjects:- if isinstance(mobject_or_mesh, Mesh):+ if isinstance(mobject_or_mesh, Object3D):meshes_to_remove.add(mobject_or_mesh)else:mobjects_to_remove.append(mobject_or_mesh)@@ -971,6 +985,8 @@ class Scene(Container):"""Like embed(), but allows for screen interaction."""+ if self.skip_animation_preview or config["write_to_movie"]:+ returndef ipython(shell, namespace):import manim@@ -1014,6 +1030,19 @@ class Scene(Container):)keyboard_thread.start()+ if self.dearpygui_imported and config["enable_gui"]:+ if not dearpygui.core.is_dearpygui_running():+ gui_thread = threading.Thread(+ target=configure_pygui,+ args=(self.renderer, self.widgets),+ kwargs={"update": False},+ )+ gui_thread.start()+ else:+ configure_pygui(self.renderer, self.widgets, update=True)++ self.camera.model_matrix = self.camera.default_model_matrix+self.interact(shell, keyboard_thread)def interact(self, shell, keyboard_thread):@@ -1024,6 +1053,9 @@ class Scene(Container):self.quit_interaction = Falsekeyboard_thread_needs_join = True+ assert self.queue.qsize() == 0++ last_time = time.time()while not (self.renderer.window.is_closing or self.quit_interaction):if not self.queue.empty():tup = self.queue.get_nowait()@@ -1048,7 +1080,13 @@ class Scene(Container):keyboard_thread.join()raise RerunSceneExceptionelif tup[0].startswith("exit"):+ # Intentionally skip calling join() on the file thread to save time.+ if not tup[0].endswith("keyboard"):+ shell.pt_app.app.exit(exception=EOFError)keyboard_thread.join()+ # Remove exit_keyboard from the queue if necessary.+ while self.queue.qsize() > 0:+ self.queue.get()keyboard_thread_needs_join = Falsebreakelse:@@ -1056,7 +1094,8 @@ class Scene(Container):getattr(self, method)(*args, **kwargs)else:self.renderer.animation_start_time = 0- dt = 1 / config["frame_rate"]+ dt = last_time - time.time()+ last_time = time.time()self.renderer.render(self, dt, self.moving_mobjects)self.update_mobjects(dt)self.update_meshes(dt)@@ -1065,6 +1104,12 @@ class Scene(Container):if shell is not None and keyboard_thread_needs_join:shell.pt_app.app.exit(exception=EOFError)keyboard_thread.join()+ # Remove exit_keyboard from the queue if necessary.+ while self.queue.qsize() > 0:+ self.queue.get()++ if self.dearpygui_imported and config["enable_gui"]:+ dearpygui.core.stop_dearpygui()if self.renderer.window.is_closing:self.renderer.window.destroy()diff --git a/manim/utils/module_ops.py b/manim/utils/module_ops.pyindex 501109a1f..93ce15203 100644--- a/manim/utils/module_ops.py+++ b/manim/utils/module_ops.py@@ -104,10 +104,12 @@ def prompt_user_for_choice(scene_classes):user_input = console.input(f"[log.message] {constants.CHOOSE_NUMBER_MESSAGE} [/log.message]")- return [+ scene_classes = [num_to_class[int(num_str)]for num_str in re.split(r"\s*,\s*", user_input.strip())]+ config["scene_names"] = [scene_class.__name__ for scene_class in scene_classes]+ return scene_classesexcept KeyError:logger.error(constants.INVALID_NUMBER_MESSAGE)sys.exit(2)@@ -115,9 +117,11 @@ def prompt_user_for_choice(scene_classes):sys.exit(1)-def scene_classes_from_file(file_path, require_single_scene=False):+def scene_classes_from_file(file_path, require_single_scene=False, full_list=False):module = get_module(file_path)all_scene_classes = get_scene_classes_from_module(module)+ if full_list:+ return all_scene_classesscene_classes_to_render = get_scenes_to_render(all_scene_classes)if require_single_scene:assert len(scene_classes_to_render) == 1diff --git a/manim/utils/opengl.py b/manim/utils/opengl.pyindex 9999d14fd..73b697c0f 100644--- a/manim/utils/opengl.py+++ b/manim/utils/opengl.py@@ -31,11 +31,11 @@ def orthographic_projection_matrix(return projection_matrix-def perspective_projection_matrix(width=None, height=None, near=4, far=18, format=True):+def perspective_projection_matrix(width=None, height=None, near=2, far=30, format=True):if width is None:- width = config["frame_width"] / 3+ width = config["frame_width"] / 6if height is None:- height = config["frame_height"] / 3+ height = config["frame_height"] / 6projection_matrix = np.array([[2 * near / width, 0, 0, 0],@@ -111,12 +111,12 @@ def rotation_matrix(x=0, y=0, z=0):)-def scale_matrix(scale_factor=None):+def scale_matrix(scale_factor=1):return np.array([- [1, 0, 0, 0],- [0, 1, 0, 0],- [0, 0, 1, 0],+ [scale_factor, 0, 0, 0],+ [0, scale_factor, 0, 0],+ [0, 0, scale_factor, 0],[0, 0, 0, 1],])diff --git a/poetry.lock b/poetry.lockindex 59626dd3b..7c5f6d44a 100644--- a/poetry.lock+++ b/poetry.lock@@ -258,7 +258,7 @@ optional = falsepython-versions = "*"[package.extras]-test = ["flake8 (==3.7.8)", "hypothesis (==3.55.3)"]+test = ["flake8 (3.7.8)", "hypothesis (3.55.3)"][[package]]name = "coverage"@@ -285,6 +285,14 @@ python-versions = "*"[package.dependencies]six = "*"+[[package]]+name = "dearpygui"+version = "0.6.415"+description = "DearPyGui: A simple Python GUI Toolkit"+category = "main"+optional = false+python-versions = ">=3.6"+[[package]]name = "decorator"version = "5.0.9"@@ -416,7 +424,7 @@ typing-extensions = {version = ">=3.7.4.0", markers = "python_version < \"3.8\""[[package]]name = "glcontext"-version = "2.3.3"+version = "2.3.4"description = "Portable OpenGL Context"category = "main"optional = false@@ -477,7 +485,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"[[package]]name = "importlib-metadata"-version = "4.0.1"+version = "4.3.0"description = "Read metadata from Python packages"category = "main"optional = false@@ -582,7 +590,7 @@ python-versions = ">=3.6"parso = ">=0.8.0,<0.9.0"[package.extras]-qa = ["flake8 (==3.8.3)", "mypy (==0.782)"]+qa = ["flake8 (3.8.3)", "mypy (0.782)"]testing = ["Django (<3.1)", "colorama", "docopt", "pytest (<6.0.0)"][[package]]@@ -856,7 +864,7 @@ pyrr = ">=0.10.3,<1"pysdl2 = ["pysdl2"]pyside2 = ["PySide2 (<6)"]glfw = ["glfw"]-pygame = ["pygame (==2.0.0.dev10)"]+pygame = ["pygame (2.0.0.dev10)"]pyqt5 = ["pyqt5"]pywavefront = ["pywavefront (>=1.2.0,<2)"]tk = ["pyopengltk (>=0.0.3)"]@@ -940,11 +948,11 @@ testpath = "*"traitlets = ">=4.2"[package.extras]-all = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (==0.2.2)", "tornado (>=4.0)", "sphinx (>=1.5.1)", "sphinx-rtd-theme", "nbsphinx (>=0.2.12)", "ipython"]+all = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (0.2.2)", "tornado (>=4.0)", "sphinx (>=1.5.1)", "sphinx-rtd-theme", "nbsphinx (>=0.2.12)", "ipython"]docs = ["sphinx (>=1.5.1)", "sphinx-rtd-theme", "nbsphinx (>=0.2.12)", "ipython"]serve = ["tornado (>=4.0)"]-test = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (==0.2.2)"]-webpdf = ["pyppeteer (==0.2.2)"]+test = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (0.2.2)"]+webpdf = ["pyppeteer (0.2.2)"][[package]]name = "nbformat"@@ -1069,7 +1077,7 @@ optional = truepython-versions = ">=3.6"[package.extras]-qa = ["flake8 (==3.8.3)", "mypy (==0.782)"]+qa = ["flake8 (3.8.3)", "mypy (0.782)"]testing = ["docopt", "pytest (<6.0.0)"][[package]]@@ -1281,9 +1289,9 @@ python-versions = ">=3.6"[package.extras]crypto = ["cryptography (>=3.3.1,<4.0.0)"]-dev = ["sphinx", "sphinx-rtd-theme", "zope.interface", "cryptography (>=3.3.1,<4.0.0)", "pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)", "mypy", "pre-commit"]+dev = ["sphinx", "sphinx-rtd-theme", "zope.interface", "cryptography (>=3.3.1,<4.0.0)", "pytest (>=6.0.0,<7.0.0)", "coverage[toml] (5.0.4)", "mypy", "pre-commit"]docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"]-tests = ["pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)"]+tests = ["pytest (>=6.0.0,<7.0.0)", "coverage[toml] (5.0.4)"][[package]]name = "pylint"@@ -1314,7 +1322,7 @@ six = "*"[package.extras]docs = ["sphinx (>=1.6.5)", "sphinx-rtd-theme"]-tests = ["pytest (>=3.2.1,!=3.3.0)", "hypothesis (>=3.27.0)"]+tests = ["pytest (>=3.2.1,<3.3.0 || >3.3.0)", "hypothesis (>=3.27.0)"][[package]]name = "pyparsing"@@ -1379,7 +1387,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}pytest = ">=4.6"[package.extras]-testing = ["fields", "hunter", "process-tests (==2.0.2)", "six", "pytest-xdist", "virtualenv"]+testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "pytest-xdist", "virtualenv"][[package]]name = "pytest-forked"@@ -1455,7 +1463,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"[[package]]name = "pyzmq"-version = "22.0.3"+version = "22.1.0"description = "Python bindings for 0MQ"category = "main"optional = true@@ -1617,7 +1625,7 @@ python-versions = "*"sphinx = ">=1.8"[package.extras]-code_style = ["flake8 (>=3.7.0,<3.8.0)", "black", "pre-commit (==1.17.0)"]+code_style = ["flake8 (>=3.7.0,<3.8.0)", "black", "pre-commit (1.17.0)"][[package]]name = "sphinxcontrib-applehelp"@@ -1692,7 +1700,7 @@ test = ["pytest"][[package]]name = "sphinxext-opengraph"-version = "0.4.1"+version = "0.4.2"description = "Sphinx Extension to enable OGP support"category = "dev"optional = false@@ -1862,6 +1870,7 @@ docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"][extras]+gui = ["dearpygui"]jupyterlab = ["jupyterlab"]webgl_renderer = ["grpcio", "grpcio-tools"]@@ -2087,6 +2096,21 @@ cycler = [{file = "cycler-0.10.0-py2.py3-none-any.whl", hash = "sha256:1d8a5ae1ff6c5cf9b93e8811e581232ad8920aeec647c37316ceac982b08cb2d"},{file = "cycler-0.10.0.tar.gz", hash = "sha256:cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"},]+dearpygui = [+ {file = "dearpygui-0.6.415-cp36-cp36m-macosx_10_6_x86_64.whl", hash = "sha256:35cb3909383813e6a6149f533a7ffc1632407826b4323006be743f6fa42c283c"},+ {file = "dearpygui-0.6.415-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:910a6eaf9c81cb3591c80b87b3943018f31926cfe81495a091423ab46f53aea4"},+ {file = "dearpygui-0.6.415-cp36-cp36m-win_amd64.whl", hash = "sha256:e7bb980c8547a026c74fcfc7ab739dbc0caf8f07fad4c2307d224a647af21c2e"},+ {file = "dearpygui-0.6.415-cp37-cp37m-linux_armv7l.whl", hash = "sha256:f2a7dbe1fc428a076eec09be89cef35e320d06d974d405d9e27869a499794f32"},+ {file = "dearpygui-0.6.415-cp37-cp37m-macosx_10_6_x86_64.whl", hash = "sha256:edc7132f541dd1df90d68a813e8a6d5820ec6bea52ed96918d4e84505fe3d366"},+ {file = "dearpygui-0.6.415-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:735fd91467febaea5d648d54fac24fd65d92e8aebce57a4e39a690db7cc02e8b"},+ {file = "dearpygui-0.6.415-cp37-cp37m-win_amd64.whl", hash = "sha256:adacc0ea245a288150dd1dcd4a4208a8de72c7aeff3d7c43a9f88f0d92d4a1ec"},+ {file = "dearpygui-0.6.415-cp38-cp38-macosx_10_6_x86_64.whl", hash = "sha256:a6edc677adebd36908f8bc034bf12a767a2a869bbb37b209a9548a7526c6a361"},+ {file = "dearpygui-0.6.415-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:c62f2976ecbf5493491a0b0300c9e75b8b1b9bf397358466b1730c8b7bfb5351"},+ {file = "dearpygui-0.6.415-cp38-cp38-win_amd64.whl", hash = "sha256:3754903e09edfadce849d345f156323a5fb67e6049a2f2fef3d4ec04b3f92a90"},+ {file = "dearpygui-0.6.415-cp39-cp39-macosx_10_6_x86_64.whl", hash = "sha256:972742b60aef576d04fe6fcfe31491442ce57bfe40273b9387c46fecac5e7609"},+ {file = "dearpygui-0.6.415-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:634c5a94745ce2a06c354782ac9423f2ce1418bc14b0d4e33c2551d662b29142"},+ {file = "dearpygui-0.6.415-cp39-cp39-win_amd64.whl", hash = "sha256:7026fb4441f5e299468c24234bd7f53d934e16100ca1e626255d608ca4b34aff"},+]decorator = [{file = "decorator-5.0.9-py3-none-any.whl", hash = "sha256:6e5c199c16f7a9f0e3a61a4a54b3d27e7dad0dbdde92b944426cb20914376323"},{file = "decorator-5.0.9.tar.gz", hash = "sha256:72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5"},@@ -2136,30 +2160,23 @@ gitpython = [{file = "GitPython-3.1.17.tar.gz", hash = "sha256:ee24bdc93dce357630764db659edaf6b8d664d4ff5447ccfeedd2dc5c253f41e"},]glcontext = [- {file = "glcontext-2.3.3-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:f518379551a2b60d45c1eec23759cb1ee85517d4b943fc31530b6ab13e304fe4"},- {file = "glcontext-2.3.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:d3a8fbc27f43766d168bae02474790459f4050adeb25832ff0a227cc5006c933"},- {file = "glcontext-2.3.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aa1d9e4f9bd6eda3d195f39c47c849b3721caf65813a4ad1e006a20fa02d33e4"},- {file = "glcontext-2.3.3-cp35-cp35m-win32.whl", hash = "sha256:8b4ee9cb5573e2ae313e1681fdfe2c5ac5b8780b20e857daf8f95e318c36aa2f"},- {file = "glcontext-2.3.3-cp35-cp35m-win_amd64.whl", hash = "sha256:b92ca447a04c3a05afb3974a6e94f584e60f55444c3e55ecd31fbfacad6ee07a"},- {file = "glcontext-2.3.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b102a00e7bbce03a5e8bb02692197f96fcb77c51dbe133859b70afa361eef5b7"},- {file = "glcontext-2.3.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:ea3975a9d86a97b49f9524713c8e3f0df92044715cfbe5a24102e10762673b23"},- {file = "glcontext-2.3.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:5f2e7fb61ea1f69c44db0799f8929ea66ad207619c18063ae60cfb26ad0f447f"},- {file = "glcontext-2.3.3-cp36-cp36m-win32.whl", hash = "sha256:bf8c3fa5f3a8962c9bcc03a869a0bb178bd1681619225b9f0a070a65ff3f766d"},- {file = "glcontext-2.3.3-cp36-cp36m-win_amd64.whl", hash = "sha256:e0b637f2ac1c2dd1e0dbfcbad6d7be2dae75290f9af8f82aa67aa55b977766e1"},- {file = "glcontext-2.3.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2002d29dee90e9ba800c8699e13e1ff8b0fa1292a7c5bb0a98ef50b5f6cd3f14"},- {file = "glcontext-2.3.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:941be8972ad64e70080ad4702c037c64c09d1378ddd9b1b4576b957bc2d7f1c2"},- {file = "glcontext-2.3.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:0eb69c4add7f724017169bcefc2a8ef8ce053183e9384cc4770162e934090592"},- {file = "glcontext-2.3.3-cp37-cp37m-win32.whl", hash = "sha256:f63aed2116907225f7392921df790a391fd1a843cd1af0756dcd533e9d3ecf2b"},- {file = "glcontext-2.3.3-cp37-cp37m-win_amd64.whl", hash = "sha256:2fa9b939c15f5f7e63110a1021e8d20341c03921b8d3aebbb4bb191f11414d86"},- {file = "glcontext-2.3.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:44f95953bbd6a26caa9489b4f838b106470ede432c5ef837cd3e0d3657ca2a06"},- {file = "glcontext-2.3.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:843d3361bf46aec487f268bb7f680700166640995a82424fa86e53f428dc43ae"},- {file = "glcontext-2.3.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:be3e25a8595976699b6d30a2619ca4faf7bd5e60ff38dcd4445fa38a8f3b2cf9"},- {file = "glcontext-2.3.3-cp38-cp38-win32.whl", hash = "sha256:7abbd227bf9e4e62ec196360fa0f440143a66b7aae3d3deb7960b87aac654043"},- {file = "glcontext-2.3.3-cp38-cp38-win_amd64.whl", hash = "sha256:b91010d033789d1f876789e4aa4e6498e87cd284b4d0cb7a4aa1b7e620caaf57"},- {file = "glcontext-2.3.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0a851f569f165a13f8fedf60dd4f2831f7c2ffbb9bc9f867d6e0e3fdd1846c8d"},- {file = "glcontext-2.3.3-cp39-cp39-win32.whl", hash = "sha256:f36935ba84e8c52ed22bb9f683875bdf1690abd318ae704f40511f1afca5f71a"},- {file = "glcontext-2.3.3-cp39-cp39-win_amd64.whl", hash = "sha256:69e3a04c677e4925c0b6daf5efc5469a86d0982b05bb1d0ca29bce57f4aaf7d1"},- {file = "glcontext-2.3.3.tar.gz", hash = "sha256:f86a6c4ad99f941623911f964da74c443dc3f833fac7eb03cd485fae82acb80c"},+ {file = "glcontext-2.3.4-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:1af3314f20c97fa2a8fc6d2b68d597463066416a7cc3c1ea4f05b4ecb0fc3e9c"},+ {file = "glcontext-2.3.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:3e1ef7e93a6a0f8b89a76fb41c58af4d9e69686504785883b628f0eeee29b153"},+ {file = "glcontext-2.3.4-cp36-cp36m-win32.whl", hash = "sha256:448bafceaad2716a260fce53f171f168546691dddd18c1d4532c8d0e6f305a50"},+ {file = "glcontext-2.3.4-cp36-cp36m-win_amd64.whl", hash = "sha256:1ceb88d1cb22387af5a3d5e0223835ed0676da350774ba15ba68f6d815519f90"},+ {file = "glcontext-2.3.4-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:0be3e1cb47fe3a8f48b2e66cdcc2d330490990aba3913648c9d67d58c646765e"},+ {file = "glcontext-2.3.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:0f99726238ac132cc1fd7b9a62e449c7914957f451e6aea1a54e24be8b1ce04a"},+ {file = "glcontext-2.3.4-cp37-cp37m-win32.whl", hash = "sha256:4290542e696ca6c52230521552ed26322d62eda935c43da01d9913af2e95165b"},+ {file = "glcontext-2.3.4-cp37-cp37m-win_amd64.whl", hash = "sha256:2d585a586cd5a401e9aeeca18c8d56a4b908cd5b365241ab6834e35f28f7dafb"},+ {file = "glcontext-2.3.4-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:b7eecb1a1f689bcb3b77f8aed45e6b9139b3dec4fdeef894b6a7aa2b7c9b4312"},+ {file = "glcontext-2.3.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1ad78fce244afa860cb11c30c42fb710251035b2df4d84b0e72457128b7a830f"},+ {file = "glcontext-2.3.4-cp38-cp38-win32.whl", hash = "sha256:e71121ac65a98808f9caaeaa3912756c07cd6cf73857a90b31170703103b644c"},+ {file = "glcontext-2.3.4-cp38-cp38-win_amd64.whl", hash = "sha256:a27c5bbbe9d88ae547ddb89d3f55edec14b44126999d7f6214838240b1cb8c2a"},+ {file = "glcontext-2.3.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:25100ea7df50728937f96cb3cb6cba5ce42d674a0a6c2efae23198674212032a"},+ {file = "glcontext-2.3.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:2f99c62f234f2859d626e1b24d7949d8d76a3a6fb7c2883b6f376e70586ce0ad"},+ {file = "glcontext-2.3.4-cp39-cp39-win32.whl", hash = "sha256:e1404b84e40daf7181168f4afa4f6ac5c4984e1f090fbd538da5b49046e4a078"},+ {file = "glcontext-2.3.4-cp39-cp39-win_amd64.whl", hash = "sha256:247ac15cbef85befb8c3ddb62659cc36b26786f0cec609724b60419ffb0a423a"},+ {file = "glcontext-2.3.4.tar.gz", hash = "sha256:537cd5113f7a5c17094dee50107587adeaea01d4854407bdab8e3bcd808e0bc6"},]grpcio = [{file = "grpcio-1.33.2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c5030be8a60fb18de1fc8d93d130d57e4296c02f229200df814f6578da00429e"},@@ -2270,8 +2287,8 @@ imagesize = [{file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"},]importlib-metadata = [- {file = "importlib_metadata-4.0.1-py3-none-any.whl", hash = "sha256:d7eb1dea6d6a6086f8be21784cc9e3bcfa55872b52309bc5fad53a8ea444465d"},- {file = "importlib_metadata-4.0.1.tar.gz", hash = "sha256:8c501196e49fb9df5df43833bdb1e4328f64847763ec8a50703148b73784d581"},+ {file = "importlib_metadata-4.3.0-py3-none-any.whl", hash = "sha256:c8b9a7c6000baa7adf7abcd2c41db11f172bcb5d6e448c73c2407dbc7e7e2af3"},+ {file = "importlib_metadata-4.3.0.tar.gz", hash = "sha256:c4646abbce80191bb548636f846e353ff1edc46a06bc536ea0a60d53211dc690"},]iniconfig = [{file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},@@ -2544,7 +2561,6 @@ moderngl = [{file = "moderngl-5.6.4.tar.gz", hash = "sha256:8c6d04559f5e3bf75a18525cd46d213c0f3a8409363718978e6de691bdb551fb"},]moderngl-window = [- {file = "moderngl-window-2.3.0.tar.gz", hash = "sha256:310035e524ffcdaedcc951844bb78a5baf16735d18c05e21791501e925161e2e"},{file = "moderngl_window-2.3.0-py3-none-any.whl", hash = "sha256:79056e6b6a1e8c540031166d2ec308a40806baf461e5d492730966c3cf372a31"},]multipledispatch = [@@ -2904,38 +2920,38 @@ pyyaml = [{file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"},]pyzmq = [- {file = "pyzmq-22.0.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c0cde362075ee8f3d2b0353b283e203c2200243b5a15d5c5c03b78112a17e7d4"},- {file = "pyzmq-22.0.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:ff1ea14075bbddd6f29bf6beb8a46d0db779bcec6b9820909584081ec119f8fd"},- {file = "pyzmq-22.0.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:26380487eae4034d6c2a3fb8d0f2dff6dd0d9dd711894e8d25aa2d1938950a33"},- {file = "pyzmq-22.0.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:3e29f9cf85a40d521d048b55c63f59d6c772ac1c4bf51cdfc23b62a62e377c33"},- {file = "pyzmq-22.0.3-cp36-cp36m-win32.whl", hash = "sha256:4f34a173f813b38b83f058e267e30465ed64b22cd0cf6bad21148d3fa718f9bb"},- {file = "pyzmq-22.0.3-cp36-cp36m-win_amd64.whl", hash = "sha256:30df70f81fe210506aa354d7fd486a39b87d9f7f24c3d3f4f698ec5d96b8c084"},- {file = "pyzmq-22.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7026f0353977431fc884abd4ac28268894bd1a780ba84bb266d470b0ec26d2ed"},- {file = "pyzmq-22.0.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6d4163704201fff0f3ab0cd5d7a0ea1514ecfffd3926d62ec7e740a04d2012c7"},- {file = "pyzmq-22.0.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:763c175294d861869f18eb42901d500eda7d3fa4565f160b3b2fd2678ea0ebab"},- {file = "pyzmq-22.0.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:61e4bb6cd60caf1abcd796c3f48395e22c5b486eeca6f3a8797975c57d94b03e"},- {file = "pyzmq-22.0.3-cp37-cp37m-win32.whl", hash = "sha256:b25e5d339550a850f7e919fe8cb4c8eabe4c917613db48dab3df19bfb9a28969"},- {file = "pyzmq-22.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:3ef50d74469b03725d781a2a03c57537d86847ccde587130fe35caafea8f75c6"},- {file = "pyzmq-22.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:60e63577b85055e4cc43892fecd877b86695ee3ef12d5d10a3c5d6e77a7cc1a3"},- {file = "pyzmq-22.0.3-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:f5831eff6b125992ec65d973f5151c48003b6754030094723ac4c6e80a97c8c4"},- {file = "pyzmq-22.0.3-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:9221783dacb419604d5345d0e097bddef4459a9a95322de6c306bf1d9896559f"},- {file = "pyzmq-22.0.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:b62ea18c0458a65ccd5be90f276f7a5a3f26a6dea0066d948ce2fa896051420f"},- {file = "pyzmq-22.0.3-cp38-cp38-win32.whl", hash = "sha256:81e7df0da456206201e226491aa1fc449da85328bf33bbeec2c03bb3a9f18324"},- {file = "pyzmq-22.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:f52070871a0fd90a99130babf21f8af192304ec1e995bec2a9533efc21ea4452"},- {file = "pyzmq-22.0.3-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:c5e29fe4678f97ce429f076a2a049a3d0b2660ada8f2c621e5dc9939426056dd"},- {file = "pyzmq-22.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d18ddc6741b51f3985978f2fda57ddcdae359662d7a6b395bc8ff2292fca14bd"},- {file = "pyzmq-22.0.3-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4231943514812dfb74f44eadcf85e8dd8cf302b4d0bce450ce1357cac88dbfdc"},- {file = "pyzmq-22.0.3-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:23a74de4b43c05c3044aeba0d1f3970def8f916151a712a3ac1e5cd9c0bc2902"},- {file = "pyzmq-22.0.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:532af3e6dddea62d9c49062ece5add998c9823c2419da943cf95589f56737de0"},- {file = "pyzmq-22.0.3-cp39-cp39-win32.whl", hash = "sha256:33acd2b9790818b9d00526135acf12790649d8d34b2b04d64558b469c9d86820"},- {file = "pyzmq-22.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:a558c5bc89d56d7253187dccc4e81b5bb0eac5ae9511eb4951910a1245d04622"},- {file = "pyzmq-22.0.3-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:581787c62eaa0e0db6c5413cedc393ebbadac6ddfd22e1cf9a60da23c4f1a4b2"},- {file = "pyzmq-22.0.3-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:38e3dca75d81bec4f2defa14b0a65b74545812bb519a8e89c8df96bbf4639356"},- {file = "pyzmq-22.0.3-pp36-pypy36_pp73-win32.whl", hash = "sha256:2f971431aaebe0a8b54ac018e041c2f0b949a43745444e4dadcc80d0f0ef8457"},- {file = "pyzmq-22.0.3-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:da7d4d4c778c86b60949d17531e60c54ed3726878de8a7f8a6d6e7f8cc8c3205"},- {file = "pyzmq-22.0.3-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:13465c1ff969cab328bc92f7015ce3843f6e35f8871ad79d236e4fbc85dbe4cb"},- {file = "pyzmq-22.0.3-pp37-pypy37_pp73-win32.whl", hash = "sha256:279cc9b51db48bec2db146f38e336049ac5a59e5f12fb3a8ad864e238c1c62e3"},- {file = "pyzmq-22.0.3.tar.gz", hash = "sha256:f7f63ce127980d40f3e6a5fdb87abf17ce1a7c2bd8bf2c7560e1bbce8ab1f92d"},+ {file = "pyzmq-22.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:4e9b9a2f6944acdaf57316436c1acdcb30b8df76726bcf570ad9342bc5001654"},+ {file = "pyzmq-22.1.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:24fb5bb641f0b2aa25fc3832f4b6fc62430f14a7d328229fe994b2bcdc07c93a"},+ {file = "pyzmq-22.1.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:c4674004ed64685a38bee222cd75afa769424ec603f9329f0dd4777138337f48"},+ {file = "pyzmq-22.1.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:461ed80d741692d9457ab820b1cc057ba9c37c394e67b647b639f623c8b321f6"},+ {file = "pyzmq-22.1.0-cp36-cp36m-win32.whl", hash = "sha256:de5806be66c9108e4dcdaced084e8ceae14100aa559e2d57b4f0cceb98c462de"},+ {file = "pyzmq-22.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a1c77796f395804d6002ff56a6a8168c1f98579896897ad7e35665a9b4a9eec5"},+ {file = "pyzmq-22.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c6a81c9e6754465d09a87e3acd74d9bb1f0039b2d785c6899622f0afdb41d760"},+ {file = "pyzmq-22.1.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0f0f27eaab9ba7b92d73d71c51d1a04464a1da6097a252d007922103253d2313"},+ {file = "pyzmq-22.1.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:4b8fb1b3174b56fd020e4b10232b1764e52cf7f3babcfb460c5253bdc48adad0"},+ {file = "pyzmq-22.1.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:c8fff75af4c7af92dce9f81fa2a83ed009c3e1f33ee8b5222db2ef80b94e242e"},+ {file = "pyzmq-22.1.0-cp37-cp37m-win32.whl", hash = "sha256:cb9f9fe1305ef69b65794655fd89b2209b11bff3e837de981820a8aa051ef914"},+ {file = "pyzmq-22.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:bf80b2cec42d96117248b99d3c86e263a00469c840a778e6cb52d916f4fdf82c"},+ {file = "pyzmq-22.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0ea7f4237991b0f745a4432c63e888450840bf8cb6c48b93fb7d62864f455529"},+ {file = "pyzmq-22.1.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:12ffcf33db6ba7c0e5aaf901e65517f5e2b719367b80bcbfad692f546a297c7a"},+ {file = "pyzmq-22.1.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:d3ecfee2ee8d91ab2e08d2d8e89302c729b244e302bbc39c5b5dde42306ff003"},+ {file = "pyzmq-22.1.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:68e2c4505992ab5b89f976f89a9135742b18d60068f761bef994a6805f1cae0c"},+ {file = "pyzmq-22.1.0-cp38-cp38-win32.whl", hash = "sha256:285514956c08c7830da9d94e01f5414661a987831bd9f95e4d89cc8aaae8da10"},+ {file = "pyzmq-22.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:d5e5be93e1714a59a535bbbc086b9e4fd2448c7547c5288548f6fd86353cad9e"},+ {file = "pyzmq-22.1.0-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:b2f707b52e09098a7770503e39294ca6e22ae5138ffa1dd36248b6436d23d78e"},+ {file = "pyzmq-22.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:18dd2ca4540c476558099891c129e6f94109971d110b549db2a9775c817cedbd"},+ {file = "pyzmq-22.1.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:c6d0c32532a0519997e1ded767e184ebb8543bdb351f8eff8570bd461e874efc"},+ {file = "pyzmq-22.1.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:9ee48413a2d3cd867fd836737b4c89c24cea1150a37f4856d82d20293fa7519f"},+ {file = "pyzmq-22.1.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:4c4fe69c7dc0d13d4ae180ad650bb900854367f3349d3c16f0569f6c6447f698"},+ {file = "pyzmq-22.1.0-cp39-cp39-win32.whl", hash = "sha256:fc712a90401bcbf3fa25747f189d6dcfccbecc32712701cad25c6355589dac57"},+ {file = "pyzmq-22.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:68be16107f41563b9f67d93dff1c9f5587e0f76aa8fd91dc04c83d813bcdab1f"},+ {file = "pyzmq-22.1.0-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:734ea6565c71fc2d03d5b8c7d0d7519c96bb5567e0396da1b563c24a4ac66f0c"},+ {file = "pyzmq-22.1.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:1389b615917d4196962a9b469e947ba862a8ec6f5094a47da5e7a8d404bc07a4"},+ {file = "pyzmq-22.1.0-pp36-pypy36_pp73-win32.whl", hash = "sha256:41049cff5265e9cd75606aa2c90a76b9c80b98d8fe70ee08cf4af3cedb113358"},+ {file = "pyzmq-22.1.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:f49755684a963731479ff3035d45a8185545b4c9f662d368bd349c419839886d"},+ {file = "pyzmq-22.1.0-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:6355f81947e1fe6e7bb9e123aeb3067264391d3ebe8402709f824ef8673fa6f3"},+ {file = "pyzmq-22.1.0-pp37-pypy37_pp73-win32.whl", hash = "sha256:089b974ec04d663b8685ac90e86bfe0e4da9d911ff3cf52cb765ff22408b102d"},+ {file = "pyzmq-22.1.0.tar.gz", hash = "sha256:7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d"},]recommonmark = [{file = "recommonmark-0.7.1-py2.py3-none-any.whl", hash = "sha256:1b1db69af0231efce3fa21b94ff627ea33dee7079a01dd0a7f8482c3da148b3f"},@@ -3070,8 +3086,8 @@ sphinxcontrib-serializinghtml = [{file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"},]sphinxext-opengraph = [- {file = "sphinxext-opengraph-0.4.1.tar.gz", hash = "sha256:6ce428fc078bf2dfdb46fba035958989a4865180d8b6dbb03892692e95e1e5d8"},- {file = "sphinxext_opengraph-0.4.1-py3-none-any.whl", hash = "sha256:ebdfd83535aad4ffe290d5adffe181dae03b59da7fdd25765ee4982e2041bf9e"},+ {file = "sphinxext-opengraph-0.4.2.tar.gz", hash = "sha256:5da1a6eaab25e377b841f506ef7d7c44b539428f3d6094ccc16d1dfd3ef65501"},+ {file = "sphinxext_opengraph-0.4.2-py3-none-any.whl", hash = "sha256:a51f2604f9a5b6c0d25d3a88e694d5c02e20812dc0e482adf96c8628f9109357"},]terminado = [{file = "terminado-0.10.0-py3-none-any.whl", hash = "sha256:048ce7b271ad1f94c48130844af1de163e54913b919f8c268c89b36a6d468d7c"},diff --git a/pyproject.toml b/pyproject.tomlindex 21d1a52c6..4a8d590df 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -51,10 +51,12 @@ moderngl-window = "^2.3.0"mapbox-earcut = "^0.12.10"cloup = "^0.7.0"requests = "*"+dearpygui = { version = "^0.6.415", optional = true }[tool.poetry.extras]webgl_renderer = ["grpcio","grpcio-tools"]jupyterlab = ["jupyterlab"]+gui = ["dearpygui"][tool.poetry.dev-dependencies]pytest-cov = "*"