add gl_line_strip_multi, have Contours use it

Author: mohawk2

lib/PDL/Graphics/OpenGLQ.pd

@@ -98,7 +98,7 @@ sub RPOS { make_tri("glRasterPos3f",'$coords',@_) }
 
 sub make_func {
   my ($name) = @_;
-  for (['_col', ' colors(tri=3,n);', COLOR().VERTEX()]) {
+  for (['_col', ' colors(tri,n);', COLOR().VERTEX()]) {
     pp_def(lc($name).$_->[0],
       GenericTypes => $F,
       Pars => 'coords(tri=3,n);'.$_->[1],
@@ -114,6 +114,22 @@ sub make_func {
 
 make_func($_) for qw(gl_line_strip gl_lines gl_points);
 
+pp_def('gl_line_strip_multi',
+  GenericTypes => $F,
+  Pars => 'coords(tri=3,v); colors(tri,v); uint pathend(n);',
+  Code => '
+PDL_ULong lastend = -1, thisstart = 0, thisend = 0;
+loop(n) %{
+  thisstart = lastend + 1;
+  lastend = thisend = $pathend();
+  glBegin(GL_LINE_STRIP);
+  loop(v=thisstart:thisend) %{'.COLOR().VERTEX().'%}
+  glEnd();
+%}
+  ',
+  @internal
+);
+
 pp_def(
   'gl_texts',
   GenericTypes => $F,

lib/PDL/Graphics/TriD/GL.pm

@@ -186,19 +186,7 @@ sub PDL::Graphics::TriD::Lines::gdraw {
 
 sub PDL::Graphics::TriD::Contours::gdraw {
   my ($this,$points) = @_;
-  my $pi = $this->{PathIndex};
-  my ($pcnt, $i, $thisind) = (0, 0, 0);
-  for my $ie (grep defined, @{$this->{ContourPathIndexEnd}}) {
-    my $colors = $this->{Colors};
-    $colors = $colors->slice(":,($i)") if $colors->getndims==2;
-    my $this_pi = $pi->slice("$pcnt:$ie");
-    for ($this_pi->list) {
-      PDL::gl_line_strip_col($points->slice(",$thisind:$_"), $colors);
-      $thisind = $_ + 1;
-    }
-    $i++;
-    $pcnt=$ie+1;
-  }
+  PDL::gl_line_strip_multi($points, $this->{Colors}, $this->{PathIndex});
 }
 
 # A special construct which always faces the display and takes the entire window