Render default Surface

Author: eulertour

manim/mobject/opengl_mobject.py

@@ -24,12 +24,14 @@
 from ..utils.iterables import resize_with_interpolation
 from ..utils.iterables import make_even
 from ..utils.iterables import listify
+from ..utils.iterables import batch_by_property
 from ..utils.bezier import interpolate
 from ..utils.paths import straight_path
 from ..utils.simple_functions import get_parameters
 from ..utils.space_ops import angle_of_vector
 from ..utils.space_ops import get_norm
 from ..utils.space_ops import rotation_matrix_transpose
+from ..renderer.shader_wrapper import ShaderWrapper
 
 
 class OpenGLMobject:
@@ -1397,10 +1399,14 @@ def refresh_shader_wrapper_id(self):
         return self
 
     def 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_wrapper
 
     def get_shader_wrapper_list(self):

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 *

manim/renderer/shader_wrapper.py

@@ -29,7 +29,7 @@ def find_file(file_name, directories=None):
         if os.path.exists(path):
             return path
         else:
-            logger.info(f"{path} does not exist.")
+            logger.debug(f"{path} does not exist.")
     raise IOError(f"{file_name} not Found")
 
 

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]

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(
         [