--- deliantra/Deliantra-Client/DC.pm 2006/04/12 20:42:52 1.29 +++ deliantra/Deliantra-Client/DC.pm 2006/04/15 21:16:49 1.34 @@ -21,6 +21,8 @@ XSLoader::load "CFClient", $VERSION; } +use AnyEvent; +use BerkeleyDB; use SDL::OpenGL; our %GL_EXT; @@ -34,8 +36,6 @@ $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; - glClearColor 0.45, 0.45, 0.45, 1; - glEnable GL_TEXTURE_2D; glEnable GL_COLOR_MATERIAL; glShadeModel GL_FLAT; @@ -90,6 +90,49 @@ close CFG; } +mkdir "$Crossfire::VARDIR/pclient", 0777; + +our $DB_ENV = new BerkeleyDB::Env + -Home => "$Crossfire::VARDIR/pclient", + -Cachesize => 1_000_000, + -ErrFile => "/proc/self/fd/2", + -ErrPrefix => "DATABASE", + -Verbose => 1, + -Flags => DB_CREATE | DB_JOINENV | 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($) { + new CFClient::Database + -Env => $DB_ENV, + -Filename => "database", + -Subname => $_[0], + -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->db_put ($key => $data); + + $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); + +} + package CFClient::Texture; use strict; @@ -119,9 +162,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 { @@ -183,12 +226,11 @@ } 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 { @@ -203,6 +245,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; @@ -243,7 +288,7 @@ 0, 0, $tw, $th, 0; - glGetError and die; + glGetError and die "glCopyTexImage2D $tw,$th"; } }