From 8d277af47c8d3c514f34360e463e71975e5af4b0 Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Mon, 16 Jan 2023 21:46:43 -0800 Subject: [PATCH] Go back the convention of positioning stroke vertices in space before geom shader --- manimlib/shaders/quadratic_bezier_stroke/geom.glsl | 2 +- manimlib/shaders/quadratic_bezier_stroke/vert.glsl | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/manimlib/shaders/quadratic_bezier_stroke/geom.glsl b/manimlib/shaders/quadratic_bezier_stroke/geom.glsl index f290710b..e55bc162 100644 --- a/manimlib/shaders/quadratic_bezier_stroke/geom.glsl +++ b/manimlib/shaders/quadratic_bezier_stroke/geom.glsl @@ -179,7 +179,7 @@ void main() { corners[i], unit_normal ); - gl_Position = get_gl_Position(position_point_into_frame(corners[i])); + gl_Position = get_gl_Position(corners[i]); EmitVertex(); } EndPrimitive(); diff --git a/manimlib/shaders/quadratic_bezier_stroke/vert.glsl b/manimlib/shaders/quadratic_bezier_stroke/vert.glsl index 613edb15..d44a4b47 100644 --- a/manimlib/shaders/quadratic_bezier_stroke/vert.glsl +++ b/manimlib/shaders/quadratic_bezier_stroke/vert.glsl @@ -1,10 +1,9 @@ #version 330 -uniform vec2 frame_shape; - in vec3 point; in vec4 stroke_rgba; in float stroke_width; +in vec3 joint_normal; in float joint_angle; // Bezier control point @@ -17,8 +16,10 @@ out float v_vert_index; const float STROKE_WIDTH_CONVERSION = 0.01; +#INSERT get_gl_Position.glsl + void main(){ - verts = point; + verts = position_point_into_frame(point); v_stroke_width = STROKE_WIDTH_CONVERSION * stroke_width * frame_shape[1] / 8.0; v_joint_angle = joint_angle; v_color = stroke_rgba;