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.6 by root, Wed Jun 14 18:59:31 2006 UTC vs.
Revision 1.9 by root, Sat Jun 17 15:48:59 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
… …
107 glMatrixMode GL_MODELVIEW; 107 glMatrixMode GL_MODELVIEW;
108 glLoadIdentity; 108 glLoadIdentity;
109 $self->{render_cb}->($self, $self->{w}, $self->{h}); 109 $self->{render_cb}->($self, $self->{w}, $self->{h});
110 110
111 } else { 111 } else {
112 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 112 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
113 = CFClient::load_image_inline $self->{image}; 113 = CFClient::load_image_inline $self->{image};
114
115 $self->{internalformat} ||= $internalformat;
114 } 116 }
115 117
116 my ($tw, $th) = @$self{qw(w h)}; 118 my ($tw, $th) = @$self{qw(w h)};
117 119
118 $self->{minified} ||= [CFClient::average $tw, $th, $data] 120 $self->{minified} ||= [CFClient::average $tw, $th, $data]
… …
159 $self->{type}, 161 $self->{type},
160 $data; 162 $data;
161 gl_check "uploading texture %dx%d if=%x f=%x t=%x", 163 gl_check "uploading texture %dx%d if=%x f=%x t=%x",
162 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; 164 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
163 } else { 165 } else {
166 exists $self->{render_cb} or die;
164 glCopyTexImage2D GL_TEXTURE_2D, 0, 167 glCopyTexImage2D GL_TEXTURE_2D, 0,
165 $self->{internalformat}, 168 $self->{internalformat},
166 0, 0, 169 0, 0,
167 $tw, $th, 170 $tw, $th,
168 0; 171 0;
169 gl_check "copying to texture %dx%d if=%x", 172 gl_check "copying to texture %dx%d if=%x",
170 $tw, $th, $self->{internalformat}; 173 $tw, $th, $self->{internalformat};
171 } 174 }
172} 175}
173 176
177sub shutdown {
178 my ($self) = @_;
179
180 glDeleteTexture $self->{name}
181 if $self->{name};
182}
183
174sub DESTROY { 184sub DESTROY {
175 my ($self) = @_; 185 my ($self) = @_;
176 186
177 delete $TEXTURES{$self+0}; 187 delete $TEXTURES{$self+0};
178 188
179 glDeleteTexture delete $self->{name} 189 $self->shutdown;
180 if $self->{name};
181} 190}
182 191
183$CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub { 192$CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub {
193 # first mark all existing texture names as in-use, in case the context lost textures
194 glBindTexture GL_TEXTURE_2D, $_->{name}
195 for values %TEXTURES;
184 $_->upload 196 $_->upload
185 for values %TEXTURES; 197 for values %TEXTURES;
186}; 198};
187 199
200$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub {
201 $_->shutdown
202 for values %TEXTURES;
203};
204
1881; 2051;
189 206
190=back 207=back
191 208
192=head1 AUTHOR 209=head1 AUTHOR

Diff Legend

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