put ::Window fields in Window.pm

Author: mohawk2

demos/tvrml2.p

@@ -45,13 +45,9 @@ $win = PDL::Graphics::TriD::get_current_window();
 require PDL::Graphics::VRML::Protos;
 PDL::Graphics::VRML::Protos->import();
 
+#$win->{Impl}->register_proto(PDL::Graphics::VRML::Protos::PDLBlockText10());
 
-#$win->{VRMLTop}->register_proto(PDL::Graphics::VRML::Protos::PDLBlockText10());
-
-
-#$win->{VRMLTop}->uses('PDLBlockText10');
-
-
+#$win->{Impl}->uses('PDLBlockText10');
 
 #$win->current_viewport()->add_object(PDL::Graphics::TriD::VRMLObject->new(
 #																	  vrn(Transform,

lib/PDL/Graphics/TriD/GL.pm

@@ -768,10 +768,6 @@ use OpenGL::Modern qw/
   GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT
 /;
 
-use base qw/PDL::Graphics::TriD::Object/;
-use fields qw/Ev Width Height Interactive
-              _ViewPorts _CurrentViewPort /;
-
 my @GL_VERSION_NEEDED = (3, 3, 1);
 sub gdriver {
   my($this, $options) = @_;

lib/PDL/Graphics/TriD/VRML.pm

@@ -562,9 +562,7 @@ PDL::Graphics::VRMLNode->import();
 PDL::Graphics::VRMLProto->import();
 use PDL::Core '';  # barf
 
-use base qw/PDL::Graphics::TriD::Object/;
-use fields qw/Width Height Interactive _ViewPorts _CurrentViewPort
-              VRMLTop DefMaterial/;
+use fields qw/DefMaterial/;
 use strict;
 
 $PDL::Graphics::TriD::VRML::fontstyle = $PDL::Graphics::TriD::VRML::fontstyle;
@@ -573,17 +571,17 @@ sub gdriver {
 
   require PDL if not defined $PDL::VERSION;
   $this->{Width} = 300; $this->{Height} = 300;
-  $this->{VRMLTop} = PDL::Graphics::VRML->new("\"PDL::Graphics::TriD::VRML Scene\"",
+  $this->{Impl} = PDL::Graphics::VRML->new("\"PDL::Graphics::TriD::VRML Scene\"",
 				  ["\"generated by the PDL::Graphics::TriD module\"",
 				   "\"version $PDL::VERSION\""]);
   my $fontstyle = PDL::Graphics::VRMLNode->new('FontStyle',
 				    'size' => 0.04,
 				    'family' => "\"SANS\"",
 				    'justify' => "\"MIDDLE\"");
   $PDL::Graphics::TriD::VRML::fontstyle = $fontstyle;
-  $this->{VRMLTop}->add_proto(PDL::Graphics::TriD::SimpleController->new->tovrml);
-  $PDL::Graphics::VRML::current_window = $this->{VRMLTop};
-  $this->{VRMLTop}->register_proto(
+  $this->{Impl}->add_proto(PDL::Graphics::TriD::SimpleController->new->tovrml);
+  $PDL::Graphics::VRML::current_window = $this->{Impl};
+  $this->{Impl}->register_proto(
 	    vrp('TriDGraphText',
 		[fv3f('position',"0 0 0"),
 		 fmstr('text')],
@@ -663,20 +661,20 @@ EOH
     my $vp = $this->current_viewport;
     $vp->tovrml;
     if ($vp->{Transformer}) {
-      $this->{VRMLTop}->addview($vp->{Transformer}->tovrml)
+      $this->{Impl}->addview($vp->{Transformer}->tovrml)
     }
 
-    $this->{VRMLTop}->ensure_protos();
+    $this->{Impl}->ensure_protos();
 
 #    use Data::Dumper;
 #    my $out = Dumper($this->{VRML});
 #    print $out;
 
-    $this->{VRMLTop}->set_vrml($vp->{VRML});
+    $this->{Impl}->set_vrml($vp->{VRML});
     $vrmlparam->vrmlmode();
     local $| = 1;
     print "*********starting output\n";
-    $this->{VRMLTop}->print($vrmlparam->wfile);
+    $this->{Impl}->print($vrmlparam->wfile);
     print "*********finished output\n";
     $vrmlparam->send_to_browser('Home'); #XXX make target selectable
   }

lib/PDL/Graphics/TriD/Window.pm

@@ -6,7 +6,8 @@ package PDL::Graphics::TriD::Window;
 use strict;
 use warnings;
 use PDL::Graphics::TriD::ViewPort;
-use Data::Dumper;
+use base qw(PDL::Graphics::TriD::Object);
+use fields qw(Width Height Interactive _ViewPorts _CurrentViewPort);
 
 $PDL::Graphics::TriD::verbose //= 0;
 our ($DEFAULT_WIDTH, $DEFAULT_HEIGHT) = (600, 600);