fix ::Lattice with Shading == 1

Author: mohawk2

lib/PDL/Graphics/TriD/GL.pm

@@ -178,7 +178,7 @@ use OpenGL::Modern qw(
   GL_ARRAY_BUFFER GL_ARRAY_BUFFER_BINDING
   GL_ELEMENT_ARRAY_BUFFER GL_ELEMENT_ARRAY_BUFFER_BINDING
   GL_TEXTURE_MIN_FILTER GL_TEXTURE_MAG_FILTER
-  GL_NEAREST GL_CLAMP_TO_EDGE GL_TEXTURE_WRAP_S GL_TEXTURE_WRAP_T
+  GL_LINEAR GL_CLAMP_TO_EDGE GL_TEXTURE_WRAP_S GL_TEXTURE_WRAP_T
   GL_TEXTURE_2D GL_TEXTURE_BINDING_2D
   GL_FLOAT GL_STATIC_DRAW
 );
@@ -219,8 +219,8 @@ sub load_texture {
   # ||= as only need one, even if re-setup
   glBindTexture($target, $this->{Impl}{$idname} ||= glGenTextures_p(1));
   glTexImage2D_c($target, 0, $iformat, $x, $y, 0, $format, $type, $pdl->make_physical->address_data);
-  glTexParameteri($target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-  glTexParameteri($target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri($target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+  glTexParameteri($target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   glTexParameteri($target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri($target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 }

lib/PDL/Graphics/TriD/Objects.pm

@@ -211,13 +211,12 @@ sub new {
       ));
     }
     if ($options->{Shading}) {
-      if ($options->{Smooth}) {
-        $this->{Normals} = $vn;
-      } else {
+      $this->{Normals} = $options->{Smooth} ? $vn : $fn->dummy(1,$idx0)->clump(1,2);
+      if (!$options->{Smooth}) {
         $this->{Points} = $this->{Points}->dice_axis(1,$idxflat);
         my ($cols) = grep defined $this->{$_}, qw(Colors TexCoord);
         $this->{$cols} = $this->{$cols}->dice_axis(1,$idxflat);
-        $this->{Normals} = $fn->dummy(1,$idx0)->clump(1,2);
+        $this->{$cols} = $this->{$cols}->splitdim(1,3)->t->avgover->dummy(1,3)->clump(1,2) if $options->{Shading} == 1;
         $this->{Faceidx} = PDL->sequence(PDL::ulong,$idx0,@idxdims);
       }
     }