A community-maintained Python framework for creating mathematical animations.
Render default Surface
Devin Nealff4eb330336e
diff --git a/manim/mobject/opengl_mobject.py b/manim/mobject/opengl_mobject.pyindex 16f82f22f..f48bb5deb 100644--- a/manim/mobject/opengl_mobject.py+++ b/manim/mobject/opengl_mobject.py@@ -24,12 +24,14 @@ from ..utils.iterables import resize_preserving_orderfrom ..utils.iterables import resize_with_interpolationfrom ..utils.iterables import make_evenfrom ..utils.iterables import listify+from ..utils.iterables import batch_by_propertyfrom ..utils.bezier import interpolatefrom ..utils.paths import straight_pathfrom ..utils.simple_functions import get_parametersfrom ..utils.space_ops import angle_of_vectorfrom ..utils.space_ops import get_normfrom ..utils.space_ops import rotation_matrix_transpose+from ..renderer.shader_wrapper import ShaderWrapperclass OpenGLMobject:@@ -1397,10 +1399,14 @@ class OpenGLMobject:return selfdef get_shader_wrapper(self):- self.shader_wrapper.vert_data = self.get_shader_data()- self.shader_wrapper.vert_indices = self.get_shader_vert_indices()- self.shader_wrapper.uniforms = self.get_shader_uniforms()- self.shader_wrapper.depth_test = self.depth_test+ self.shader_wrapper = ShaderWrapper(+ vert_data=self.get_shader_data(),+ vert_indices=self.get_shader_vert_indices(),+ uniforms = self.get_shader_uniforms(),+ depth_test = self.depth_test,+ render_primitive=self.render_primitive,+ shader_folder=self.shader_folder,+ )return self.shader_wrapperdef get_shader_wrapper_list(self):diff --git a/manim/opengl/__init__.py b/manim/opengl/__init__.pyindex cfa99d0fb..e809bc619 100644--- a/manim/opengl/__init__.py+++ b/manim/opengl/__init__.py@@ -1,3 +1,4 @@from ..mobject.opengl_mobject import *from ..mobject.types.opengl_vectorized_mobject import *from ..mobject.opengl_geometry import *+from ..mobject.types.opengl_surface import *diff --git a/manim/renderer/shader_wrapper.py b/manim/renderer/shader_wrapper.pyindex a7507ed82..106058d4a 100644--- a/manim/renderer/shader_wrapper.py+++ b/manim/renderer/shader_wrapper.py@@ -29,7 +29,7 @@ def find_file(file_name, directories=None):if os.path.exists(path):return pathelse:- logger.info(f"{path} does not exist.")+ logger.debug(f"{path} does not exist.")raise IOError(f"{file_name} not Found")diff --git a/manim/utils/iterables.py b/manim/utils/iterables.pyindex 137ebfd90..c561180b8 100644--- a/manim/utils/iterables.py+++ b/manim/utils/iterables.py@@ -97,6 +97,33 @@ def tuplify(obj):return (obj,)+def batch_by_property(items, property_func):+ """+ Takes in a list, and returns a list of tuples, (batch, prop)+ such that all items in a batch have the same output when+ put into property_func, and such that chaining all these+ batches together would give the original list (i.e. order is+ preserved)+ """+ batch_prop_pairs = []+ curr_batch = []+ curr_prop = None+ for item in items:+ prop = property_func(item)+ if prop != curr_prop:+ # Add current batch+ if len(curr_batch) > 0:+ batch_prop_pairs.append((curr_batch, curr_prop))+ # Redefine curr+ curr_prop = prop+ curr_batch = [item]+ else:+ curr_batch.append(item)+ if len(curr_batch) > 0:+ batch_prop_pairs.append((curr_batch, curr_prop))+ return batch_prop_pairs++def listify(obj):if isinstance(obj, str):return [obj]diff --git a/manim/utils/space_ops.py b/manim/utils/space_ops.pyindex 315c2677f..1d5e7e344 100644--- a/manim/utils/space_ops.py+++ b/manim/utils/space_ops.py@@ -243,6 +243,14 @@ def normalize(vect, fall_back=None):return np.zeros(len(vect))+def normalize_along_axis(array, axis, fall_back=None):+ norms = np.sqrt((array * array).sum(axis))+ norms[norms == 0] = 1+ buffed_norms = np.repeat(norms, array.shape[axis]).reshape(array.shape)+ array /= buffed_norms+ return array++def cross(v1, v2):return np.array([