--- deliantra/Deliantra-Client/DC.pm 2006/04/07 20:13:13 1.5 +++ deliantra/Deliantra-Client/DC.pm 2006/04/12 20:42:52 1.29 @@ -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,20 +12,46 @@ =cut -package Crossfire::Client; +package CFClient; BEGIN { $VERSION = '0.1'; use XSLoader; - XSLoader::load "Crossfire::Client", $VERSION; + XSLoader::load "CFClient", $VERSION; +} + +use SDL::OpenGL; + +our %GL_EXT; +our $GL_VERSION; + +our $GL_NPOT; + +sub gl_init { + $GL_VERSION = gl_version * 1; + %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; + + $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; + glDisable GL_DEPTH_TEST; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + + glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; + + CFClient::Texture::restore_state (); } sub find_rcfile($) { my $path; for (@INC) { - $path = "$_/Crossfire/resources/$_[0]"; + $path = "$_/CFClient/resources/$_[0]"; return $path if -r $path; } @@ -55,6 +81,7 @@ or return; { + require Data::Dumper; local $Data::Dumper::Purity = 1; $::CFG->{VERSION} = $::VERSION; print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); @@ -63,7 +90,9 @@ close CFG; } -package Crossfire::Client::Texture; +package CFClient::Texture; + +use strict; use Scalar::Util; @@ -71,10 +100,15 @@ my @textures; -sub _new { +sub new { my ($class, %data) = @_; - my $self = bless \%data, $class; + my $self = bless { + internalformat => GL_RGBA, + format => GL_RGBA, + type => GL_UNSIGNED_BYTE, + %data, + }, $class; push @textures, $self; Scalar::Util::weaken $textures[-1]; @@ -87,7 +121,7 @@ sub new_from_image { my ($class, $image) = @_; - $class->_new (image => $image) + $class->new (image => $image) } sub new_from_file { @@ -100,54 +134,117 @@ $class->new_from_image (<$fh>) } -sub new_from_surface { - my ($class, $surface) = @_; +#sub new_from_surface { +# my ($class, $surface) = @_; +# +# $surface->rgba; +# +# $class->new ( +# data => $surface->pixels, +# w => $surface->width, +# h => $surface->height, +# ) +#} + +sub new_from_layout { + my ($class, $layout) = @_; + + my ($w, $h, $data) = $layout->render; + + $class->new ( + w => $w, + h => $h, + data => $data, + internalformat => GL_ALPHA4, + format => GL_ALPHA, + type => GL_UNSIGNED_BYTE, + ) +} - $surface->rgba; +sub new_from_opengl { + my ($class, $w, $h, $cb) = @_; - $class->_new ( - data => $surface->pixels, - width => $surface->width, - height => $surface->height, - ) + $class->new (w => $w, h => $h, render_cb => $cb) +} + +sub topot { + (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] } sub upload { my ($self) = @_; - return unless $SDL::App::USING_OPENGL; + return unless $GL_VERSION; - my ($data, $width, $height); + my $data; if (exists $self->{data}) { - ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); + $data = $self->{data}; + + } 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; + glMatrixMode GL_MODELVIEW; + glLoadIdentity; + glClear GL_COLOR_BUFFER_BIT; + $self->{render_cb}->($self, $self->{w}, $self->{h}); + } else { - my $pb = new Gtk2::Gdk::PixbufLoader; - $pb->write ($self->{image}); - $pb->close; + ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) + = CFClient::load_image_inline $self->{image}; + } + + my ($tw, $th) = @$self{qw(w h)}; - $pb = $pb->get_pixbuf; - $pb = $pb->add_alpha (0, 0, 0, 0); + unless ($tw && $th) { + $tw = $th = 1; + $data = "\x00" x 64; + } - ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height); + 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) { + 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->{name}) = @{glGenTextures 1}; + $self->{s} = $self->{w} / $tw; + $self->{t} = $self->{h} / $th; + + $self->{name} ||= (glGenTextures 1)->[0]; glBindTexture GL_TEXTURE_2D, $self->{name}; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; + 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; - glTexImage2D GL_TEXTURE_2D, 0, - GL_RGBA8, - $width, $height, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - $data; + if (defined $data) { + glTexImage2D GL_TEXTURE_2D, 0, + $self->{internalformat}, + $tw, $th, # need to pad texture first + 0, + $self->{format}, + $self->{type}, + $data; + glGetError and die; + } else { + glCopyTexImage2D GL_TEXTURE_2D, 0, + $self->{internalformat}, + 0, 0, + $tw, $th, + 0; + glGetError and die; + } } sub DESTROY { @@ -158,7 +255,7 @@ glDeleteTextures delete $self->{name}; } -push @::GLINIT, sub { +sub restore_state{ $_->upload for grep $_, @textures; };