X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fshaders%2Fbezier_texbuf_geom.glsl;h=281627d732a0b2b5297b0c1ca9d4f82bfcde8ad6;hp=bb9a21947a793faf539de2f2e8ccfe7dd98e22ed;hb=dfd021b1505fb3924ae103d8aa27c6200d6ec3fd;hpb=b3c2d3472c3b3d77eae0f66731a32b852dce11f0 diff --git a/src/shaders/bezier_texbuf_geom.glsl b/src/shaders/bezier_texbuf_geom.glsl index bb9a219..281627d 100644 --- a/src/shaders/bezier_texbuf_geom.glsl +++ b/src/shaders/bezier_texbuf_geom.glsl @@ -19,9 +19,11 @@ void main() { int bezierid = texelFetch(bezier_id_buffer_texture, objectid[0]).r; vec2 boundssize = gl_in[1].gl_Position.xy - gl_in[0].gl_Position.xy; - vec2 coeff0 = texelFetch(bezier_buffer_texture, bezierid*3).rg; - vec2 coeff1 = texelFetch(bezier_buffer_texture, bezierid*3+1).rg; - vec2 coeff2 = texelFetch(bezier_buffer_texture, bezierid*3+2).rg; + vec2 coeff0 = texelFetch(bezier_buffer_texture, bezierid*4).rg; + vec2 coeff1 = texelFetch(bezier_buffer_texture, bezierid*4+1).rg; + vec2 coeff2 = texelFetch(bezier_buffer_texture, bezierid*4+2).rg; + vec2 coeff3 = texelFetch(bezier_buffer_texture, bezierid*4+3).rg; + vec2 boundspxsize = pixsize[0]; int blen = clamp(int(abs(boundspxsize.x)),2,100); float invblen = 1.0f/float(blen); @@ -29,10 +31,11 @@ void main() { float t = i * invblen; float oneminust = 1.0f - t; - float bernstein0 = t*t; - float bernstein1 = 2*t*oneminust; - float bernstein2 = oneminust*oneminust; - gl_Position = vec4((coeff0*bernstein0 + coeff1*bernstein1 + coeff2*bernstein2) * boundssize + gl_in[0].gl_Position.xy, 0.0, 1.0); + float bernstein0 = t*t*t; + float bernstein1 = 3*t*t*oneminust; + float bernstein2 = 3*t*oneminust*oneminust; + float bernstein3 = oneminust*oneminust*oneminust; + gl_Position = vec4((coeff0*bernstein0 + coeff1*bernstein1 + coeff2*bernstein2 + coeff3*bernstein3) * boundssize + gl_in[0].gl_Position.xy, 0.0, 1.0); EmitVertex(); }