--- deliantra/Deliantra-Client/DC.pm	2006/04/11 19:31:17	1.25
+++ deliantra/Deliantra-Client/DC.pm	2006/04/14 14:55:27	1.31
@@ -21,6 +21,8 @@
    XSLoader::load "CFClient", $VERSION;
 }
 
+use SDL::OpenGL;
+
 our %GL_EXT;
 our $GL_VERSION;
 
@@ -32,6 +34,14 @@
 
    $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
 
+   glEnable GL_TEXTURE_2D;
+   glEnable GL_COLOR_MATERIAL;
+   glShadeModel GL_FLAT;
+   glDisable GL_DEPTH_TEST;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+
+   glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
+
    CFClient::Texture::restore_state ();
 }
 
@@ -94,6 +104,7 @@
    my $self = bless {
       internalformat => GL_RGBA,
       format         => GL_RGBA,
+      type           => GL_UNSIGNED_BYTE,
       %data,
    }, $class;
 
@@ -144,6 +155,7 @@
       data           => $data,
       internalformat => GL_ALPHA4,
       format         => GL_ALPHA,
+      type           => GL_UNSIGNED_BYTE,
    )
 }
 
@@ -160,7 +172,7 @@
 sub upload {
    my ($self) = @_;
 
-   return unless $SDL::App::USING_OPENGL;
+   return unless $GL_VERSION;
 
    my $data;
 
@@ -169,26 +181,16 @@
 
    } 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 {
-      my $pb = new Gtk2::Gdk::PixbufLoader;
-      $pb->write ($self->{image});
-      $pb->close;
-
-      $pb = $pb->get_pixbuf;
-      $pb = $pb->add_alpha (0, 0, 0, 0);
-
-      $self->{w} = $pb->get_width;
-      $self->{h} = $pb->get_height;
-
-      $data = $pb->get_pixels;
+      ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
+         = CFClient::load_image_inline $self->{image};
    }
 
    my ($tw, $th) = @$self{qw(w h)};
@@ -218,8 +220,8 @@
 
    glBindTexture GL_TEXTURE_2D, $self->{name};
 
-   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_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
+   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
    
@@ -229,7 +231,7 @@
                    $tw, $th, # need to pad texture first
                    0,
                    $self->{format},
-                   GL_UNSIGNED_BYTE,
+                   $self->{type},
                    $data;
       glGetError and die;
    } else {
@@ -238,7 +240,7 @@
                    0, 0,
                    $tw, $th,
                    0;
-      glGetError and die;
+      glGetError and die "glCopyTexImage2D $tw,$th";
    }
 }