make Trigrid contain Lines instead of draw itself

Author: mohawk2

lib/PDL/Graphics/TriD/GL.pm

@@ -279,9 +279,6 @@ sub PDL::Graphics::TriD::Trigrid::gdraw {
       PDL::gl_lines_col($facearrows,[0.5,0.5,0.5]);
     }
   }
-  if ($options->{Lines}) {
-    PDL::gl_lines_col($faces->dice_axis(1,[0,1,2,0]), [0,0,0]);
-  }
 }
 
 # A special construct which always faces the display and takes the entire window

lib/PDL/Graphics/TriD/Objects.pm

@@ -124,21 +124,27 @@ use base qw/PDL::Graphics::TriD::GObject/;
 use fields qw/Faceidx FaceNormals VertexNormals/;
 sub new {
   my $options = ref($_[-1]) eq 'HASH' ? pop : {};
-  my($type,$points,$faceidx,$colors) = @_;
+  my ($type,$points,$faceidx,$colors) = @_;
   my $this = $type->SUPER::new($points,$colors,$options);
   # faceidx is 2D pdl of indices into points for each face
-  $this->{Faceidx} = $faceidx->ulong;
+  $faceidx = $this->{Faceidx} = $faceidx->ulong;
   $options = $this->{Options};
-  if ($options->{Shading} or $options->{ShowNormals}) {
+  if ($options->{ShowNormals}) {
     my ($fn, $vn) = triangle_normals($this->{Points}, $faceidx);
     $this->{VertexNormals} = $vn if $options->{Smooth} or $options->{ShowNormals};
     $this->{FaceNormals} = $fn if !$options->{Smooth} or $options->{ShowNormals};
   }
   my %less = %$options; delete @less{qw(ShowNormals Lines)};
   $less{Shading} = 3 if $options->{Shading};
   $this->add_object(PDL::Graphics::TriD::Triangles->new($points, $faceidx->clump(1..$faceidx->ndims-1), $colors, \%less));
+  if ($options->{Lines}) {
+    $points = PDL::Graphics::TriD::realcoords($type->r_type,$points);
+    my $faces = $points->dice_axis(1,$this->{Faceidx}->flat)->splitdim(1,3);
+    $this->add_object(PDL::Graphics::TriD::Lines->new($faces->dice_axis(1,[0,1,2,0]), PDL::float(0,0,0)));
+  }
   $this;
 }
+sub r_type { return "";}
 sub get_valid_options { +{
   UseDefcols => 0,
   Lines => 0,