--- deliantra/Deliantra-Client/DC.pm	2006/04/11 13:05:11	1.21
+++ deliantra/Deliantra-Client/DC.pm	2006/04/15 01:13:45	1.33
@@ -1,10 +1,10 @@
 =head1 NAME
 
-Crossfire::Client - undocumented utility garbage for our crossfire client
+CFClient - undocumented utility garbage for our crossfire client
 
 =head1 SYNOPSIS
 
- use Crossfire::Client;
+ use CFClient;
 
 =head1 DESCRIPTION
 
@@ -12,15 +12,17 @@
 
 =cut
 
-package Crossfire::Client;
+package CFClient;
 
 BEGIN {
    $VERSION = '0.1';
 
    use XSLoader;
-   XSLoader::load "Crossfire::Client", $VERSION;
+   XSLoader::load "CFClient", $VERSION;
 }
 
+use SDL::OpenGL;
+
 our %GL_EXT;
 our $GL_VERSION;
 
@@ -32,14 +34,22 @@
 
    $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
 
-   Crossfire::Client::Texture::restore_state ();
+   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 ();
 }
 
 sub find_rcfile($) {
    my $path;
 
    for (@INC) {
-      $path = "$_/Crossfire/resources/$_[0]";
+      $path = "$_/CFClient/resources/$_[0]";
       return $path if -r $path;
    }
 
@@ -78,7 +88,9 @@
    close CFG;
 }
 
-package Crossfire::Client::Texture;
+package CFClient::Texture;
+
+use strict;
 
 use Scalar::Util;
 
@@ -92,6 +104,7 @@
    my $self = bless {
       internalformat => GL_RGBA,
       format         => GL_RGBA,
+      type           => GL_UNSIGNED_BYTE,
       %data,
    }, $class;
 
@@ -104,9 +117,9 @@
 }
 
 sub new_from_image {
-   my ($class, $image) = @_;
+   my ($class, $image, %arg) = @_;
 
-   $class->new (image => $image)
+   $class->new (image => $image, %arg)
 }
 
 sub new_from_file {
@@ -126,8 +139,8 @@
 #
 #   $class->new (
 #      data   => $surface->pixels,
-#      width  => $surface->width,
-#      height => $surface->height,
+#      w      => $surface->width,
+#      h      => $surface->height,
 #   )
 #}
 
@@ -137,18 +150,19 @@
    my ($w, $h, $data) = $layout->render;
 
    $class->new (
-      width          => $w,
-      height         => $h,
+      w              => $w,
+      h              => $h,
       data           => $data,
       internalformat => GL_ALPHA4,
       format         => GL_ALPHA,
+      type           => GL_UNSIGNED_BYTE,
    )
 }
 
 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 {
@@ -158,71 +172,69 @@
 sub upload {
    my ($self) = @_;
 
-   return unless $SDL::App::USING_OPENGL;
+   return unless $GL_VERSION;
 
    my $data;
 
    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->{render_cb}->($self, $self->{w}, $self->{h});
 
-      $self->{rendercb}->($self, $self->{width}, $self->{height});
    } 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}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
+         = CFClient::load_image_inline $self->{image};
+   }
 
-      $self->{width}  = $pb->get_width;
-      $self->{height} = $pb->get_height;
+   my ($tw, $th) = @$self{qw(w h)};
 
-      $data = $pb->get_pixels;
+   unless ($tw && $th) {
+      $tw = $th = 1;
+      $data = "\x00" x 64;
    }
 
-   my ($tw, $th) = @$self{qw(width height)};
+   $self->{minified} = [CFClient::average $tw, $th, $data]
+      if $self->{minify};
 
    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});
+      if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
+         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];
 
    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;
    
-   glGetError;
    if (defined $data) {
       glTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
                    $tw, $th, # need to pad texture first
                    0,
                    $self->{format},
-                   GL_UNSIGNED_BYTE,
+                   $self->{type},
                    $data;
       glGetError and die;
    } else {
@@ -231,7 +243,7 @@
                    0, 0,
                    $tw, $th,
                    0;
-      glPopmatrix;
+      glGetError and die "glCopyTexImage2D $tw,$th";
    }
 }