--- deliantra/Deliantra-Client/DC.pm	2006/04/11 17:02:35	1.23
+++ deliantra/Deliantra-Client/DC.pm	2006/04/11 18:06:52	1.24
@@ -126,8 +126,8 @@
 #
 #   $class->new (
 #      data   => $surface->pixels,
-#      width  => $surface->width,
-#      height => $surface->height,
+#      w      => $surface->width,
+#      h      => $surface->height,
 #   )
 #}
 
@@ -137,8 +137,8 @@
    my ($w, $h, $data) = $layout->render;
 
    $class->new (
-      width          => $w,
-      height         => $h,
+      w              => $w,
+      h              => $h,
       data           => $data,
       internalformat => GL_ALPHA4,
       format         => GL_ALPHA,
@@ -148,7 +148,7 @@
 sub new_from_opengl {
    my ($class, $w, $h, $cb) = @_;
 
-   $class->new (width => $w, height => $h, rendercb => $cb)
+   $class->new (w => $w, h => $h, render_cb => $cb)
 }
 
 sub topot {
@@ -164,17 +164,17 @@
 
    if (exists $self->{data}) {
       $data = $self->{data};
-   } elsif (exists $self->{rendercb}) {
-      glViewport 0, 0, $self->{width}, $self->{height};
+   } elsif (exists $self->{render_cb}) {
+      glViewport 0, 0, $self->{w}, $self->{h};
       glMatrixMode GL_PROJECTION;
       glLoadIdentity;
-      glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000;
+      glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
       glMatrixMode GL_MODELVIEW;
       glPushmatrix;
       glLoadIdentity;
       glClear GL_COLOR_BUFFER_BIT;
 
-      $self->{rendercb}->($self, $self->{width}, $self->{height});
+      $self->{render_cb}->($self, $self->{w}, $self->{h});
    } else {
       my $pb = new Gtk2::Gdk::PixbufLoader;
       $pb->write ($self->{image});
@@ -183,28 +183,34 @@
       $pb = $pb->get_pixbuf;
       $pb = $pb->add_alpha (0, 0, 0, 0);
 
-      $self->{width}  = $pb->get_width;
-      $self->{height} = $pb->get_height;
+      $self->{w} = $pb->get_width;
+      $self->{h} = $pb->get_height;
 
       $data = $pb->get_pixels;
    }
 
-   my ($tw, $th) = @$self{qw(width height)};
+   my ($tw, $th) = @$self{qw(w h)};
 
-   unless ($GL_NPOT && $tw && $th) {
+   unless ($tw || $th) {
+      $tw = $th = 1;
+      $data = "\x00" x 64;
+   }
+
+   unless ($GL_NPOT) {
+      # TODO: does not work for zero-sized textures
       $tw = topot $tw;
       $th = topot $th;
 
       if (defined $data) {
-         my $bpp = (length $data) / ($self->{width} * $self->{height});
+         my $bpp = (length $data) / ($self->{w} * $self->{h});
          $data = pack "(a" . ($tw * $bpp) . ")*",
-                    unpack "(a" . ($self->{width} * $bpp) . ")*", $data;
-         $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{height});
+                    unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
+         $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
       }
    }
 
-   $self->{s} = $self->{width}  / $tw;
-   $self->{t} = $self->{height} / $th;
+   $self->{s} = $self->{w} / $tw;
+   $self->{t} = $self->{h} / $th;
 
    $self->{name} ||= (glGenTextures 1)->[0];