--- deliantra/Deliantra-Client/DC.pm	2006/04/14 14:55:27	1.31
+++ deliantra/Deliantra-Client/DC.pm	2006/04/25 11:18:48	1.48
@@ -21,7 +21,10 @@
    XSLoader::load "CFClient", $VERSION;
 }
 
-use SDL::OpenGL;
+use Carp ();
+use AnyEvent;
+use BerkeleyDB;
+use CFClient::OpenGL;
 
 our %GL_EXT;
 our $GL_VERSION;
@@ -48,7 +51,7 @@
 sub find_rcfile($) {
    my $path;
 
-   for (@INC) {
+   for (grep !ref, @INC) {
       $path = "$_/CFClient/resources/$_[0]";
       return $path if -r $path;
    }
@@ -88,15 +91,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) = @_;
@@ -108,8 +158,7 @@
       %data,
    }, $class;
 
-   push @textures, $self;
-   Scalar::Util::weaken $textures[-1];
+   Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
 
    $self->upload;
 
@@ -117,19 +166,19 @@
 }
 
 sub new_from_image {
-   my ($class, $image) = @_;
+   my ($class, $image, %arg) = @_;
 
-   $class->new (image => $image)
+   $class->new (image => $image, %arg)
 }
 
 sub new_from_file {
-   my ($class, $path) = @_;
+   my ($class, $path, %arg) = @_;
 
    open my $fh, "<:raw", $path
       or die "$path: $!";
 
    local $/;
-   $class->new_from_image (<$fh>)
+   $class->new_from_image (<$fh>, %arg)
 }
 
 #sub new_from_surface {
@@ -145,7 +194,7 @@
 #}
 
 sub new_from_layout {
-   my ($class, $layout) = @_;
+   my ($class, $layout, %arg) = @_;
 
    my ($w, $h, $data) = $layout->render;
 
@@ -153,16 +202,17 @@
       w              => $w,
       h              => $h,
       data           => $data,
-      internalformat => GL_ALPHA4,
       format         => GL_ALPHA,
+      internalformat => GL_ALPHA,
       type           => GL_UNSIGNED_BYTE,
+      %arg,
    )
 }
 
 sub new_from_opengl {
    my ($class, $w, $h, $cb) = @_;
 
-   $class->new (w => $w, h => $h, render_cb => $cb)
+   $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
 }
 
 sub topot {
@@ -195,17 +245,20 @@
 
    my ($tw, $th) = @$self{qw(w h)};
 
-   unless ($tw && $th) {
+   unless ($tw > 0 && $th > 0) {
       $tw = $th = 1;
       $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;
       $th = topot $th;
 
-      if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
+      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->{w} * $bpp) . ")*", $data;
@@ -216,15 +269,29 @@
    $self->{s} = $self->{w} / $tw;
    $self->{t} = $self->{h} / $th;
 
-   $self->{name} ||= (glGenTextures 1)->[0];
+   $self->{name} ||= glGenTexture;
 
    glBindTexture GL_TEXTURE_2D, $self->{name};
 
-   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;
+
+   if ($::FAST) {
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
+   } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
+      # alternatively check for 0x8191
+      glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
+   } else {
+      glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
+   }
    
+   glGetError;
+
    if (defined $data) {
       glTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
@@ -233,28 +300,35 @@
                    $self->{format},
                    $self->{type},
                    $data;
-      glGetError and die;
+      if (my $error = glGetError) {
+         Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x",
+                      $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 "glCopyTexImage2D $tw,$th";
+      if (my $error = glGetError) {
+         Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
+                      $error, $tw, $th, $self->{internalformat};
+      }
    }
 }
 
 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;