--- deliantra/Deliantra-Client/DC.pm 2006/04/07 18:49:52 1.4 +++ deliantra/Deliantra-Client/DC.pm 2006/04/07 20:34:44 1.6 @@ -21,6 +21,48 @@ XSLoader::load "Crossfire::Client", $VERSION; } +sub find_rcfile($) { + my $path; + + for (@INC) { + $path = "$_/Crossfire/resources/$_[0]"; + return $path if -r $path; + } + + die "FATAL: can't find required file $_[0]\n"; +} + +sub read_cfg { + my ($file) = @_; + + open CFG, $file + or return; + + my $CFG; + + local $/; + $CFG = eval ; + + $::CFG = $CFG; + + close CFG; +} + +sub write_cfg { + my ($file) = @_; + + open CFG, ">$file" + or return; + + { + local $Data::Dumper::Purity = 1; + $::CFG->{VERSION} = $::VERSION; + print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); + } + + close CFG; +} + package Crossfire::Client::Texture; use Scalar::Util; @@ -70,15 +112,26 @@ ) } +sub new_from_ttf { + my ($class, $ttf, $text) = @_; + + utf8::upgrade $text; + + my $surface = SDL::TTFRenderUTF8Blended $ttf, $text, + (new SDL::Color -r => 255, -g => 255, -b => 255); + + $class->new_from_surface ($surface) +} + sub upload { my ($self) = @_; return unless $SDL::App::USING_OPENGL; - my ($data, $width, $height); + my $data; if (exists $self->{data}) { - ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); + $data = $self->{data}; } else { my $pb = new Gtk2::Gdk::PixbufLoader; $pb->write ($self->{image}); @@ -87,7 +140,10 @@ $pb = $pb->get_pixbuf; $pb = $pb->add_alpha (0, 0, 0, 0); - ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height); + $self->{width} = $pb->get_width; + $self->{height} = $pb->get_height; + + $data = $pb->get_pixels; } ($self->{name}) = @{glGenTextures 1}; @@ -101,7 +157,7 @@ glTexImage2D GL_TEXTURE_2D, 0, GL_RGBA8, - $width, $height, + $self->{width}, $self->{height}, 0, GL_RGBA, GL_UNSIGNED_BYTE,