--- deliantra/Deliantra-Client/DC.pm	2006/04/07 20:34:44	1.6
+++ deliantra/Deliantra-Client/DC.pm	2006/04/08 17:21:01	1.10
@@ -55,6 +55,7 @@
       or return;
 
    {
+      require Data::Dumper;
       local $Data::Dumper::Purity = 1;
       $::CFG->{VERSION} = $::VERSION;
       print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
@@ -115,12 +116,18 @@
 sub new_from_ttf {
    my ($class, $ttf, $text) = @_;
 
-   utf8::upgrade $text;
+   utf8::encode $text;
 
    my $surface = SDL::TTFRenderUTF8Blended $ttf, $text,
       (new SDL::Color -r => 255, -g => 255, -b => 255);
 
-   $class->new_from_surface ($surface)
+   $class->new_from_surface (bless \$surface, SDL::Surface::)
+}
+
+sub new_from_opengl {
+   my ($class, $w, $h, $cb) = @_;
+
+   $class->_new (width => $w, height => $h, rendercb => $cb)
 }
 
 sub upload {
@@ -132,6 +139,11 @@
 
    if (exists $self->{data}) {
       $data = $self->{data};
+   } elsif (exists $self->{rendercb}) {
+      glViewport 0, 0, $self->{width}, $self->{height};
+      glClear GL_COLOR_BUFFER_BIT;
+
+      $self->{rendercb}->($self, $self->{width}, $self->{height});
    } else {
       my $pb = new Gtk2::Gdk::PixbufLoader;
       $pb->write ($self->{image});
@@ -155,13 +167,21 @@
    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,
-                $self->{width}, $self->{height},
-                0,
-                GL_RGBA,
-                GL_UNSIGNED_BYTE,
-                $data;
+   if (defined $data) {
+      glTexImage2D GL_TEXTURE_2D, 0,
+                   GL_RGBA8,
+                   $self->{width}, $self->{height},
+                   0,
+                   GL_RGBA,
+                   GL_UNSIGNED_BYTE,
+                   $data;
+   } else {
+      glCopyTexImage2D GL_TEXTURE_2D, 0,
+                   GL_RGBA8,
+                   0, 0,
+                   $self->{width}, $self->{height},
+                   0;
+   }
 }
 
 sub DESTROY {