--- deliantra/Deliantra-Client/DC.pm 2006/04/10 19:34:03 1.19 +++ deliantra/Deliantra-Client/DC.pm 2006/04/21 07:19:56 1.43 @@ -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,20 @@ =cut -package Crossfire::Client; +package CFClient; BEGIN { $VERSION = '0.1'; use XSLoader; - XSLoader::load "Crossfire::Client", $VERSION; + XSLoader::load "CFClient", $VERSION; } +use Carp (); +use AnyEvent; +use BerkeleyDB; +use CFClient::OpenGL; + our %GL_EXT; our $GL_VERSION; @@ -32,16 +37,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; -# $GL_NPOT=0;#d# + CFClient::Texture::restore_state (); } sub find_rcfile($) { my $path; for (@INC) { - $path = "$_/Crossfire/resources/$_[0]"; + $path = "$_/CFClient/resources/$_[0]"; return $path if -r $path; } @@ -80,13 +91,62 @@ close CFG; } -package Crossfire::Client::Texture; +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 +154,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,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 { @@ -128,29 +188,31 @@ # # $class->new ( # data => $surface->pixels, -# width => $surface->width, -# height => $surface->height, +# w => $surface->width, +# h => $surface->height, # ) #} -sub new_from_text { - my ($class, $text, $height) = @_; +sub new_from_layout { + my ($class, $layout, %arg) = @_; - my ($w, $h, $data) = Crossfire::Client::font_render $text, $height; + 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, + %arg, ) } 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 { @@ -160,92 +222,108 @@ 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 ($NPOT) { + unless ($GL_NPOT) { + # TODO: does not work for zero-sized textures $tw = topot $tw; $th = topot $th; - if (defined $data) { - $data = pack "(a$tw)*", (unpack "(a$self->{width})*", $data); - $data .= ("\x00" x $tw) x ($th - $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->{w} * $bpp) . ")*", $data; + $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); } } - $self->{u} = $self->{width} / $tw; - $self->{v} = $self->{height} / $th; + $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_NEAREST; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;#_MIPMAP_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; + } - 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; + 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; - glPopmatrix; + 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;