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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.30 by root, Wed Apr 12 21:35:10 2006 UTC vs.
Revision 1.33 by root, Sat Apr 15 01:13:45 2006 UTC

    $self
 }
 sub new_from_image {
-   my ($class, $image) = @_;
+   my ($class, $image, %arg) = @_;
-   $class->new (image => $image)
+   $class->new (image => $image, %arg)
 }
 sub new_from_file {
    my ($class, $path) = @_;
    if (exists $self->{data}) {
       $data = $self->{data};
    } elsif (exists $self->{render_cb}) {
       glViewport 0, 0, $self->{w}, $self->{h};
-      glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
       glMatrixMode GL_PROJECTION;
       glLoadIdentity;
+      glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
       glMatrixMode GL_MODELVIEW;
       glLoadIdentity;
-      glClear GL_COLOR_BUFFER_BIT;
       $self->{render_cb}->($self, $self->{w}, $self->{h});
    } else {
       ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
          = CFClient::load_image_inline $self->{image};
    unless ($tw && $th) {
       $tw = $th = 1;
       $data = "\x00" x 64;
    }
+   $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;
       glCopyTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
                    0, 0,
                    $tw, $th,
                    0;
-      glGetError and die;
+      glGetError and die "glCopyTexImage2D $tw,$th";
    }
 }
 sub DESTROY {
    my ($self) = @_;

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