--- deliantra/Deliantra-Client/DC/Texture.pm 2006/06/17 15:07:53 1.8 +++ deliantra/Deliantra-Client/DC/Texture.pm 2007/07/29 03:58:26 1.24 @@ -1,10 +1,10 @@ =head1 NAME -CFClient::Texture - tetxure class for CFClient +CFPlus::Texture - tetxure class for CFPlus =head1 SYNOPSIS - use CFClient::Texture; + use CFPlus::Texture; =head1 DESCRIPTION @@ -12,15 +12,15 @@ =cut -package CFClient::Texture; +package CFPlus::Texture; use strict; -use Scalar::Util; - -use CFClient::OpenGL; +use List::Util qw(max min); +use CFPlus::OpenGL; my %TEXTURES; +my ($MAX_W, $MAX_H) = (4096, 4096); # maximum texture size attempted by this module sub new { my ($class, %data) = @_; @@ -32,7 +32,7 @@ %data, }, $class; - Scalar::Util::weaken ($TEXTURES{$self+0} = $self); + CFPlus::weaken ($TEXTURES{$self+0} = $self); $self->upload; @@ -42,6 +42,9 @@ sub new_from_image { my ($class, $image, %arg) = @_; + Carp::confess "tried to create texture from undefined image" + unless defined $image; + $class->new (image => $image, internalformat => undef, %arg) } @@ -67,26 +70,26 @@ # ) #} -sub new_from_layout { - my ($class, $layout, %arg) = @_; - - my ($w, $h, $data, $format, $internalformat) = $layout->render; - - $class->new ( - w => $w, - h => $h, - data => $data, - format => $format, - internalformat => $format, - type => GL_UNSIGNED_BYTE, - %arg, - ) -} +#sub new_from_layout { +# my ($class, $layout, %arg) = @_; +# +# my ($w, $h, $data, $format, $internalformat) = $layout->render; +# +# $class->new ( +# w => $w, +# h => $h, +# data => $data, +# format => $format, +# internalformat => $format, +# type => GL_UNSIGNED_BYTE, +# %arg, +# ) +#} sub new_from_opengl { my ($class, $w, $h, $cb) = @_; - $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) + $class->new (w => $w || 1, h => $h || 1, render_cb => $cb, nearest => 1) } sub upload { @@ -94,40 +97,109 @@ return unless $GL_VERSION; - my $data; + # $tw,$th texture + # $rw,$rh rendered/used size + # $dw,$dh $data + + my ($data, $dw, $dh); if (exists $self->{data}) { $data = $self->{data}; + ($dw, $dh) = @$self{qw(w h)}; } elsif (exists $self->{render_cb}) { - glViewport 0, 0, $self->{w}, $self->{h}; - glMatrixMode GL_PROJECTION; - glLoadIdentity; - glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000; - glMatrixMode GL_MODELVIEW; - glLoadIdentity; - $self->{render_cb}->($self, $self->{w}, $self->{h}); + ($dw, $dh) = @$self{qw(w h)}; - } else { + } elsif (exists $self->{image}) { ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type}) - = CFClient::load_image_inline $self->{image}; + = CFPlus::load_image_inline $self->{image}; $self->{internalformat} ||= $internalformat; + ($dw, $dh) = @$self{qw(w h)}; + } else { + Carp::confess "tried to create texture that is not data, render or image"; } - my ($tw, $th) = @$self{qw(w h)}; + my ($tw, $th) = ($dw, $dh); - $self->{minified} ||= [CFClient::average $tw, $th, $data] + defined $data or $self->{render_cb} or die; # some sanity check + + $self->{minified} ||= [CFPlus::average $dw, $dh, $data] if $self->{minify}; - pad2pot $data, $tw, $th unless $GL_NPOT; + # against rather broken cards we enforce a maximum texture size + $tw = min $MAX_W, minpot $tw; + $th = min $MAX_H, minpot $th; + + # if only pot-textures are allowed, pot'ify tw/th + unless ($GL_NPOT && 0) {#d# + $tw = minpot $tw; + $th = minpot $th; + } + + # now further decrease texture size until the + # card does accept it + while (!texture_valid_2d $self->{internalformat}, $tw, $th, $self->{format}, $self->{type}) { + # quarter the texture size + $tw >>= 1; + $th >>= 1; + } + + # decide the amount of space used in the texture + my ($rw, $rh); + my ($ox, $oy); # area shift to lessen effetc of buggy opengl implementations (nvida, ati) + my $render; + + if ($self->{render_cb}) { + # use only part of the texture + #$rw >>= 1 while $rw > $tw; + #$rh >>= 1 while $rh > $th; + $rw = min $dw, $tw; + $rh = min $dh, $th; + ++$render; + } else { + if ($self->{wrap} || $tw < $dw || $th < $dh) { + # scale to the full texture size + ($rw, $rh) = ($tw, $th); + ++$render; + } else { + # pad + pad $data, $dw, $dh, $tw, $th; + ($rw, $rh) = ($dw, $dh); + ($dw, $dh) = ($tw, $th); + } + } - $self->{s} = $self->{w} / $tw; - $self->{t} = $self->{h} / $th; + if ($render) { + $ox = int .5 * ($::WIDTH - $rw); + $oy = int .5 * ($::HEIGHT - $rh); + + glViewport $ox, $oy, $tw, $th; + #glScissor 0, 0, $tw, $th; + #glEnable GL_SCISSOR_TEST; + glMatrixMode GL_PROJECTION; + glLoadIdentity; + glOrtho 0, $tw, 0, $th, -10000, 10000; + glMatrixMode GL_MODELVIEW; + glLoadIdentity; - $self->{name} ||= glGenTexture; + if ($self->{render_cb}) { + glScale $rw / $dw, $rh / $dh; + $self->{render_cb}->($self, $rw, $rh); + } else { + glClearColor 0, 0, 0, 0; + glClear GL_COLOR_BUFFER_BIT; + glPixelZoom $tw / $dw, $th / $dh; + glRasterPos 0, 0; + glDrawPixels $dw, $dh, + $self->{format}, + $self->{type}, + $data; + glPixelZoom 1, 1; + } + } - glBindTexture GL_TEXTURE_2D, $self->{name}; + glBindTexture GL_TEXTURE_2D, $self->{name} ||= glGenTexture; if ($self->{wrap}) { glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; @@ -137,7 +209,7 @@ glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP; } - if ($::FAST) { + if ($::FAST || $self->{nearest}) { glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) { @@ -152,31 +224,36 @@ glGetError; - if (defined $data) { - glTexImage2D GL_TEXTURE_2D, 0, + if ($render) { + glCopyTexImage2D GL_TEXTURE_2D, 0, $self->{internalformat}, + $ox, $oy, $tw, $th, + 0; + gl_check "copying to texture %dx%d if=%x", + $tw, $th, $self->{internalformat}; + + #glDisable GL_SCISSOR_TEST; + } else { + glTexImage2D GL_TEXTURE_2D, 0, + $self->{internalformat}, + $dw, $dh, 0, $self->{format}, $self->{type}, $data; gl_check "uploading texture %dx%d if=%x f=%x t=%x", $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; - } else { - glCopyTexImage2D GL_TEXTURE_2D, 0, - $self->{internalformat}, - 0, 0, - $tw, $th, - 0; - gl_check "copying to texture %dx%d if=%x", - $tw, $th, $self->{internalformat}; } + + $self->{s} = $rw / $tw; + $self->{t} = $rh / $th; } sub shutdown { my ($self) = @_; - glDeleteTexture delete $self->{name} + glDeleteTexture $self->{name} if $self->{name}; } @@ -188,12 +265,15 @@ $self->shutdown; } -$CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub { +$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Texture"} = sub { + # first mark all existing texture names as in-use, in case the context lost textures + glBindTexture GL_TEXTURE_2D, $_->{name} + for values %TEXTURES; $_->upload for values %TEXTURES; }; -$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub { +$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Texture"} = sub { $_->shutdown for values %TEXTURES; };