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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.5 by root, Fri Apr 7 20:13:13 2006 UTC vs.
Revision 1.6 by root, Fri Apr 7 20:34:44 2006 UTC

       width  => $surface->width,
       height => $surface->height,
    )
 }
+sub new_from_ttf {
+   my ($class, $ttf, $text) = @_;
+   utf8::upgrade $text;
+   my $surface = SDL::TTFRenderUTF8Blended $ttf, $text,
+      (new SDL::Color -r => 255, -g => 255, -b => 255);
+   $class->new_from_surface ($surface)
+}
 sub upload {
    my ($self) = @_;
    return unless $SDL::App::USING_OPENGL;
-   my ($data, $width, $height);
+   my $data;
    if (exists $self->{data}) {
-      ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height});
+      $data = $self->{data};
    } else {
       my $pb = new Gtk2::Gdk::PixbufLoader;
       $pb->write ($self->{image});
       $pb->close;
       $pb = $pb->get_pixbuf;
       $pb = $pb->add_alpha (0, 0, 0, 0);
-      ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height);
+      $self->{width}  = $pb->get_width;
+      $self->{height} = $pb->get_height;
+      $data = $pb->get_pixels;
    }
    ($self->{name}) = @{glGenTextures 1};
    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;
    glTexImage2D GL_TEXTURE_2D, 0,
                 GL_RGBA8,
-                $width, $height,
+                $self->{width}, $self->{height},
                 0,
                 GL_RGBA,
                 GL_UNSIGNED_BYTE,
                 $data;
 }

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