Skip to content

Commit 43ace41

Browse files
committed
no need to set default material as ::Window already does
1 parent 1dab829 commit 43ace41

1 file changed

Lines changed: 10 additions & 19 deletions

File tree

lib/PDL/Graphics/TriD.pm

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,28 +1034,19 @@ sub get_new_graph {
10341034
}
10351035

10361036
sub get_current_graph {
1037-
my $win = shift;
1038-
my $g = $win->current_viewport()->graph();
1039-
if(!defined $g) {
1040-
$g = PDL::Graphics::TriD::Graph->new;
1041-
$g->default_axes();
1042-
$win->current_viewport()->graph($g);
1043-
}
1044-
return $g;
1037+
my $win = shift;
1038+
my $g = $win->current_viewport()->graph();
1039+
if (!defined $g) {
1040+
$g = PDL::Graphics::TriD::Graph->new;
1041+
$g->default_axes();
1042+
$win->current_viewport()->graph($g);
1043+
}
1044+
$g;
10451045
}
10461046

10471047
sub get_current_window {
1048-
my $opts = shift @_;
1049-
my $win = $PDL::Graphics::TriD::current_window;
1050-
1051-
if(!defined $win) {
1052-
print "get_current_window - creating window...\n" if($PDL::Graphics::TriD::verbose);
1053-
$PDL::Graphics::TriD::current_window = $win = PDL::Graphics::TriD::Window->new($opts);
1054-
1055-
print "get_current_window - calling set_material...\n" if($PDL::Graphics::TriD::verbose);
1056-
$win->set_material(PDL::Graphics::TriD::Material->new);
1057-
}
1058-
return $PDL::Graphics::TriD::current_window;
1048+
print "get_current_window - creating window...\n" if $PDL::Graphics::TriD::verbose and !defined $PDL::Graphics::TriD::current_window;
1049+
$PDL::Graphics::TriD::current_window //= PDL::Graphics::TriD::Window->new(@_);
10591050
}
10601051

10611052
sub twiddle_current { get_current_window()->twiddle() }

0 commit comments

Comments
 (0)