ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Texture.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.29 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.30 by root, Wed Dec 26 20:46:39 2007 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFPlus::Texture - tetxure class for CFPlus 3dc::Texture - tetxure class for CFPlus
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFPlus::Texture; 7 use dc::Texture;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package CFPlus::Texture; 15package dc::Texture;
16 16
17use strict; 17use strict;
18 18
19use List::Util qw(max min); 19use List::Util qw(max min);
20use CFPlus::OpenGL; 20use dc::OpenGL;
21 21
22my %TEXTURES; 22my %TEXTURES;
23my ($MAX_W, $MAX_H) = (4096, 4096); # maximum texture size attempted by this module 23my ($MAX_W, $MAX_H) = (4096, 4096); # maximum texture size attempted by this module
24 24
25sub new { 25sub new {
30 format => GL_RGBA, 30 format => GL_RGBA,
31 type => GL_UNSIGNED_BYTE, 31 type => GL_UNSIGNED_BYTE,
32 %data, 32 %data,
33 }, $class; 33 }, $class;
34 34
35 CFPlus::weaken ($TEXTURES{$self+0} = $self); 35 dc::weaken ($TEXTURES{$self+0} = $self);
36 36
37 $self->upload 37 $self->upload
38 unless delete $self->{delay}; 38 unless delete $self->{delay};
39 39
40 $self 40 $self
130 } elsif ($self->{render_cb}) { 130 } elsif ($self->{render_cb}) {
131 ($dw, $dh) = @$self{qw(w h)}; 131 ($dw, $dh) = @$self{qw(w h)};
132 132
133 } elsif (defined $self->{image}) { 133 } elsif (defined $self->{image}) {
134 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type}) 134 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
135 = CFPlus::load_image_inline $self->{image}; 135 = dc::load_image_inline $self->{image};
136 136
137 $self->{internalformat} ||= $internalformat; 137 $self->{internalformat} ||= $internalformat;
138 ($dw, $dh) = @$self{qw(w h)}; 138 ($dw, $dh) = @$self{qw(w h)};
139 139
140 delete $self->{image} if delete $self->{delete_image}; 140 delete $self->{image} if delete $self->{delete_image};
141 141
142 } elsif (defined $self->{tile}) { 142 } elsif (defined $self->{tile}) {
143 ++$self->{loading}; 143 ++$self->{loading};
144 return CFPlus::DB::get tilecache => $self->{tile}, sub { 144 return dc::DB::get tilecache => $self->{tile}, sub {
145 $self->loading_done ($_[0]); 145 $self->loading_done ($_[0]);
146 }; 146 };
147 147
148 } elsif (defined $self->{path}) { 148 } elsif (defined $self->{path}) {
149 ++$self->{loading}; 149 ++$self->{loading};
150 return CFPlus::DB::read_file $self->{path}, sub { 150 return dc::DB::read_file $self->{path}, sub {
151 $self->loading_done ($_[0]); 151 $self->loading_done ($_[0]);
152 }; 152 };
153 153
154 } else { 154 } else {
155 Carp::confess "tried to create texture that is not data, render or image"; 155 Carp::confess "tried to create texture that is not data, render or image";
157 157
158 my ($tw, $th) = ($dw, $dh); 158 my ($tw, $th) = ($dw, $dh);
159 159
160 defined $data or $self->{render_cb} or die; # some sanity check 160 defined $data or $self->{render_cb} or die; # some sanity check
161 161
162 $self->{minified} ||= [CFPlus::average $dw, $dh, $data] 162 $self->{minified} ||= [dc::average $dw, $dh, $data]
163 if $self->{minify}; 163 if $self->{minify};
164 164
165 # against rather broken cards we enforce a maximum texture size 165 # against rather broken cards we enforce a maximum texture size
166 $tw = min $MAX_W, $tw; 166 $tw = min $MAX_W, $tw;
167 $th = min $MAX_H, $th; 167 $th = min $MAX_H, $th;
168 168
169 # if only pot-textures are allowed, pot'ify tw/th 169 # if only pot-textures are allowed, pot'ify tw/th
170 unless ($GL_NPOT) { 170 unless ($GL_NPOT) {
171 $tw = CFPlus::minpot $tw; 171 $tw = dc::minpot $tw;
172 $th = CFPlus::minpot $th; 172 $th = dc::minpot $th;
173 } 173 }
174 174
175 # now further decrease texture size until the 175 # now further decrease texture size until the
176 # card does accept it 176 # card does accept it
177 while (!texture_valid_2d $self->{internalformat}, $tw, $th, $self->{format}, $self->{type}) { 177 while (!texture_valid_2d $self->{internalformat}, $tw, $th, $self->{format}, $self->{type}) {
323 delete $TEXTURES{$self+0}; 323 delete $TEXTURES{$self+0};
324 324
325 $self->unload; 325 $self->unload;
326} 326}
327 327
328$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Texture"} = sub { 328$dc::OpenGL::INIT_HOOK{"dc::Texture"} = sub {
329 for (values %TEXTURES) { 329 for (values %TEXTURES) {
330 $_->upload if $_->{want_upload}; 330 $_->upload if $_->{want_upload};
331 } 331 }
332}; 332};
333 333
334$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Texture"} = sub { 334$dc::OpenGL::SHUTDOWN_HOOK{"dc::Texture"} = sub {
335 for (values %TEXTURES) { 335 for (values %TEXTURES) {
336 next unless $_->{name}; 336 next unless $_->{name};
337 $_->{want_upload} = $_->{name}; 337 $_->{want_upload} = $_->{name};
338 $_->unload; 338 $_->unload;
339 } 339 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines