--- deliantra/Deliantra-Client/DC/Texture.pm	2007/07/19 23:29:17	1.21
+++ deliantra/Deliantra-Client/DC/Texture.pm	2007/08/28 01:23:47	1.28
@@ -34,7 +34,8 @@
 
    CFPlus::weaken ($TEXTURES{$self+0} = $self);
 
-   $self->upload;
+   $self->upload
+      unless delete $self->{delay};
 
    $self
 }
@@ -42,9 +43,13 @@
 sub new_from_image {
    my ($class, $image, %arg) = @_;
 
+   Carp::confess "tried to create texture from undefined image"
+      unless defined $image;
+
    $class->new (image => $image, internalformat => undef, %arg)
 }
 
+
 sub new_from_file {
    my ($class, $path, %arg) = @_;
 
@@ -89,161 +94,222 @@
    $class->new (w => $w || 1, h => $h || 1, render_cb => $cb, nearest => 1)
 }
 
-sub upload {
-   my ($self) = @_;
+sub loading_done($$) {
+   my ($self, $data) = @_;
 
-   return unless $GL_VERSION;
+   delete $self->{loading};
+   ++$self->{delete_image};
+   $self->{image} = $data;
+   $self->upload;
+}
 
-   # $tw,$th texture
-   # $rw,$rh rendered/used size
-   # $dw,$dh $data
+sub upload {
+   my ($self, $cb) = @_;
 
-   my ($data, $dw, $dh);
+   push @{ $self->{upload_done} }, $cb
+      if $cb;
 
-   if (exists $self->{data}) {
-      $data = $self->{data};
-      ($dw, $dh) = @$self{qw(w h)};
+   return if $self->{loading};
 
-   } elsif (exists $self->{render_cb}) {
-      ($dw, $dh) = @$self{qw(w h)};
+   unless ($GL_VERSION) {
+      $self->{was_loaded} = 1;
+      return;
+   }
 
-   } else {
-      ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
-         = CFPlus::load_image_inline $self->{image};
+   unless ($self->{name}) {
+      # $tw,$th texture
+      # $rw,$rh rendered/used size
+      # $dw,$dh $data
+
+      my ($data, $dw, $dh);
+
+      if (defined $self->{data}) {
+         $data = $self->{data};
+         ($dw, $dh) = @$self{qw(w h)};
+
+      } elsif ($self->{render_cb}) {
+         ($dw, $dh) = @$self{qw(w h)};
+
+      } elsif (defined $self->{image}) {
+         ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
+            = CFPlus::load_image_inline $self->{image};
+
+         $self->{internalformat} ||= $internalformat;
+         ($dw, $dh) = @$self{qw(w h)};
+         
+         delete $self->{image} if delete $self->{delete_image};
+
+      } elsif (defined $self->{tile}) {
+         ++$self->{loading};
+         return CFPlus::DB::get tilecache => $self->{tile}, sub {
+            $self->loading_done ($_[0]);
+         };
+
+      } elsif (defined $self->{path}) {
+         ++$self->{loading};
+         return CFPlus::DB::read_file $self->{path}, sub {
+            $self->loading_done ($_[0]);
+         };
 
-      $self->{internalformat} ||= $internalformat;
-      ($dw, $dh) = @$self{qw(w h)};
-   }
+      } else {
+         Carp::confess "tried to create texture that is not data, render or image";
+      }
 
-   my ($tw, $th) = ($dw, $dh);
+      my ($tw, $th) = ($dw, $dh);
 
-   defined $data or $self->{render_cb} or die; # some sanity check
+      defined $data or $self->{render_cb} or die; # some sanity check
 
-   $self->{minified} ||= [CFPlus::average $dw, $dh, $data]
-      if $self->{minify};
+      $self->{minified} ||= [CFPlus::average $dw, $dh, $data]
+         if $self->{minify};
 
-   # against rather broken cards we enforce a maximum texture size
-   $tw = min $MAX_W, minpot $tw;
-   $th = min $MAX_H, minpot $th;
+      # against rather broken cards we enforce a maximum texture size
+      $tw = min $MAX_W, $tw;
+      $th = min $MAX_H, $th;
 
-   # if only pot-textures are allowed, pot'ify tw/th
-   unless ($GL_NPOT && 0) {#d#
-      $tw = minpot $tw;
-      $th = minpot $th;
-   }
+      # if only pot-textures are allowed, pot'ify tw/th
+      unless ($GL_NPOT) {
+         $tw = CFPlus::minpot $tw;
+         $th = CFPlus::minpot $th;
+      }
 
-   # now further decrease texture size until the
-   # card does accept it
-   while (!texture_valid_2d $self->{internalformat}, $tw, $th, $self->{format}, $self->{type}) {
-      # quarter the texture size
-      $tw >>= 1;
-      $th >>= 1;
-   }
+      # now further decrease texture size until the
+      # card does accept it
+      while (!texture_valid_2d $self->{internalformat}, $tw, $th, $self->{format}, $self->{type}) {
+         # quarter the texture size
+         $tw >>= 1;
+         $th >>= 1;
+      }
+
+      # decide the amount of space used in the texture
+      my ($rw, $rh);
+      my ($ox, $oy); # area shift to lessen effetc of buggy opengl implementations (nvida, ati)
+      my $render;
 
-   # decide the amount of space used in the texture
-   my ($rw, $rh);
-   my $render;
-
-   if ($self->{render_cb}) {
-      # use only part of the texture
-      #$rw >>= 1 while $rw > $tw;
-      #$rh >>= 1 while $rh > $th;
-      $rw = min $dw, $tw;
-      $rh = min $dh, $th;
-      ++$render;
-   } else {
-      if ($self->{wrap} || $tw < $dw || $th < $dh) {
-         # scale to the full texture size
-         ($rw, $rh) = ($tw, $th);
+      if ($self->{render_cb}) {
+         # use only part of the texture
+         #$rw >>= 1 while $rw > $tw;
+         #$rh >>= 1 while $rh > $th;
+         $rw = min $dw, $tw;
+         $rh = min $dh, $th;
          ++$render;
       } else {
-         # pad
-         pad $data, $dw, $dh, $tw, $th;
-         ($rw, $rh) = ($dw, $dh);
-         ($dw, $dh) = ($tw, $th);
+         if ($self->{wrap} || $tw < $dw || $th < $dh) {
+            # scale to the full texture size
+            ($rw, $rh) = ($tw, $th);
+            ++$render;
+         } else {
+            # pad
+            pad $data, $dw, $dh, $tw, $th;
+            ($rw, $rh) = ($dw, $dh);
+            ($dw, $dh) = ($tw, $th);
+         }
       }
-   }
 
-   if ($render) {
-      glViewport 0, 0, $tw, $th;
-      #glScissor 0, 0, $tw, $th;
-      #glEnable GL_SCISSOR_TEST;
-      glMatrixMode GL_PROJECTION;
-      glLoadIdentity;
-      glOrtho 0, $tw, 0, $th, -10000, 10000;
-      glMatrixMode GL_MODELVIEW;
-      glLoadIdentity;
+      if ($render) {
+         $ox = int .5 * ($::WIDTH  - $rw);
+         $oy = int .5 * ($::HEIGHT - $rh);
+
+         glViewport $ox, $oy, $tw, $th;
+         #glScissor 0, 0, $tw, $th;
+         #glEnable GL_SCISSOR_TEST;
+         glMatrixMode GL_PROJECTION;
+         glLoadIdentity;
+         glOrtho 0, $tw, 0, $th, -10000, 10000;
+         glMatrixMode GL_MODELVIEW;
+         glLoadIdentity;
+
+         if ($self->{render_cb}) {
+            glScale $rw / $dw, $rh / $dh;
+            $self->{render_cb}->($self, $rw, $rh);
+         } else {
+            glClearColor 0, 0, 0, 0;
+            glClear GL_COLOR_BUFFER_BIT;
+            glPixelZoom $tw / $dw, $th / $dh;
+            glRasterPos 0, 0;
+            glDrawPixels $dw, $dh,
+                         $self->{format},
+                         $self->{type},
+                         $data;
+            glPixelZoom 1, 1;
+         }
+      }
 
-      if ($self->{render_cb}) {
-         glScale $rw / $dw, $rh / $dh;
-         $self->{render_cb}->($self, $rw, $rh);
+      glBindTexture GL_TEXTURE_2D, $self->{name} ||= glGenTexture;
+
+      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 || $self->{nearest}) {
+         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) {
+         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;
+      } else {
+         glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
+         glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
+         glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
+      }
+      
+      glGetError;
+
+      if ($render) {
+         glCopyTexImage2D GL_TEXTURE_2D, 0,
+                      $self->{internalformat},
+                      $ox, $oy,
+                      $tw, $th,
+                      0;
+         gl_check "copying to texture %dx%d if=%x",
+                  $tw, $th, $self->{internalformat};
+
+         #glDisable GL_SCISSOR_TEST;
       } else {
-         glClearColor 0, 0, 0, 0;
-         glClear GL_COLOR_BUFFER_BIT;
-         glPixelZoom $tw / $dw, $th / $dh;
-         glDrawPixels $dw, $dh,
+         my $if = $self->{internalformat};
+
+         if ($GL_COMPRESS && $::CFG->{texture_compression}) {
+            if ($if == GL_RGB) {
+               $if = GL_COMPRESSED_RGB_ARB;
+            } elsif ($if == GL_RGBA) {
+               $if = GL_COMPRESSED_RGBA_ARB;
+            }
+         }
+
+         glTexImage2D GL_TEXTURE_2D, 0,
+                      $if,
+                      $dw, $dh,
+                      0,
                       $self->{format},
                       $self->{type},
                       $data;
-         glPixelZoom 1, 1;
+         gl_check "uploading texture %dx%d if=%x f=%x t=%x",
+                  $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
       }
-   }
 
-   glBindTexture GL_TEXTURE_2D, $self->{name} ||= glGenTexture;
+      $self->{s} = $rw / $tw;
+      $self->{t} = $rh / $th;
 
-   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 || $self->{nearest}) {
-      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) {
-      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;
-   } else {
-      glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
-      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
-      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
-   }
-   
-   glGetError;
-
-   if ($render) {
-      glCopyTexImage2D GL_TEXTURE_2D, 0,
-                   $self->{internalformat},
-                   0, 0,
-                   $tw, $th,
-                   0;
-      gl_check "copying to texture %dx%d if=%x",
-               $tw, $th, $self->{internalformat};
-
-      #glDisable GL_SCISSOR_TEST;
-   } else {
-      glTexImage2D GL_TEXTURE_2D, 0,
-                   $self->{internalformat},
-                   $dw, $dh,
-                   0,
-                   $self->{format},
-                   $self->{type},
-                   $data;
-      gl_check "uploading texture %dx%d if=%x f=%x t=%x",
-               $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
+      if ($self->{tile}) {
+         $::MAP->set_texture ($self->{tile}, @$self{qw(name w h s t)}, @{$self->{minified}})
+            if $::MAP;
+         $::MAPWIDGET->update
+            if $::MAPWIDGET;
+      }
    }
 
-   $self->{s} = $rw / $tw;
-   $self->{t} = $rh / $th;
+   $_->($self)
+      for @{ (delete $self->{upload_done}) || [] };
 }
 
-sub shutdown {
+sub unload {
    my ($self) = @_;
 
-   glDeleteTexture $self->{name}
+   glDeleteTexture delete $self->{name}
       if $self->{name};
 } 
 
@@ -252,20 +318,22 @@
 
    delete $TEXTURES{$self+0};
 
-   $self->shutdown;
+   $self->unload;
 }
 
 $CFPlus::OpenGL::INIT_HOOK{"CFPlus::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;
+   for (values %TEXTURES) {
+      next unless delete $_->{was_loaded};
+      $_->upload;
+   }
 };
 
 $CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Texture"} = sub {
-   $_->shutdown
-      for values %TEXTURES;
+   for (values %TEXTURES) {
+      next unless $_->{name};
+      $_->{was_loaded} = 1;
+      $_->unload;
+   }
 };
 
 1;