--- deliantra/Deliantra-Client/DC.pm	2006/04/11 19:31:17	1.25
+++ deliantra/Deliantra-Client/DC.pm	2006/04/19 23:37:48	1.41
@@ -21,6 +21,10 @@
    XSLoader::load "CFClient", $VERSION;
 }
 
+use AnyEvent;
+use BerkeleyDB;
+use CFClient::OpenGL;
+
 our %GL_EXT;
 our $GL_VERSION;
 
@@ -32,6 +36,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 ();
 }
 
@@ -78,15 +90,62 @@
    close CFG;
 }
 
+mkdir "$Crossfire::VARDIR/pclient", 0777;
+
+our $DB_ENV = new BerkeleyDB::Env
+                 -Home => "$Crossfire::VARDIR/pclient",
+                 -Cachesize => 1_000_000,
+                 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
+#                 -ErrPrefix => "DATABASE",
+                 -Verbose => 1,
+                 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
+                    or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
+
+sub db_table($) {
+   my ($table) = @_;
+
+   $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
+   
+   new CFClient::Database
+      -Env      => $DB_ENV,
+      -Filename => $table,
+#      -Filename => "database",
+#      -Subname  => $table,
+      -Flags    => DB_CREATE | DB_UPGRADE,
+         or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
+}
+
+package CFClient::Database;
+
+our @ISA = BerkeleyDB::Btree::;
+
+sub get($$) {
+   my $data;
+
+   $_[0]->db_get ($_[1], $data) == 0
+      ? $data
+      : ()
+}
+
+my %DB_SYNC;
+
+sub put($$$) {
+   my ($db, $key, $data) = @_;
+
+   $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
+
+   $db->db_put ($key => $data)
+}
+
 package CFClient::Texture;
 
 use strict;
 
 use Scalar::Util;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
-my @textures;
+my %TEXTURES;
 
 sub new {
    my ($class, %data) = @_;
@@ -94,11 +153,11 @@
    my $self = bless {
       internalformat => GL_RGBA,
       format         => GL_RGBA,
+      type           => GL_UNSIGNED_BYTE,
       %data,
    }, $class;
 
-   push @textures, $self;
-   Scalar::Util::weaken $textures[-1];
+   Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
 
    $self->upload;
 
@@ -106,9 +165,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 {
@@ -144,6 +203,7 @@
       data           => $data,
       internalformat => GL_ALPHA4,
       format         => GL_ALPHA,
+      type           => GL_UNSIGNED_BYTE,
    )
 }
 
@@ -160,7 +220,7 @@
 sub upload {
    my ($self) = @_;
 
-   return unless $SDL::App::USING_OPENGL;
+   return unless $GL_VERSION;
 
    my $data;
 
@@ -169,26 +229,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)};
@@ -198,6 +248,9 @@
       $data = "\x00" x 64;
    }
 
+   $self->{minified} = [CFClient::average $tw, $th, $data]
+      if $self->{minify};
+
    unless ($GL_NPOT) {
       # TODO: does not work for zero-sized textures
       $tw = topot $tw;
@@ -214,12 +267,14 @@
    $self->{s} = $self->{w} / $tw;
    $self->{t} = $self->{h} / $th;
 
-   $self->{name} ||= (glGenTextures 1)->[0];
+   glGetError;
+
+   $self->{name} ||= glGenTexture;
 
    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,30 +284,34 @@
                    $tw, $th, # need to pad texture first
                    0,
                    $self->{format},
-                   GL_UNSIGNED_BYTE,
+                   $self->{type},
                    $data;
-      glGetError and die;
+      if (my $error = glGetError) {
+         warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
+                      $error, $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
+      }
    } else {
       glCopyTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
                    0, 0,
                    $tw, $th,
                    0;
-      glGetError and die;
+      glGetError and die "glCopyTexImage2D $tw,$th";
    }
 }
 
 sub DESTROY {
    my ($self) = @_;
 
-   return unless exists $self->{name};
+   delete $TEXTURES{$self+0};
 
-   glDeleteTextures delete $self->{name};
+   glDeleteTexture delete $self->{name}
+      if $self->{name};
 }
 
 sub restore_state{
    $_->upload
-      for grep $_, @textures;
+      for values %TEXTURES;
 };
 
 1;