public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-04-13 09:47:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed how focal_distance works

Browse source
This commit is contained in:
Grant Sanderson 2020-06-09 17:12:52 -07:00
parent 3e913b6649
commit 7c4874bdad
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manimlib/camera/camera.py
View file

@ -30,7 +30,7 @@ class CameraFrame(Mobject):
"center_point": ORIGIN, "center_point": ORIGIN,
# Theta, phi, gamma # Theta, phi, gamma
"euler_angles": [0, 0, 0], "euler_angles": [0, 0, 0],
"focal_distance": 5, "focal_distance": 3,
} }
def init_points(self): def init_points(self):

18
manimlib/shaders/get_gl_Position.glsl
View file

@ -3,22 +3,24 @@
// uniform float focal_distance; // uniform float focal_distance;
// uniform float is_fixed_in_frame; // uniform float is_fixed_in_frame;
const vec2 DEFAULT_FRAME_SHAPE = vec2(8 * 16 / 9, 8); const vec2 DEFAULT_FRAME_SHAPE = vec2(8.0 * 16.0 / 9.0, 8.0);
vec4 get_gl_Position(vec3 point){ vec4 get_gl_Position(vec3 point){
vec4 result = vec4(point, 1); vec4 result = vec4(point, 1.0);
if(!bool(is_fixed_in_frame)){ if(!bool(is_fixed_in_frame)){
result.x *= 2 / frame_shape.x; result.x *= 2.0 / frame_shape.x;
result.y *= 2 / frame_shape.y; result.y *= 2.0 / frame_shape.y;
result.z *= 2.0 / frame_shape.y; // Should we give the frame a z shape? Does that make sense?
result.z /= focal_distance; result.z /= focal_distance;
result.xy /= max(1 - point.z, 0); result.xy /= max(1.0 - result.z, 0.0);
// Todo, does this discontinuity add weirdness? Theoretically, by this point, // Todo, does this discontinuity add weirdness? Theoretically, by this result,
// the z-coordiante of gl_Position only matter for z-indexing. The reason // the z-coordiante of gl_Position only matter for z-indexing. The reason
// for thie line is to avoid agressive clipping of distant points. // for thie line is to avoid agressive clipping of distant points.
if(result.z < 0) result.z *= 0.1; if(result.z < 0) result.z *= 0.1;
} else{ } else{
result.x *= 2 / DEFAULT_FRAME_SHAPE.x; result.x *= 2.0 / DEFAULT_FRAME_SHAPE.x;
result.y *= 2 / DEFAULT_FRAME_SHAPE.y; result.y *= 2.0 / DEFAULT_FRAME_SHAPE.y;
} }
result.z *= -1;
return result; return result;
} }