Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Added OpenGL compatibility to `ThreeDScene.add_fixed_orientation_mobjects` and `ThreeDScene.add_fixed_in_frame_mobjects` (#2158)

icedcoffeeeea6c4ee4d1a8f
diff --git a/manim/mobject/opengl_mobject.py b/manim/mobject/opengl_mobject.py
index a927be4c8..6a7048f91 100644
--- a/manim/mobject/opengl_mobject.py
+++ b/manim/mobject/opengl_mobject.py
@@ -66,6 +66,8 @@ class OpenGLMobject:
rgbas = _Data()
is_fixed_in_frame = _Uniforms()
+ is_fixed_orientation = _Uniforms()
+ fixed_orientation_center = _Uniforms() # for fixed orientation reference
gloss = _Uniforms()
shadow = _Uniforms()
@@ -85,6 +87,7 @@ class OpenGLMobject:
depth_test=False,
# If true, the mobject will not get rotated according to camera position
is_fixed_in_frame=False,
+ is_fixed_orientation=False,
# Must match in attributes of vert shader
# Event listener
listen_to_events=False,
@@ -109,6 +112,8 @@ class OpenGLMobject:
self.depth_test = depth_test
# If true, the mobject will not get rotated according to camera position
self.is_fixed_in_frame = float(is_fixed_in_frame)
+ self.is_fixed_orientation = float(is_fixed_orientation)
+ self.fixed_orientation_center = (0, 0, 0)
# Must match in attributes of vert shader
# Event listener
self.listen_to_events = listen_to_events
@@ -2349,11 +2354,20 @@ class OpenGLMobject:
self.data[key][:] = func(mobject1.data[key], mobject2.data[key], alpha)
for key in self.uniforms:
- self.uniforms[key] = interpolate(
- mobject1.uniforms[key],
- mobject2.uniforms[key],
- alpha,
- )
+ if key != "fixed_orientation_center":
+ self.uniforms[key] = interpolate(
+ mobject1.uniforms[key],
+ mobject2.uniforms[key],
+ alpha,
+ )
+ else:
+ self.uniforms["fixed_orientation_center"] = tuple(
+ interpolate(
+ np.array(mobject1.uniforms["fixed_orientation_center"]),
+ np.array(mobject2.uniforms["fixed_orientation_center"]),
+ alpha,
+ )
+ )
return self
def pointwise_become_partial(self, mobject, a, b):
@@ -2485,11 +2499,25 @@ class OpenGLMobject:
self.is_fixed_in_frame = 1.0
return self
+ @affects_shader_info_id
+ def fix_orientation(self):
+ self.is_fixed_orientation = 1.0
+ self.fixed_orientation_center = tuple(self.get_center())
+ self.depth_test = True
+ return self
+
@affects_shader_info_id
def unfix_from_frame(self):
self.is_fixed_in_frame = 0.0
return self
+ @affects_shader_info_id
+ def unfix_orientation(self):
+ self.is_fixed_orientation = 0.0
+ self.fixed_orientation_center = (0, 0, 0)
+ self.depth_test = False
+ return self
+
@affects_shader_info_id
def apply_depth_test(self):
self.depth_test = True
diff --git a/manim/mobject/types/opengl_vectorized_mobject.py b/manim/mobject/types/opengl_vectorized_mobject.py
index d45f60b6a..5265a2d89 100644
--- a/manim/mobject/types/opengl_vectorized_mobject.py
+++ b/manim/mobject/types/opengl_vectorized_mobject.py
@@ -1573,6 +1573,8 @@ class OpenGLVMobject(OpenGLMobject):
def get_fill_uniforms(self):
return {
"is_fixed_in_frame": float(self.is_fixed_in_frame),
+ "is_fixed_orientation": float(self.is_fixed_orientation),
+ "fixed_orientation_center": self.fixed_orientation_center,
"gloss": self.gloss,
"shadow": self.shadow,
}
diff --git a/manim/renderer/shaders/include/camera_uniform_declarations.glsl b/manim/renderer/shaders/include/camera_uniform_declarations.glsl
index fdeacab85..fea450300 100644
--- a/manim/renderer/shaders/include/camera_uniform_declarations.glsl
+++ b/manim/renderer/shaders/include/camera_uniform_declarations.glsl
@@ -3,4 +3,6 @@ uniform float anti_alias_width;
uniform vec3 camera_center;
uniform mat3 camera_rotation;
uniform float is_fixed_in_frame;
+uniform float is_fixed_orientation;
+uniform vec3 fixed_orientation_center;
uniform float focal_distance;
diff --git a/manim/renderer/shaders/include/get_gl_Position.glsl b/manim/renderer/shaders/include/get_gl_Position.glsl
index 95d3f054b..9c16c9321 100644
--- a/manim/renderer/shaders/include/get_gl_Position.glsl
+++ b/manim/renderer/shaders/include/get_gl_Position.glsl
@@ -2,6 +2,8 @@
// uniform vec2 frame_shape;
// uniform float focal_distance;
// uniform float is_fixed_in_frame;
+// uniform float is_fixed_orientation;
+// uniform vec3 fixed_orientation_center;
const vec2 DEFAULT_FRAME_SHAPE = vec2(8.0 * 16.0 / 9.0, 8.0);
@@ -23,8 +25,13 @@ vec4 get_gl_Position(vec3 point){
result.z *= 0.01;
}
} else{
- result.x *= 2.0 / DEFAULT_FRAME_SHAPE.x;
- result.y *= 2.0 / DEFAULT_FRAME_SHAPE.y;
+ if (!bool(is_fixed_orientation)){
+ result.x *= 2.0 / DEFAULT_FRAME_SHAPE.x;
+ result.y *= 2.0 / DEFAULT_FRAME_SHAPE.y;
+ } else{
+ result.x *= 2.0 / frame_shape.x;
+ result.y *= 2.0 / frame_shape.y;
+ }
}
result.z *= -1;
return result;
diff --git a/manim/renderer/shaders/include/position_point_into_frame.glsl b/manim/renderer/shaders/include/position_point_into_frame.glsl
index 4cef7e38f..67b5080f5 100644
--- a/manim/renderer/shaders/include/position_point_into_frame.glsl
+++ b/manim/renderer/shaders/include/position_point_into_frame.glsl
@@ -1,5 +1,7 @@
// Assumes the following uniforms exist in the surrounding context:
// uniform float is_fixed_in_frame;
+// uniform float is_fixed_orientation;
+// uniform vec3 fixed_orientation_center;
// uniform vec3 camera_center;
// uniform mat3 camera_rotation;
@@ -15,5 +17,9 @@ vec3 position_point_into_frame(vec3 point){
if(bool(is_fixed_in_frame)){
return point;
}
+ if(bool(is_fixed_orientation)){
+ vec3 new_center = rotate_point_into_frame(fixed_orientation_center);
+ return point + (new_center - fixed_orientation_center);
+ }
return rotate_point_into_frame(point - camera_center);
}
diff --git a/manim/renderer/shaders/quadratic_bezier_fill/geom.glsl b/manim/renderer/shaders/quadratic_bezier_fill/geom.glsl
index eef64b29d..b6a9fceea 100644
--- a/manim/renderer/shaders/quadratic_bezier_fill/geom.glsl
+++ b/manim/renderer/shaders/quadratic_bezier_fill/geom.glsl
@@ -9,6 +9,8 @@ uniform float anti_alias_width;
uniform vec2 frame_shape;
uniform float focal_distance;
uniform float is_fixed_in_frame;
+uniform float is_fixed_orientation;
+uniform vec3 fixed_orientation_center;
// Needed for finalize_color
uniform vec3 light_source_position;
uniform float gloss;
diff --git a/manim/renderer/shaders/quadratic_bezier_stroke/geom.glsl b/manim/renderer/shaders/quadratic_bezier_stroke/geom.glsl
index 30c11fa3b..243314241 100644
--- a/manim/renderer/shaders/quadratic_bezier_stroke/geom.glsl
+++ b/manim/renderer/shaders/quadratic_bezier_stroke/geom.glsl
@@ -7,6 +7,8 @@ layout (triangle_strip, max_vertices = 5) out;
uniform vec2 frame_shape;
uniform float focal_distance;
uniform float is_fixed_in_frame;
+uniform float is_fixed_orientation;
+uniform vec3 fixed_orientation_center;
uniform float anti_alias_width;
uniform float flat_stroke;
diff --git a/manim/renderer/shaders/true_dot/geom.glsl b/manim/renderer/shaders/true_dot/geom.glsl
index 934499cc0..beca4029e 100644
--- a/manim/renderer/shaders/true_dot/geom.glsl
+++ b/manim/renderer/shaders/true_dot/geom.glsl
@@ -7,6 +7,8 @@ layout (triangle_strip, max_vertices = 4) out;
uniform vec2 frame_shape;
uniform float focal_distance;
uniform float is_fixed_in_frame;
+uniform float is_fixed_orientation;
+uniform vec3 fixed_orientation_center;
uniform float anti_alias_width;
in vec3 v_point[1];
diff --git a/manim/scene/three_d_scene.py b/manim/scene/three_d_scene.py
index 6dd879eda..e7c26e3f2 100644
--- a/manim/scene/three_d_scene.py
+++ b/manim/scene/three_d_scene.py
@@ -350,8 +350,14 @@ class ThreeDScene(Scene):
use_static_center_func : bool
center_func : function
"""
- self.add(*mobjects)
- self.renderer.camera.add_fixed_orientation_mobjects(*mobjects, **kwargs)
+ if config.renderer != "opengl":
+ self.add(*mobjects)
+ self.renderer.camera.add_fixed_orientation_mobjects(*mobjects, **kwargs)
+ else:
+ for mob in mobjects:
+ mob: OpenGLMobject
+ mob.fix_orientation()
+ self.add(mob)
def add_fixed_in_frame_mobjects(self, *mobjects):
"""
@@ -365,8 +371,15 @@ class ThreeDScene(Scene):
*mobjects : Mobjects
The Mobjects whose orientation must be fixed.
"""
- self.add(*mobjects)
- self.renderer.camera.add_fixed_in_frame_mobjects(*mobjects)
+ if config.renderer != "opengl":
+ self.add(*mobjects)
+ self.camera: ThreeDCamera
+ self.camera.add_fixed_in_frame_mobjects(*mobjects)
+ else:
+ for mob in mobjects:
+ mob: OpenGLMobject
+ mob.fix_in_frame()
+ self.add(mob)
def remove_fixed_orientation_mobjects(self, *mobjects):
"""
@@ -380,7 +393,13 @@ class ThreeDScene(Scene):
*mobjects : Mobjects
The Mobjects whose orientation must be unfixed.
"""
- self.renderer.camera.remove_fixed_orientation_mobjects(*mobjects)
+ if config.renderer != "opengl":
+ self.renderer.camera.remove_fixed_orientation_mobjects(*mobjects)
+ else:
+ for mob in mobjects:
+ mob: OpenGLMobject
+ mob.unfix_orientation()
+ self.remove(mob)
def remove_fixed_in_frame_mobjects(self, *mobjects):
"""
@@ -393,7 +412,13 @@ class ThreeDScene(Scene):
*mobjects : Mobjects
The Mobjects whose position and orientation must be unfixed.
"""
- self.renderer.camera.remove_fixed_in_frame_mobjects(*mobjects)
+ if config.renderer != "opengl":
+ self.renderer.camera.remove_fixed_in_frame_mobjects(*mobjects)
+ else:
+ for mob in mobjects:
+ mob: OpenGLMobject
+ mob.unfix_from_frame()
+ self.remove(mob)
##
def set_to_default_angled_camera_orientation(self, **kwargs):
diff --git a/tests/test_graphical_units/control_data/opengl/FixedMobjects3D.npz b/tests/test_graphical_units/control_data/opengl/FixedMobjects3D.npz
new file mode 100644
index 000000000..2371dbfae
Binary files /dev/null and b/tests/test_graphical_units/control_data/opengl/FixedMobjects3D.npz differ
diff --git a/tests/test_graphical_units/test_opengl.py b/tests/test_graphical_units/test_opengl.py
index 220157428..6d36f8761 100644
--- a/tests/test_graphical_units/test_opengl.py
+++ b/tests/test_graphical_units/test_opengl.py
@@ -12,3 +12,16 @@ def test_Circle(scene):
circle = Circle().set_color(RED)
scene.add(circle)
scene.wait()
+
+
+@frames_comparison(
+ renderer_class=OpenGLRenderer,
+ renderer="opengl",
+)
+def test_FixedMobjects3D(scene: Scene):
+ scene.renderer.camera.set_euler_angles(phi=75 * DEGREES, theta=-45 * DEGREES)
+ circ = Circle(fill_opacity=1).to_edge(LEFT)
+ square = Square(fill_opacity=1).to_edge(RIGHT)
+ triangle = Triangle(fill_opacity=1).to_corner(UR)
+ [i.fix_orientation() for i in (circ, square)]
+ triangle.fix_in_frame()
diff --git a/tests/test_graphical_units/test_threed.py b/tests/test_graphical_units/test_threed.py
index eb2bd588a..719f0374b 100644
--- a/tests/test_graphical_units/test_threed.py
+++ b/tests/test_graphical_units/test_threed.py
@@ -85,19 +85,6 @@ def test_AmbientCameraMove(scene):
scene.wait()
-# TODO: bring test back after introducing testing tolerance
-# to account for OS-specific differences in numerics.
-
-# class FixedInFrameMObjectTest(ThreeDScene):
-# def construct(scene):
-# axes = ThreeDAxes()
-# scene.set_camera_orientation(phi=75 * DEGREES, theta=-45 * DEGREES)
-# circ = Circle()
-# scene.add_fixed_in_frame_mobjects(circ)
-# circ.to_corner(UL)
-# scene.add(axes)
-
-
@frames_comparison(base_scene=ThreeDScene)
def test_MovingVertices(scene):
scene.set_camera_orientation(phi=75 * DEGREES, theta=30 * DEGREES)