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

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.28 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.29 by root, Tue Dec 25 18:58:32 2007 UTC

       if $cb;
    return if $self->{loading};
    unless ($GL_VERSION) {
-      $self->{was_loaded} = 1;
+      $self->{want_upload} = -1;
       return;
    }
    unless ($self->{name}) {
       # $tw,$th texture
                          $data;
             glPixelZoom 1, 1;
          }
       }
+      if ((my $name = delete $self->{want_upload}) > 0) {
+         $self->{name} = $name;
+      }
       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;
    $self->unload;
 }
 $CFPlus::OpenGL::INIT_HOOK{"CFPlus::Texture"} = sub {
    for (values %TEXTURES) {
-      next unless delete $_->{was_loaded};
+      $_->upload if $_->{want_upload};
-      $_->upload;
    }
 };
 $CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Texture"} = sub {
    for (values %TEXTURES) {
       next unless $_->{name};
-      $_->{was_loaded} = 1;
+      $_->{want_upload} = $_->{name};
       $_->unload;
    }
 };
 1;

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