gl_triangles take colours as single param

Author: mohawk2

lib/PDL/Graphics/OpenGLQ.pd

@@ -68,7 +68,12 @@ pp_def(
   @internal
 );
 
-sub TRI { my $par = join '', @_; join ',', map "$par(tri => $_)", 0..2 }
+sub TRI {
+  my ($par, $suffix) = @_;
+  $par .= $suffix if $suffix && !ref $suffix;
+  my $extra_arg = ref $suffix ? "trivert => $$suffix," : '';
+  join ',', map "$par(${extra_arg}tri => $_)", 0..2;
+}
 sub make_tri { shift()."(".TRI(@_).");\n" }
 sub COLOR { make_tri("glColor3f",'$colors',@_) }
 sub VERTEX { make_tri("glVertex3f",'$coords',@_) }
@@ -128,17 +133,17 @@ pp_def(
   GenericTypes => $F,
   Pars => 'coordsa(tri=3); coordsb(tri); coordsc(tri);'.
            ($_->{NormalArgs}//'').
-          'colorsa(tri); colorsb(tri); colorsc(tri);',
+          'colors(tri,trivert=3)',
   Code => '
 glBegin(GL_TRIANGLES);
 broadcastloop %{'.
   ($_->{NormalInit}//"\n").
   ($_->{NormalCodeA}//'').
-  COLOR("a").VERTEX("a").
+  COLOR(\1).VERTEX("a").
   ($_->{NormalCodeB}//'').
-  COLOR("b").VERTEX("b").
+  COLOR(\2).VERTEX("b").
   ($_->{NormalCodeC}//'').
-  COLOR("c").VERTEX("c").'
+  COLOR(\3).VERTEX("c").'
 %}
 glEnd();',
   @internal

lib/PDL/Graphics/TriD/GL.pm

@@ -207,7 +207,7 @@ sub PDL::Graphics::TriD::Lattice::gdraw {
     my $tmpn = $shading <= 2 ? undef : $options->{Smooth}
       ? $this->{VertexNormals}->dice_axis(1,$this->{Faceidx}->flat)
                     ->splitdim(1,$this->{Faceidx}->dim(0)) : $this->{FaceNormals}->dummy(1,3);
-    $f->(map $_->mv(1,-1)->dog, $faces, $shading > 2 ? $tmpn : (), $colours);
+    $f->((map $_->mv(1,-1)->dog, $faces, $shading > 2 ? $tmpn : ()), $colours);
     if ($shading > 2) { glDisable(GL_COLOR_MATERIAL); }
     $this->_lattice_lines($points) if $options->{Lines};
   }
@@ -276,7 +276,7 @@ sub PDL::Graphics::TriD::Trigrid::gdraw {
     ? $this->{VertexNormals}->dice_axis(1,$this->{Faceidx}->flat)
                   ->splitdim(1,$this->{Faceidx}->dim(0)) : $this->{FaceNormals}->dummy(1,3);
   if ($options->{Shading}) { glColorMaterial(GL_FRONT_AND_BACK,GL_DIFFUSE); glEnable(GL_COLOR_MATERIAL); }
-  $f->(map $_->mv(1,-1)->dog, $faces, $options->{Shading} ? $tmpn : (), $colours);
+  $f->((map $_->mv(1,-1)->dog, $faces, $options->{Shading} ? $tmpn : ()), $colours);
   if ($options->{Shading}) { glDisable(GL_COLOR_MATERIAL); }
   if ($options->{ShowNormals}) {
     die "No normals to show!" if !grep defined $this->{$_}, qw(FaceNormals VertexNormals);