Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Formatting, configurable nudge, logging, window title

Devin Nealc1cf52faaeb3
diff --git a/manim/__main__.py b/manim/__main__.py
index 43263dfd2..b448e891c 100644
--- a/manim/__main__.py
+++ b/manim/__main__.py
@@ -83,9 +83,7 @@ def main():
scene = SceneClass(renderer)
scene.render()
except Exception:
- print("\n\n")
- traceback.print_exc()
- print("\n\n")
+ console.print_exception()
elif config["use_webgl_renderer"]:
try:
from manim.grpc.impl import frame_server_impl
@@ -94,13 +92,11 @@ def main():
server.start()
server.wait_for_termination()
except ModuleNotFoundError as e:
- print("\n\n")
- print(
+ console.print(
"Dependencies for the WebGL render are missing. Run "
"pip install manim[webgl_renderer] to install them."
)
- print(e)
- print("\n\n")
+ console.print_exception()
else:
for SceneClass in scene_classes_from_file(input_file):
try:
@@ -108,9 +104,7 @@ def main():
scene.render()
open_file_if_needed(scene.renderer.file_writer)
except Exception:
- print("\n\n")
- traceback.print_exc()
- print("\n\n")
+ console.print_exception()
if __name__ == "__main__":
diff --git a/manim/mobject/opengl_geometry.py b/manim/mobject/opengl_geometry.py
index ffbb5f9ab..48e5bbc9b 100644
--- a/manim/mobject/opengl_geometry.py
+++ b/manim/mobject/opengl_geometry.py
@@ -1,25 +1,25 @@
import numpy as np
from ..constants import *
-from ..utils.color import *
from ..mobject.mobject import Mobject
-from ..mobject.types.opengl_vectorized_mobject import OpenGLVGroup
-from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobject
-from ..mobject.types.opengl_vectorized_mobject import OpenGLDashedVMobject
-from ..utils.iterables import adjacent_n_tuples
-from ..utils.iterables import adjacent_pairs
-from ..utils.simple_functions import fdiv
-
-from ..utils.simple_functions import clip
-from ..utils.space_ops import angle_of_vector
-from ..utils.space_ops import angle_between_vectors
-from ..utils.space_ops import compass_directions
-from ..utils.space_ops import find_intersection
-from ..utils.space_ops import get_norm
-from ..utils.space_ops import normalize
-from ..utils.space_ops import rotate_vector
-from ..utils.space_ops import rotation_matrix_transpose
-
+from ..mobject.types.opengl_vectorized_mobject import (
+ OpenGLDashedVMobject,
+ OpenGLVGroup,
+ OpenGLVMobject,
+)
+from ..utils.color import *
+from ..utils.iterables import adjacent_n_tuples, adjacent_pairs
+from ..utils.simple_functions import clip, fdiv
+from ..utils.space_ops import (
+ angle_between_vectors,
+ angle_of_vector,
+ compass_directions,
+ find_intersection,
+ get_norm,
+ normalize,
+ rotate_vector,
+ rotation_matrix_transpose,
+)
DEFAULT_DOT_RADIUS = 0.08
DEFAULT_SMALL_DOT_RADIUS = 0.04
diff --git a/manim/mobject/opengl_three_dimensions.py b/manim/mobject/opengl_three_dimensions.py
index d4bba5f06..a494f759a 100644
--- a/manim/mobject/opengl_three_dimensions.py
+++ b/manim/mobject/opengl_three_dimensions.py
@@ -42,8 +42,7 @@ class OpenGLSurfaceMesh(OpenGLVGroup):
points, du_points, dv_points = uv_surface.get_surface_points_and_nudged_points()
normals = uv_surface.get_unit_normals()
- nudge = 1e-2
- nudged_points = points + nudge * normals
+ nudged_points = points + self.normal_nudge * normals
for ui in u_indices:
path = OpenGLVMobject()
diff --git a/manim/mobject/types/opengl_vectorized_mobject.py b/manim/mobject/types/opengl_vectorized_mobject.py
index 33fd83e39..7290e627c 100644
--- a/manim/mobject/types/opengl_vectorized_mobject.py
+++ b/manim/mobject/types/opengl_vectorized_mobject.py
@@ -1,37 +1,36 @@
import itertools as it
import operator as op
+from functools import reduce, wraps
+
import moderngl
import numpy as np
-from functools import reduce, wraps
-from ...mobject.opengl_mobject import OpenGLMobject, OpenGLPoint
from ...constants import *
-from ...utils.color import *
-
-from ...utils.bezier import bezier
+from ...mobject.opengl_mobject import OpenGLMobject, OpenGLPoint
# from manimlib.utils.bezier import get_smooth_quadratic_bezier_handle_points
-from ...utils.bezier import get_smooth_cubic_bezier_handle_points
-from ...utils.bezier import get_quadratic_approximation_of_cubic
-from ...utils.bezier import interpolate
-from ...utils.bezier import integer_interpolate
-from ...utils.bezier import partial_quadratic_bezier_points
-
-# from manimlib.utils.color import rgb_to_hex
-from ...utils.iterables import make_even
+from ...utils.bezier import (
+ bezier,
+ get_quadratic_approximation_of_cubic,
+ get_smooth_cubic_bezier_handle_points,
+ integer_interpolate,
+ interpolate,
+ partial_quadratic_bezier_points,
+)
+from ...utils.color import *
# from manimlib.utils.iterables import resize_array
-from ...utils.iterables import resize_with_interpolation
-from ...utils.iterables import listify
+# from manimlib.utils.color import rgb_to_hex
+from ...utils.iterables import listify, make_even, resize_with_interpolation
# from manimlib.utils.space_ops import angle_between_vectors
-from ...utils.space_ops import cross2d
-from ...utils.space_ops import earclip_triangulation
-from ...utils.space_ops import get_norm
-from ...utils.space_ops import get_unit_normal
-
-from ...utils.space_ops import z_to_vector
-
+from ...utils.space_ops import (
+ cross2d,
+ earclip_triangulation,
+ get_norm,
+ get_unit_normal,
+ z_to_vector,
+)
JOINT_TYPE_MAP = {
"auto": 0,
diff --git a/manim/renderer/opengl_renderer_window.py b/manim/renderer/opengl_renderer_window.py
index 172b8e09b..bddc26ac8 100644
--- a/manim/renderer/opengl_renderer_window.py
+++ b/manim/renderer/opengl_renderer_window.py
@@ -1,4 +1,4 @@
-from .. import config
+from .. import config, __version__
import moderngl_window as mglw
from moderngl_window.context.pyglet.window import Window as PygletWindow
from moderngl_window.timers.clock import Timer
@@ -18,7 +18,7 @@ class Window(PygletWindow):
self.pressed_keys = set()
- self.title = "Title goes here"
+ self.title = f"ManimCommunity {__version__}"
self.size = size
mglw.activate_context(window=self)
diff --git a/manim/renderer/shaders/image/frag.glsl b/manim/renderer/shaders/image/frag.glsl
index 154b528ec..fe6cbd4ca 100644
--- a/manim/renderer/shaders/image/frag.glsl
+++ b/manim/renderer/shaders/image/frag.glsl
@@ -10,4 +10,4 @@ out vec4 frag_color;
void main() {
frag_color = texture(Texture, v_im_coords);
frag_color.a = v_opacity;
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/image/vert.glsl b/manim/renderer/shaders/image/vert.glsl
index febc0af18..f27efe300 100644
--- a/manim/renderer/shaders/image/vert.glsl
+++ b/manim/renderer/shaders/image/vert.glsl
@@ -19,4 +19,4 @@ void main(){
v_im_coords = im_coords;
v_opacity = opacity;
gl_Position = get_gl_Position(position_point_into_frame(point));
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/inserts/add_light.glsl b/manim/renderer/shaders/inserts/add_light.glsl
index 8ef7cc11a..f0f32c8d9 100644
--- a/manim/renderer/shaders/inserts/add_light.glsl
+++ b/manim/renderer/shaders/inserts/add_light.glsl
@@ -40,4 +40,4 @@ vec4 finalize_color(vec4 color,
float shadow){
// Put insertion here instead
return add_light(color, point, unit_normal, light_coords, gloss, shadow);
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/inserts/camera_uniform_declarations.glsl b/manim/renderer/shaders/inserts/camera_uniform_declarations.glsl
index b40b1b906..fdeacab85 100644
--- a/manim/renderer/shaders/inserts/camera_uniform_declarations.glsl
+++ b/manim/renderer/shaders/inserts/camera_uniform_declarations.glsl
@@ -3,4 +3,4 @@ uniform float anti_alias_width;
uniform vec3 camera_center;
uniform mat3 camera_rotation;
uniform float is_fixed_in_frame;
-uniform float focal_distance;
\ No newline at end of file
+uniform float focal_distance;
diff --git a/manim/renderer/shaders/inserts/finalize_color.glsl b/manim/renderer/shaders/inserts/finalize_color.glsl
index 0664deb0b..7324fc155 100644
--- a/manim/renderer/shaders/inserts/finalize_color.glsl
+++ b/manim/renderer/shaders/inserts/finalize_color.glsl
@@ -48,4 +48,4 @@ vec4 finalize_color(vec4 color,
// The line above may be replaced by arbitrary code snippets, as per
// the method Mobject.set_color_by_code
return add_light(color, point, unit_normal, light_coords, gloss, shadow);
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/inserts/get_gl_Position.glsl b/manim/renderer/shaders/inserts/get_gl_Position.glsl
index 2f9d8934b..95d3f054b 100644
--- a/manim/renderer/shaders/inserts/get_gl_Position.glsl
+++ b/manim/renderer/shaders/inserts/get_gl_Position.glsl
@@ -28,4 +28,4 @@ vec4 get_gl_Position(vec3 point){
}
result.z *= -1;
return result;
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/inserts/get_rotated_surface_unit_normal_vector.glsl b/manim/renderer/shaders/inserts/get_rotated_surface_unit_normal_vector.glsl
index a9d637fe9..8c6350d7a 100644
--- a/manim/renderer/shaders/inserts/get_rotated_surface_unit_normal_vector.glsl
+++ b/manim/renderer/shaders/inserts/get_rotated_surface_unit_normal_vector.glsl
@@ -13,4 +13,4 @@ vec3 get_rotated_surface_unit_normal_vector(vec3 point, vec3 du_point, vec3 dv_p
cp = cross(cross(v2, point), v2);
}
return normalize(rotate_point_into_frame(cp));
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/inserts/get_unit_normal.glsl b/manim/renderer/shaders/inserts/get_unit_normal.glsl
index d755d458f..65bb9c71e 100644
--- a/manim/renderer/shaders/inserts/get_unit_normal.glsl
+++ b/manim/renderer/shaders/inserts/get_unit_normal.glsl
@@ -19,4 +19,4 @@ vec3 get_unit_normal(in vec3[3] points){
return new_cp / new_cp_norm;
}
return cp / cp_norm;
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/inserts/quadratic_bezier_distance.glsl b/manim/renderer/shaders/inserts/quadratic_bezier_distance.glsl
index 173e4aec9..7f2c5d5dd 100644
--- a/manim/renderer/shaders/inserts/quadratic_bezier_distance.glsl
+++ b/manim/renderer/shaders/inserts/quadratic_bezier_distance.glsl
@@ -104,4 +104,4 @@ float min_dist_to_curve(vec2 p, vec2 b2, float degree){
if(n == 1) return d0;
float d1 = dist_to_point_on_curve(p, roots[1], b2);
return min(d0, d1);
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/inserts/quadratic_bezier_geometry_functions.glsl b/manim/renderer/shaders/inserts/quadratic_bezier_geometry_functions.glsl
index e27402d14..d2e3e0fb7 100644
--- a/manim/renderer/shaders/inserts/quadratic_bezier_geometry_functions.glsl
+++ b/manim/renderer/shaders/inserts/quadratic_bezier_geometry_functions.glsl
@@ -89,4 +89,4 @@ float get_reduced_control_points(in vec3 points[3], out vec3 new_points[3]){
new_points[2] = p0;
return 0.0;
}
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/quadratic_bezier_fill/vert.glsl b/manim/renderer/shaders/quadratic_bezier_fill/vert.glsl
index dab9d2566..ae26c0c8a 100644
--- a/manim/renderer/shaders/quadratic_bezier_fill/vert.glsl
+++ b/manim/renderer/shaders/quadratic_bezier_fill/vert.glsl
@@ -20,4 +20,4 @@ void main(){
v_global_unit_normal = rotate_point_into_frame(unit_normal);
v_color = color;
v_vert_index = vert_index;
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/quadratic_bezier_stroke/frag.glsl b/manim/renderer/shaders/quadratic_bezier_stroke/frag.glsl
index bd7c281fa..430ff2bef 100644
--- a/manim/renderer/shaders/quadratic_bezier_stroke/frag.glsl
+++ b/manim/renderer/shaders/quadratic_bezier_stroke/frag.glsl
@@ -90,4 +90,4 @@ void main() {
frag_color = color;
frag_color.a *= smoothstep(0.5, -0.5, signed_dist / uv_anti_alias_width);
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/quadratic_bezier_stroke/geom.glsl b/manim/renderer/shaders/quadratic_bezier_stroke/geom.glsl
index 8baea0f95..f9cfe303b 100644
--- a/manim/renderer/shaders/quadratic_bezier_stroke/geom.glsl
+++ b/manim/renderer/shaders/quadratic_bezier_stroke/geom.glsl
@@ -269,4 +269,4 @@ void main() {
EmitVertex();
}
EndPrimitive();
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/quadratic_bezier_stroke/vert.glsl b/manim/renderer/shaders/quadratic_bezier_stroke/vert.glsl
index ed702e4ff..fa5e1ea18 100644
--- a/manim/renderer/shaders/quadratic_bezier_stroke/vert.glsl
+++ b/manim/renderer/shaders/quadratic_bezier_stroke/vert.glsl
@@ -31,4 +31,4 @@ void main(){
v_stroke_width = STROKE_WIDTH_CONVERSION * stroke_width;
v_color = color;
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/simple_vert.glsl b/manim/renderer/shaders/simple_vert.glsl
index 79ea59199..acdabc2d9 100644
--- a/manim/renderer/shaders/simple_vert.glsl
+++ b/manim/renderer/shaders/simple_vert.glsl
@@ -10,4 +10,4 @@ in vec3 point;
void main(){
gl_Position = get_gl_Position(position_point_into_frame(point));
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/surface/frag.glsl b/manim/renderer/shaders/surface/frag.glsl
index db9052755..28f3b40d0 100644
--- a/manim/renderer/shaders/surface/frag.glsl
+++ b/manim/renderer/shaders/surface/frag.glsl
@@ -21,4 +21,4 @@ void main() {
gloss,
shadow
);
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/surface/vert.glsl b/manim/renderer/shaders/surface/vert.glsl
index 546c24108..d95c6a528 100644
--- a/manim/renderer/shaders/surface/vert.glsl
+++ b/manim/renderer/shaders/surface/vert.glsl
@@ -20,4 +20,4 @@ void main(){
v_normal = get_rotated_surface_unit_normal_vector(point, du_point, dv_point);
v_color = color;
gl_Position = get_gl_Position(xyz_coords);
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/textured_surface/frag.glsl b/manim/renderer/shaders/textured_surface/frag.glsl
index ab45dad64..22ec2e1de 100644
--- a/manim/renderer/shaders/textured_surface/frag.glsl
+++ b/manim/renderer/shaders/textured_surface/frag.glsl
@@ -39,4 +39,4 @@ void main() {
shadow
);
frag_color.a = v_opacity;
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/textured_surface/vert.glsl b/manim/renderer/shaders/textured_surface/vert.glsl
index d7e08987c..8b54798a2 100644
--- a/manim/renderer/shaders/textured_surface/vert.glsl
+++ b/manim/renderer/shaders/textured_surface/vert.glsl
@@ -23,4 +23,4 @@ void main(){
v_im_coords = im_coords;
v_opacity = opacity;
gl_Position = get_gl_Position(xyz_coords);
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/true_dot/frag.glsl b/manim/renderer/shaders/true_dot/frag.glsl
index a89653595..78fe74c2d 100644
--- a/manim/renderer/shaders/true_dot/frag.glsl
+++ b/manim/renderer/shaders/true_dot/frag.glsl
@@ -31,4 +31,4 @@ void main() {
shadow
);
frag_color.a *= smoothstep(0.5, -0.5, signed_dist / anti_alias_width);
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/true_dot/geom.glsl b/manim/renderer/shaders/true_dot/geom.glsl
index 2a652a35f..221634167 100644
--- a/manim/renderer/shaders/true_dot/geom.glsl
+++ b/manim/renderer/shaders/true_dot/geom.glsl
@@ -40,4 +40,4 @@ void main() {
EmitVertex();
}
EndPrimitive();
-}
\ No newline at end of file
+}
diff --git a/manim/renderer/shaders/true_dot/vert.glsl b/manim/renderer/shaders/true_dot/vert.glsl
index 61d77b89c..0daf70502 100644
--- a/manim/renderer/shaders/true_dot/vert.glsl
+++ b/manim/renderer/shaders/true_dot/vert.glsl
@@ -16,4 +16,4 @@ void main(){
v_point = position_point_into_frame(point);
v_radius = radius;
v_color = color;
-}
\ No newline at end of file
+}