::Image add FullScreen option

Author: mohawk2

lib/PDL/Graphics/TriD.pm

@@ -795,13 +795,13 @@ sub realcoords {
 }
 
 sub checkargs {
-	if(ref $_[$#_] eq "HASH" and $PDL::Graphics::TriD::verbose) {
+	if(ref $_[-1] eq "HASH" and $PDL::Graphics::TriD::verbose) {
 
 	  print "enter checkargs \n";
 		for(['KeepTwiddling',\&keeptwiddling3d]) {
 		  print "checkargs >$_<\n";
-			if(defined $_[$#_]{$_->[0]}) {
-				&{$_->[1]}(delete $_[$#_]{$_->[0]});
+			if(defined $_[-1]{$_->[0]}) {
+				&{$_->[1]}(delete $_[-1]{$_->[0]});
 			}
 		}
 	}
@@ -855,13 +855,15 @@ sub PDL::describe3d {
 
 *imagrgb=*imagrgb=\&PDL::imagrgb;
 sub PDL::imagrgb {
-	require PDL::Graphics::TriD::Image;
-	my (@data) = @_; &checkargs;
-	my $win = PDL::Graphics::TriD::get_current_window();
-	my $imag = PDL::Graphics::TriD::Image->new(@data);
-	$win->clear_viewports();
-	$win->current_viewport()->add_object($imag);
-	$win->twiddle();
+  require PDL::Graphics::TriD::Image;
+  my ($color, $opts) = @_; &checkargs;
+  my $win = PDL::Graphics::TriD::get_current_window();
+  $opts //= {};
+  $opts->{FullScreen} = 1;
+  my $imag = PDL::Graphics::TriD::Image->new($color, $opts);
+  $win->clear_viewports();
+  $win->current_viewport()->add_object($imag);
+  $win->twiddle();
 }
 
 # Plotting routines that use the 3D graph

lib/PDL/Graphics/TriD/GL.pm

@@ -402,11 +402,13 @@ sub PDL::Graphics::TriD::STrigrid::gdraw {
 
 sub PDL::Graphics::TriD::Image::togl {
 # A special construct which always faces the display and takes the entire window
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  glOrtho(0,1,0,1,-1,1);
+  if ($_[0]{Options}{FullScreen}) {
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(0,1,0,1,-1,1);
+  }
   goto &PDL::Graphics::TriD::GObject::togl;
 }
 

lib/PDL/Graphics/TriD/Image.pm

@@ -25,7 +25,7 @@ sub new {
 	my $im = PDL::Graphics::TriD::realcoords('COLOR',$color);
 	my $this = {
 		Im => $im,
-		Opts => $opts,
+		Options => $opts,
 		Points => $defaultvert,
 	};
 	if(defined $opts->{Points}) {
@@ -99,8 +99,8 @@ sub flatten {
 	my $p = PDL->zeroes(PDL::float(),3,$xxd,$yyd);
 
 
-	if(defined $this->{Opts}{Bg}) {
-		$p .= $this->{Opts}{Bg};
+	if(defined $this->{Options}{Bg}) {
+		$p .= $this->{Options}{Bg};
 	}
 
 #	print "MKFOOP\n";