replace gl_triangles*_mat with glColorMaterial

Author: mohawk2

lib/PDL/Graphics/OpenGLQ.pd

@@ -74,12 +74,6 @@ sub COLOR { make_tri("glColor3f",'$colors',@_) }
 sub VERTEX { make_tri("glVertex3f",'$coords',@_) }
 sub NORMAL { make_tri("glNormal3f",'$norm',@_) }
 sub RPOS { make_tri("glRasterPos3f",'$coords',@_) }
-sub ADCOLOR { "
-  {
-    GLfloat ad[] = { ".TRI('$colors'.$_[0]).",1.0 };
-    glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE, ad);
-  }
-" }
 
 sub make_func {
   my ($name) = @_;
@@ -121,12 +115,6 @@ pp_def(
   @internal
 );
 
-for my $m (
-{Suf => '_mat',
- Func => \&ADCOLOR},
-{Suf => '',
- Func => \&COLOR},
-) {
 for(
 {Name => 'gl_triangles'},
 {Name => 'gl_triangles_n',
@@ -155,7 +143,7 @@ for(
 # This may be suboptimal but should still be fast enough..
 # We only do triangles with this.
 pp_def(
-	$_->{Name}.$m->{Suf},
+	$_->{Name},
 	GenericTypes => $F,
 	Pars => 'coordsa(tri=3); coordsb(tri); coordsc(tri);'.
 		 ($_->{NormalArgs}//'').
@@ -166,18 +154,17 @@ pp_def(
 		broadcastloop %{'.
 			($_->{NormalInit}//"\n").
 			($_->{NormalCodeA}//'').
-			$m->{Func}->("a").VERTEX("a").
+			COLOR("a").VERTEX("a").
 			($_->{NormalCodeB}//'').
-			$m->{Func}->("b").VERTEX("b").
+			COLOR("b").VERTEX("b").
 			($_->{NormalCodeC}//'').
-			$m->{Func}->("c").VERTEX("c").'
+			COLOR("c").VERTEX("c").'
 		%}
 		glEnd();
 		',
 		@internal
 );
 }
-}
 
 pp_def('gl_arrows',
 	Pars => 'coords(tri=3,n); indx indsa(); indx indsb();',

lib/PDL/Graphics/TriD/GL.pm

@@ -198,9 +198,11 @@ sub PDL::Graphics::TriD::Lattice::gdraw {
   } else {
     glShadeModel($shading == 1 ? GL_FLAT : GL_SMOOTH);
     my $f = 'PDL::gl_triangles';
-    $f .= '_' . ($this->{Options}{Smooth} ? 'w' : '') . 'n_mat' if $shading > 2;
+    $f .= '_' . ($this->{Options}{Smooth} ? 'w' : '') . 'n' if $shading > 2;
     { no strict 'refs'; $f = \&$f; }
+    if ($shading > 2) { glColorMaterial(GL_FRONT_AND_BACK,GL_DIFFUSE); glEnable(GL_COLOR_MATERIAL); }
     _lattice_slice($f, $points, $this->{Options}{Smooth} ? $this->{VertexNormals} : (), $this->{Colors});
+    if ($shading > 2) { glDisable(GL_COLOR_MATERIAL); }
     $this->_lattice_lines($points) if $this->{Options}{Lines};
   }
   if ($this->{Options}{ShowNormals}) {
@@ -252,12 +254,14 @@ sub PDL::Graphics::TriD::Trigrid::gdraw {
   glShadeModel(GL_SMOOTH); # By-vertex doesn't make sense otherwise.
   my $f = 'PDL::gl_triangles';
   my $send_normals = $this->{Options}{Smooth} && $this->{Options}{Shading};
-  $f .= '_' . ($send_normals ? 'w' : '') . 'n_mat' if $this->{Options}{Shading};
+  $f .= '_' . ($send_normals ? 'w' : '') . 'n' if $this->{Options}{Shading};
   { no strict 'refs'; $f = \&$f; }
   my $tmpn = $send_normals
     ? $this->{VertexNormals}->dice_axis(1,$this->{Faceidx}->flat)
                   ->splitdim(1,$this->{Faceidx}->dim(0)) : undef;
+  if ($this->{Options}{Shading}) { glColorMaterial(GL_FRONT_AND_BACK,GL_DIFFUSE); glEnable(GL_COLOR_MATERIAL); }
   $f->(map $_->mv(1,-1)->dog, $faces, $send_normals ? $tmpn : (), $colours);
+  if ($this->{Options}{Shading}) { glDisable(GL_COLOR_MATERIAL); }
   if ($this->{Options}{ShowNormals}) {
     die "No normals to show!" if !grep defined $this->{$_}, qw(FaceNormals VertexNormals);
     if (defined $this->{VertexNormals}) {