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.5 by root, Wed Jun 14 16:20:23 2006 UTC vs.
Revision 1.8 by root, Sat Jun 17 15:07:53 2006 UTC

… …
40} 40}
41 41
42sub new_from_image { 42sub new_from_image {
43 my ($class, $image, %arg) = @_; 43 my ($class, $image, %arg) = @_;
44 44
45 $class->new (image => $image, %arg) 45 $class->new (image => $image, internalformat => undef, %arg)
46} 46}
47 47
48sub new_from_file { 48sub new_from_file {
49 my ($class, $path, %arg) = @_; 49 my ($class, $path, %arg) = @_;
50 50
… …
87 my ($class, $w, $h, $cb) = @_; 87 my ($class, $w, $h, $cb) = @_;
88 88
89 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) 89 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
90} 90}
91 91
92sub topot {
93 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
94}
95
96sub upload { 92sub upload {
97 my ($self) = @_; 93 my ($self) = @_;
98 94
99 return unless $GL_VERSION; 95 return unless $GL_VERSION;
100 96
… …
111 glMatrixMode GL_MODELVIEW; 107 glMatrixMode GL_MODELVIEW;
112 glLoadIdentity; 108 glLoadIdentity;
113 $self->{render_cb}->($self, $self->{w}, $self->{h}); 109 $self->{render_cb}->($self, $self->{w}, $self->{h});
114 110
115 } else { 111 } else {
116 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 112 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
117 = CFClient::load_image_inline $self->{image}; 113 = CFClient::load_image_inline $self->{image};
114
115 $self->{internalformat} ||= $internalformat;
118 } 116 }
119 117
120 my ($tw, $th) = @$self{qw(w h)}; 118 my ($tw, $th) = @$self{qw(w h)};
121
122 unless ($tw > 0 && $th > 0) {
123 $tw = $th = 1;
124 $data = "\x00" x 64;
125 }
126 119
127 $self->{minified} ||= [CFClient::average $tw, $th, $data] 120 $self->{minified} ||= [CFClient::average $tw, $th, $data]
128 if $self->{minify}; 121 if $self->{minify};
129 122
130 pad2pot $data, $tw, $th unless $GL_NPOT; 123 pad2pot $data, $tw, $th unless $GL_NPOT;
… …
178 gl_check "copying to texture %dx%d if=%x", 171 gl_check "copying to texture %dx%d if=%x",
179 $tw, $th, $self->{internalformat}; 172 $tw, $th, $self->{internalformat};
180 } 173 }
181} 174}
182 175
176sub shutdown {
177 my ($self) = @_;
178
179 glDeleteTexture delete $self->{name}
180 if $self->{name};
181}
182
183sub DESTROY { 183sub DESTROY {
184 my ($self) = @_; 184 my ($self) = @_;
185 185
186 delete $TEXTURES{$self+0}; 186 delete $TEXTURES{$self+0};
187 187
188 glDeleteTexture delete $self->{name} 188 $self->shutdown;
189 if $self->{name};
190} 189}
191 190
192$CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub { 191$CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub {
193 $_->upload 192 $_->upload
194 for values %TEXTURES; 193 for values %TEXTURES;
195}; 194};
196 195
196$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub {
197 $_->shutdown
198 for values %TEXTURES;
199};
200
1971; 2011;
198 202
199=back 203=back
200 204
201=head1 AUTHOR 205=head1 AUTHOR

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines