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

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.15 by root, Tue Jul 17 16:02:14 2007 UTC vs.
Revision 1.24 by root, Sun Jul 29 03:58:26 2007 UTC

    $self
 }
 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 {
 sub upload {
    my ($self) = @_;
    return unless $GL_VERSION;
-   my ($tw, $th, $data);
+   # $tw,$th texture
+   # $rw,$rh rendered/used size
+   # $dw,$dh $data
+   my ($data, $dw, $dh);
    if (exists $self->{data}) {
       $data = $self->{data};
-      ($tw, $th) = @$self{qw(w h)};
+      ($dw, $dh) = @$self{qw(w h)};
    } elsif (exists $self->{render_cb}) {
-      ($tw, $th) = @$self{qw(w h)};
+      ($dw, $dh) = @$self{qw(w h)};
-   } else {
+   } elsif (exists $self->{image}) {
       ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
          = CFPlus::load_image_inline $self->{image};
       $self->{internalformat} ||= $internalformat;
-      ($tw, $th) = @$self{qw(w h)};
+      ($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);
    defined $data or $self->{render_cb} or die; # some sanity check
-   $self->{minified} ||= [CFPlus::average $tw, $th, $data]
+   $self->{minified} ||= [CFPlus::average $dw, $dh, $data]
       if $self->{minify};
-   pad2pot $data, $tw, $th unless $GL_NPOT;
+   # against rather broken cards we enforce a maximum texture size
-   $tw = min $MAX_W, $tw;
+   $tw = min $MAX_W, minpot $tw;
-   $th = min $MAX_H, $th;
+   $th = min $MAX_H, minpot $th;
+   # if only pot-textures are allowed, pot'ify tw/th
+   unless ($GL_NPOT && 0) {#d#
+      $tw = minpot $tw;
+      $th = minpot $th;
+   }
-   # now further decrease texture size
+   # 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;
    }
-   my $render = $self->{render_cb} || $tw < $self->{w} || $th < $self->{h};
+   # 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;
+   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);
+         ++$render;
+      } else {
+         # pad
+         pad $data, $dw, $dh, $tw, $th;
+         ($rw, $rh) = ($dw, $dh);
+         ($dw, $dh) = ($tw, $th);
+      }
+   }
    if ($render) {
+      $ox = int .5 * ($::WIDTH  - $rw);
+      $oy = int .5 * ($::HEIGHT - $rh);
-      glViewport 0, 0, $tw, $th;
+      glViewport $ox, $oy, $tw, $th;
+      #glScissor 0, 0, $tw, $th;
+      #glEnable GL_SCISSOR_TEST;
       glMatrixMode GL_PROJECTION;
       glLoadIdentity;
-      glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
+      glOrtho 0, $tw, 0, $th, -10000, 10000;
       glMatrixMode GL_MODELVIEW;
       glLoadIdentity;
       if ($self->{render_cb}) {
+         glScale $rw / $dw, $rh / $dh;
-         $self->{render_cb}->($self, $self->{w}, $self->{h});
+         $self->{render_cb}->($self, $rw, $rh);
       } else {
+         glClearColor 0, 0, 0, 0;
+         glClear GL_COLOR_BUFFER_BIT;
-         glPixelZoom $tw / $self->{w}, $th / $self->{h};
+         glPixelZoom $tw / $dw, $th / $dh;
+         glRasterPos 0, 0;
-         glDrawPixels $self->{w}, $self->{h},
+         glDrawPixels $dw, $dh,
                       $self->{format},
                       $self->{type},
                       $data;
          glPixelZoom 1, 1;
       }
    glGetError;
    if ($render) {
       glCopyTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
-                   0, 0,
+                   $ox, $oy,
                    $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},
-                   $tw, $th,
+                   $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};
    }
-   $self->{s} = min 1, $self->{w} / $tw;
+   $self->{s} = $rw / $tw;
-   $self->{t} = min 1, $self->{h} / $th;
+   $self->{t} = $rh / $th;
 }
 sub shutdown {
    my ($self) = @_;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents): Revision 1.15 by root, Tue Jul 17 16:02:14 2007 UTC vs. Revision 1.24 by root, Sun Jul 29 03:58:26 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.15 by root, Tue Jul 17 16:02:14 2007 UTC vs.
Revision 1.24 by root, Sun Jul 29 03:58:26 2007 UTC