--- deliantra/Deliantra-Client/DC/Texture.pm	2006/05/26 18:28:23	1.1
+++ deliantra/Deliantra-Client/DC/Texture.pm	2006/06/17 15:48:59	1.9
@@ -42,7 +42,7 @@
 sub new_from_image {
    my ($class, $image, %arg) = @_;
 
-   $class->new (image => $image, %arg)
+   $class->new (image => $image, internalformat => undef, %arg)
 }
 
 sub new_from_file {
@@ -89,10 +89,6 @@
    $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
 }
 
-sub topot {
-   (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
-}
-
 sub upload {
    my ($self) = @_;
 
@@ -113,32 +109,18 @@
       $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)};
 
-   unless ($tw > 0 && $th > 0) {
-      $tw = $th = 1;
-      $data = "\x00" x 64;
-   }
-
-   $self->{minified} = [CFClient::average $tw, $th, $data]
+   $self->{minified} ||= [CFClient::average $tw, $th, $data]
       if $self->{minify};
 
-   unless ($GL_NPOT) {
-      # TODO: does not work for zero-sized textures
-      $tw = topot $tw;
-      $th = topot $th;
-
-      if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
-         my $bpp = (length $data) / ($self->{w} * $self->{h});
-         $data = pack "(a" . ($tw * $bpp) . ")*",
-                    unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
-         $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
-      }
-   }
+   pad2pot $data, $tw, $th unless $GL_NPOT;
 
    $self->{s} = $self->{w} / $tw;
    $self->{t} = $self->{h} / $th;
@@ -147,14 +129,18 @@
 
    glBindTexture GL_TEXTURE_2D, $self->{name};
 
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
+   if ($self->{wrap}) {
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
+   } else {
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
+   }
 
    if ($::FAST) {
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
    } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
-      # alternatively check for 0x8191
       glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
@@ -177,6 +163,7 @@
       gl_check "uploading texture %dx%d if=%x f=%x t=%x",
                $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
    } else {
+      exists $self->{render_cb} or die;
       glCopyTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
                    0, 0,
@@ -185,24 +172,36 @@
       gl_check "copying to texture %dx%d if=%x",
                $tw, $th, $self->{internalformat};
    }
-
-   glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
 }
 
+sub shutdown {
+   my ($self) = @_;
+
+   glDeleteTexture $self->{name}
+      if $self->{name};
+} 
+
 sub DESTROY {
    my ($self) = @_;
 
    delete $TEXTURES{$self+0};
 
-   glDeleteTexture delete $self->{name}
-      if $self->{name};
+   $self->shutdown;
 }
 
 $CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub {
+   # first mark all existing texture names as in-use, in case the context lost textures
+   glBindTexture GL_TEXTURE_2D, $_->{name}
+      for values %TEXTURES;
    $_->upload
       for values %TEXTURES;
 };
 
+$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub {
+   $_->shutdown
+      for values %TEXTURES;
+};
+
 1;
 
 =back