GL actually implement materials, set default to GL defaults

Author: mohawk2

lib/PDL/Graphics/TriD/GL.pm

@@ -12,14 +12,15 @@ $PDL::Graphics::TriD::verbose //= 0;
   PDL::Graphics::TriD::Material;
 use OpenGL::Modern qw(
   glMaterialfv_p
-  GL_FRONT_AND_BACK GL_SHININESS GL_SPECULAR GL_AMBIENT GL_DIFFUSE
+  GL_FRONT_AND_BACK GL_SHININESS GL_SPECULAR GL_AMBIENT GL_DIFFUSE GL_EMISSION
 );
 sub togl {
   my $this = shift;
   glMaterialfv_p(GL_FRONT_AND_BACK,GL_SHININESS,$this->{Shine});
   glMaterialfv_p(GL_FRONT_AND_BACK,GL_SPECULAR,@{$this->{Specular}});
   glMaterialfv_p(GL_FRONT_AND_BACK,GL_AMBIENT,@{$this->{Ambient}});
   glMaterialfv_p(GL_FRONT_AND_BACK,GL_DIFFUSE,@{$this->{Diffuse}});
+  glMaterialfv_p(GL_FRONT_AND_BACK,GL_EMISSION,@{$this->{Emission}});
 }
 }
 
@@ -880,6 +881,7 @@ sub display {
       print "VALID1 $vp\n" if $PDL::Graphics::TriD::verbose;
       $vp->{IsValid} = 1;
     }
+    $vp->{DefMaterial}->togl;
     $vp->togl;
     glMatrixMode(GL_MODELVIEW);
     glPopMatrix();

lib/PDL/Graphics/TriD/Logo.pm

@@ -465,12 +465,12 @@ sub new {
   bless {
     Points => $POINTS->copy,
     Index => $FACES->copy,
-    Material => PDL::Graphics::TriD::Material->new(
+    Material => PDL::Graphics::TriD::Material->new({
       Shine => 0.212766,
-      Specular =>[0.753217,0.934416,1],
-      Ambient =>[0,0,0],
-      Diffuse =>[0.09855,0.153113,0.191489],
-      Emissive =>[0, 0, 0]),
+      Specular =>[0.753217,0.934416,1,1],
+      Ambient =>[0,0,0,1],
+      Diffuse =>[0.09855,0.153113,0.191489,1],
+      Emission =>[0, 0, 0, 1]}),
     Pos => $pos // [0,1.2,0],
     Size => $size // 0.1,
   }, $type;

lib/PDL/Graphics/TriD/Objects.pm

@@ -360,13 +360,13 @@ sub new {
 package # hide from PAUSE
   PDL::Graphics::TriD::Material;
 use base qw/PDL::Graphics::TriD::Object/;
-use fields qw(Shine Specular Ambient Diffuse Emissive);
+use fields qw(Shine Specular Ambient Diffuse Emission);
 sub get_valid_options { +{
-  Shine => 40,
-  Specular => [1,1,0.3,0],
-  Ambient => [0.3,1,1,0],
-  Diffuse => [1,0.3,1,0],
-  Emissive => [0,0,0],
+  Shine => 0,
+  Specular => [0,0,0,1],
+  Ambient => [0.2,0.2,0.2,1],
+  Diffuse => [0.8,0.8,0.8,1],
+  Emission => [0,0,0,1],
 }}
 sub new {
   my $options = ref($_[-1]) eq 'HASH' ? pop : $_[0]->get_valid_options;