--- deliantra/Deliantra-Client/DC.pm	2006/04/15 21:16:49	1.34
+++ deliantra/Deliantra-Client/DC.pm	2006/04/21 07:19:56	1.43
@@ -21,9 +21,10 @@
    XSLoader::load "CFClient", $VERSION;
 }
 
+use Carp ();
 use AnyEvent;
 use BerkeleyDB;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 our %GL_EXT;
 our $GL_VERSION;
@@ -95,17 +96,22 @@
 our $DB_ENV = new BerkeleyDB::Env
                  -Home => "$Crossfire::VARDIR/pclient",
                  -Cachesize => 1_000_000,
-                 -ErrFile => "/proc/self/fd/2",
-                 -ErrPrefix => "DATABASE",
+                 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
+#                 -ErrPrefix => "DATABASE",
                  -Verbose => 1,
-                 -Flags => DB_CREATE | DB_JOINENV | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
+                 -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 => "database",
-      -Subname  => $_[0],
+      -Filename => $table,
+#      -Filename => "database",
+#      -Subname  => $table,
       -Flags    => DB_CREATE | DB_UPGRADE,
          or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
 }
@@ -119,7 +125,7 @@
 
    $_[0]->db_get ($_[1], $data) == 0
       ? $data
-      : ();
+      : ()
 }
 
 my %DB_SYNC;
@@ -127,10 +133,9 @@
 sub put($$$) {
    my ($db, $key, $data) = @_;
 
-   $db->db_put ($key => $data);
-
    $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
-   
+
+   $db->db_put ($key => $data)
 }
 
 package CFClient::Texture;
@@ -139,9 +144,9 @@
 
 use Scalar::Util;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
-my @textures;
+my %TEXTURES;
 
 sub new {
    my ($class, %data) = @_;
@@ -153,8 +158,7 @@
       %data,
    }, $class;
 
-   push @textures, $self;
-   Scalar::Util::weaken $textures[-1];
+   Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
 
    $self->upload;
 
@@ -168,13 +172,13 @@
 }
 
 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 {
@@ -190,7 +194,7 @@
 #}
 
 sub new_from_layout {
-   my ($class, $layout) = @_;
+   my ($class, $layout, %arg) = @_;
 
    my ($w, $h, $data) = $layout->render;
 
@@ -201,6 +205,7 @@
       internalformat => GL_ALPHA4,
       format         => GL_ALPHA,
       type           => GL_UNSIGNED_BYTE,
+      %arg,
    )
 }
 
@@ -253,7 +258,7 @@
       $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;
@@ -264,14 +269,23 @@
    $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, $::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;
+   } 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, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;
+   }
    
    if (defined $data) {
       glTexImage2D GL_TEXTURE_2D, 0,
@@ -281,28 +295,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;