Refactor arc drawing

shader/twoD/arc.frag

@@ -1,17 +1,12 @@
 #version 430 core
-in vec4 gColor;
-in float gRadIn;
-in vec2 angles;
-in vec2 dist;
+in vec4 vColor;
+in vec3 vparams;
+
 out vec4 fColor;
 
 void main()
 {
-  float sa = angles.x;
-  vec2 sv = vec2 (-sin(sa), cos(sa));
-  float ea = angles.y;
-  vec2 ev = vec2 (-sin(ea), cos(ea));
-  float d = (dist.x * dist.x) + (dist.y * dist.y);
-  if (d > 1 || d < gRadIn || dot(sv, dist) < 0 || dot(ev, dist) > 0) {discard;}
-  fColor = gColor;
+  float d = dot(vec2(vparams.xy),vec2(vparams.xy));
+  if ( d > 1 || d < vparams.z ) {discard;}
+  fColor = vColor;
 }

shader/twoD/arc.vert

@@ -1,15 +1,15 @@
 #version 430 core
 layout (location = 0) in vec3 position;
 layout (location = 1) in vec4 color;
-layout (location = 2) in vec4 saEaRadWdth;
+layout (location = 2) in vec3 boxXboxYwidth;
 out vec4 vColor;
-out vec4 vparams;
+out vec3 vparams;
 
 uniform mat4 worldMat;
 
 void main()
 {
-  gl_Position = vec4(position.xyz,1);
+  gl_Position = worldMat * vec4(position.xyz,1);
   vColor = color;
-  vparams = saEaRadWdth;
+  vparams = boxXboxYwidth;
 }