--- deliantra/Deliantra-Client/DC.pm	2006/04/09 00:12:58	1.15
+++ deliantra/Deliantra-Client/DC.pm	2006/04/10 22:16:33	1.20
@@ -21,6 +21,20 @@
    XSLoader::load "Crossfire::Client", $VERSION;
 }
 
+our %GL_EXT;
+our $GL_VERSION;
+
+our $GL_NPOT;
+
+sub gl_init {
+   $GL_VERSION = gl_version * 1;
+   %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
+
+   $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
+
+   Crossfire::Client::Texture::restore_state ();
+}
+
 sub find_rcfile($) {
    my $path;
 
@@ -126,7 +140,7 @@
       width          => $w,
       height         => $h,
       data           => $data,
-      internalformat => GL_ALPHA8,
+      internalformat => GL_ALPHA4,
       format         => GL_ALPHA,
    )
 }
@@ -137,6 +151,10 @@
    $class->new (width => $w, height => $h, rendercb => $cb)
 }
 
+sub topot {
+   (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
+}
+
 sub upload {
    my ($self) = @_;
 
@@ -150,7 +168,7 @@
       glViewport 0, 0, $self->{width}, $self->{height};
       glMatrixMode GL_PROJECTION;
       glLoadIdentity;
-      glOrtho 0, $self->{width}, 0, $self->{height}, -100, 100;
+      glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000;
       glMatrixMode GL_MODELVIEW;
       glPushmatrix;
       glLoadIdentity;
@@ -171,32 +189,49 @@
       $data = $pb->get_pixels;
    }
 
-   ($self->{name}) = @{glGenTextures 1};
+   my ($tw, $th) = @$self{qw(width height)};
+
+   unless ($GL_NPOT) {
+      $tw = topot $tw;
+      $th = topot $th;
+
+      if (defined $data) {
+         my $bpp = (length $data) / ($self->{width} * $self->{height});
+         $data = pack "(a" . ($tw * $bpp) . ")*",
+                    unpack "(a" . ($self->{width} * $bpp) . ")*", $data;
+         $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{height});
+      }
+   }
+
+   $self->{s} = $self->{width}  / $tw;
+   $self->{t} = $self->{height} / $th;
+
+   $self->{name} ||= (glGenTextures 1)->[0];
 
    glBindTexture GL_TEXTURE_2D, $self->{name};
 
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;#_MIPMAP_LINEAR;
+   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
+   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
    
+   glGetError;
    if (defined $data) {
       glTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
-                   $self->{width}, $self->{height},
+                   $tw, $th, # need to pad texture first
                    0,
                    $self->{format},
                    GL_UNSIGNED_BYTE,
                    $data;
+      glGetError and die;
    } else {
       glCopyTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
                    0, 0,
-                   $self->{width}, $self->{height},
+                   $tw, $th,
                    0;
       glPopmatrix;
-      #SDL::GLSwapBuffers;
-      #sleep 1;
    }
 }
 
@@ -208,7 +243,7 @@
    glDeleteTextures delete $self->{name};
 }
 
-push @::GLINIT, sub {
+sub restore_state{
    $_->upload
       for grep $_, @textures;
 };