[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Texture.pm

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.6 by root, Wed Jun 14 18:59:31 2006 UTC vs.
Revision 1.8 by root, Sat Jun 17 15:07:53 2006 UTC

 }
 sub new_from_image {
    my ($class, $image, %arg) = @_;
-   $class->new (image => $image, %arg)
+   $class->new (image => $image, internalformat => undef, %arg)
 }
 sub new_from_file {
    my ($class, $path, %arg) = @_;
       glMatrixMode GL_MODELVIEW;
       glLoadIdentity;
       $self->{render_cb}->($self, $self->{w}, $self->{h});
    } else {
-      ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
+      ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
          = CFClient::load_image_inline $self->{image};
+      $self->{internalformat} ||= $internalformat;
    }
    my ($tw, $th) = @$self{qw(w h)};
    $self->{minified} ||= [CFClient::average $tw, $th, $data]
       gl_check "copying to texture %dx%d if=%x",
                $tw, $th, $self->{internalformat};
    }
 }
+sub shutdown {
+   my ($self) = @_;
+   glDeleteTexture delete $self->{name}
+      if $self->{name};
+}
 sub DESTROY {
    my ($self) = @_;
    delete $TEXTURES{$self+0};
-   glDeleteTexture delete $self->{name}
+   $self->shutdown;
-      if $self->{name};
 }
 $CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub {
    $_->upload
       for values %TEXTURES;
 };
+$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub {
+   $_->shutdown
+      for values %TEXTURES;
+};
 1;
 =back
 =head1 AUTHOR

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines