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.15 by root, Tue Jul 17 16:02:14 2007 UTC vs.
Revision 1.27 by root, Tue Aug 21 00:59:34 2007 UTC

… …
32 %data, 32 %data,
33 }, $class; 33 }, $class;
34 34
35 CFPlus::weaken ($TEXTURES{$self+0} = $self); 35 CFPlus::weaken ($TEXTURES{$self+0} = $self);
36 36
37 $self->upload; 37 $self->upload
38 unless delete $self->{delay};
38 39
39 $self 40 $self
40} 41}
41 42
42sub new_from_image { 43sub new_from_image {
43 my ($class, $image, %arg) = @_; 44 my ($class, $image, %arg) = @_;
44 45
46 Carp::confess "tried to create texture from undefined image"
47 unless defined $image;
48
45 $class->new (image => $image, internalformat => undef, %arg) 49 $class->new (image => $image, internalformat => undef, %arg)
46} 50}
51
47 52
48sub new_from_file { 53sub new_from_file {
49 my ($class, $path, %arg) = @_; 54 my ($class, $path, %arg) = @_;
50 55
51 open my $fh, "<:raw", $path 56 open my $fh, "<:raw", $path
… …
87 my ($class, $w, $h, $cb) = @_; 92 my ($class, $w, $h, $cb) = @_;
88 93
89 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb, nearest => 1) 94 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb, nearest => 1)
90} 95}
91 96
97sub loading_done($$) {
98 my ($self, $data) = @_;
99
100 delete $self->{loading};
101 ++$self->{delete_image};
102 $self->{image} = $data;
103 $self->upload;
104}
105
92sub upload { 106sub upload {
93 my ($self) = @_; 107 my ($self, $cb) = @_;
94 108
109 push @{ $self->{upload_done} }, $cb
110 if $cb;
111
112 return if $self->{loading};
113
95 return unless $GL_VERSION; 114 unless ($GL_VERSION) {
96 115 $self->{was_loaded} = 1;
97 my ($tw, $th, $data); 116 return;
98
99 if (exists $self->{data}) {
100 $data = $self->{data};
101 ($tw, $th) = @$self{qw(w h)};
102
103 } elsif (exists $self->{render_cb}) {
104 ($tw, $th) = @$self{qw(w h)};
105
106 } else {
107 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
108 = CFPlus::load_image_inline $self->{image};
109
110 $self->{internalformat} ||= $internalformat;
111 ($tw, $th) = @$self{qw(w h)};
112 } 117 }
113 118
119 unless ($self->{name}) {
120 # $tw,$th texture
121 # $rw,$rh rendered/used size
122 # $dw,$dh $data
123
124 my ($data, $dw, $dh);
125
126 if (defined $self->{data}) {
127 $data = $self->{data};
128 ($dw, $dh) = @$self{qw(w h)};
129
130 } elsif ($self->{render_cb}) {
131 ($dw, $dh) = @$self{qw(w h)};
132
133 } elsif (defined $self->{image}) {
134 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
135 = CFPlus::load_image_inline $self->{image};
136
137 $self->{internalformat} ||= $internalformat;
138 ($dw, $dh) = @$self{qw(w h)};
139
140 delete $self->{image} if delete $self->{delete_image};
141
142 } elsif (defined $self->{tile}) {
143 ++$self->{loading};
144 return CFPlus::DB::get tilecache => $self->{tile}, sub {
145 $self->loading_done ($_[0]);
146 };
147
148 } elsif (defined $self->{path}) {
149 ++$self->{loading};
150 return CFPlus::DB::read_file $self->{path}, sub {
151 $self->loading_done ($_[0]);
152 };
153
154 } else {
155 Carp::confess "tried to create texture that is not data, render or image";
156 }
157
158 my ($tw, $th) = ($dw, $dh);
159
114 defined $data or $self->{render_cb} or die; # some sanity check 160 defined $data or $self->{render_cb} or die; # some sanity check
115 161
116 $self->{minified} ||= [CFPlus::average $tw, $th, $data] 162 $self->{minified} ||= [CFPlus::average $dw, $dh, $data]
117 if $self->{minify}; 163 if $self->{minify};
118 164
119 pad2pot $data, $tw, $th unless $GL_NPOT; 165 # against rather broken cards we enforce a maximum texture size
120 $tw = min $MAX_W, $tw; 166 $tw = min $MAX_W, minpot $tw;
121 $th = min $MAX_H, $th; 167 $th = min $MAX_H, minpot $th;
122 168
169 # if only pot-textures are allowed, pot'ify tw/th
170 unless ($GL_NPOT && 0) {#d#
171 $tw = minpot $tw;
172 $th = minpot $th;
173 }
174
123 # now further decrease texture size 175 # now further decrease texture size until the
176 # card does accept it
124 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}) {
125 # quarter the texture size 178 # quarter the texture size
126 $tw >>= 1; 179 $tw >>= 1;
127 $th >>= 1; 180 $th >>= 1;
128 } 181 }
129 182
130 my $render = $self->{render_cb} || $tw < $self->{w} || $th < $self->{h}; 183 # decide the amount of space used in the texture
131 184 my ($rw, $rh);
132 if ($render) { 185 my ($ox, $oy); # area shift to lessen effetc of buggy opengl implementations (nvida, ati)
133 glViewport 0, 0, $tw, $th; 186 my $render;
134 glMatrixMode GL_PROJECTION;
135 glLoadIdentity;
136 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
137 glMatrixMode GL_MODELVIEW;
138 glLoadIdentity;
139 187
140 if ($self->{render_cb}) { 188 if ($self->{render_cb}) {
141 $self->{render_cb}->($self, $self->{w}, $self->{h}); 189 # use only part of the texture
190 #$rw >>= 1 while $rw > $tw;
191 #$rh >>= 1 while $rh > $th;
192 $rw = min $dw, $tw;
193 $rh = min $dh, $th;
194 ++$render;
195 } else {
196 if ($self->{wrap} || $tw < $dw || $th < $dh) {
197 # scale to the full texture size
198 ($rw, $rh) = ($tw, $th);
199 ++$render;
142 } else { 200 } else {
201 # pad
202 pad $data, $dw, $dh, $tw, $th;
203 ($rw, $rh) = ($dw, $dh);
204 ($dw, $dh) = ($tw, $th);
205 }
206 }
207
208 if ($render) {
209 $ox = int .5 * ($::WIDTH - $rw);
210 $oy = int .5 * ($::HEIGHT - $rh);
211
212 glViewport $ox, $oy, $tw, $th;
213 #glScissor 0, 0, $tw, $th;
214 #glEnable GL_SCISSOR_TEST;
215 glMatrixMode GL_PROJECTION;
216 glLoadIdentity;
217 glOrtho 0, $tw, 0, $th, -10000, 10000;
218 glMatrixMode GL_MODELVIEW;
219 glLoadIdentity;
220
221 if ($self->{render_cb}) {
222 glScale $rw / $dw, $rh / $dh;
223 $self->{render_cb}->($self, $rw, $rh);
224 } else {
225 glClearColor 0, 0, 0, 0;
226 glClear GL_COLOR_BUFFER_BIT;
143 glPixelZoom $tw / $self->{w}, $th / $self->{h}; 227 glPixelZoom $tw / $dw, $th / $dh;
144 glDrawPixels $self->{w}, $self->{h}, 228 glRasterPos 0, 0;
229 glDrawPixels $dw, $dh,
230 $self->{format},
231 $self->{type},
232 $data;
233 glPixelZoom 1, 1;
234 }
235 }
236
237 glBindTexture GL_TEXTURE_2D, $self->{name} ||= glGenTexture;
238
239 if ($self->{wrap}) {
240 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
241 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
242 } else {
243 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
244 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
245 }
246
247 if ($::FAST || $self->{nearest}) {
248 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
249 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
250 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
251 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
252 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
253 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
254 } else {
255 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
256 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
257 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
258 }
259
260 glGetError;
261
262 if ($render) {
263 glCopyTexImage2D GL_TEXTURE_2D, 0,
264 $self->{internalformat},
265 $ox, $oy,
266 $tw, $th,
267 0;
268 gl_check "copying to texture %dx%d if=%x",
269 $tw, $th, $self->{internalformat};
270
271 #glDisable GL_SCISSOR_TEST;
272 } else {
273 my $if = $self->{internalformat};
274
275 if ($GL_COMPRESS && $::CFG->{texture_compression}) {
276 if ($if == GL_RGB) {
277 $if = GL_COMPRESSED_RGB_ARB;
278 } elsif ($if == GL_RGBA) {
279 $if = GL_COMPRESSED_RGBA_ARB;
280 }
281 }
282
283 glTexImage2D GL_TEXTURE_2D, 0,
284 $if,
285 $dw, $dh,
286 0,
145 $self->{format}, 287 $self->{format},
146 $self->{type}, 288 $self->{type},
147 $data; 289 $data;
148 glPixelZoom 1, 1; 290 gl_check "uploading texture %dx%d if=%x f=%x t=%x",
291 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
292 }
293
294 $self->{s} = $rw / $tw;
295 $self->{t} = $rh / $th;
296
297 if ($self->{tile}) {
298 $::MAP->set_texture ($self->{tile}, @$self{qw(name w h s t)}, @{$self->{minified}})
299 if $::MAP;
300 $::MAPWIDGET->update
301 if $::MAPWIDGET;
149 } 302 }
150 } 303 }
151 304
152 glBindTexture GL_TEXTURE_2D, $self->{name} ||= glGenTexture; 305 $_->($self)
153 306 for @{ (delete $self->{upload_done}) || [] };
154 if ($self->{wrap}) {
155 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
156 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
157 } else {
158 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
159 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
160 }
161
162 if ($::FAST || $self->{nearest}) {
163 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
164 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
165 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
166 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
167 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
168 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
169 } else {
170 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
171 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
172 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
173 }
174
175 glGetError;
176
177 if ($render) {
178 glCopyTexImage2D GL_TEXTURE_2D, 0,
179 $self->{internalformat},
180 0, 0,
181 $tw, $th,
182 0;
183 gl_check "copying to texture %dx%d if=%x",
184 $tw, $th, $self->{internalformat};
185 } else {
186 glTexImage2D GL_TEXTURE_2D, 0,
187 $self->{internalformat},
188 $tw, $th,
189 0,
190 $self->{format},
191 $self->{type},
192 $data;
193 gl_check "uploading texture %dx%d if=%x f=%x t=%x",
194 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
195 }
196
197 $self->{s} = min 1, $self->{w} / $tw;
198 $self->{t} = min 1, $self->{h} / $th;
199} 307}
200 308
201sub shutdown { 309sub unload {
202 my ($self) = @_; 310 my ($self) = @_;
203 311
204 glDeleteTexture $self->{name} 312 glDeleteTexture delete $self->{name}
205 if $self->{name}; 313 if $self->{name};
206} 314}
207 315
208sub DESTROY { 316sub DESTROY {
209 my ($self) = @_; 317 my ($self) = @_;
210 318
211 delete $TEXTURES{$self+0}; 319 delete $TEXTURES{$self+0};
212 320
213 $self->shutdown; 321 $self->unload;
214} 322}
215 323
216$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Texture"} = sub { 324$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Texture"} = sub {
217 # first mark all existing texture names as in-use, in case the context lost textures
218 glBindTexture GL_TEXTURE_2D, $_->{name}
219 for values %TEXTURES; 325 for (values %TEXTURES) {
326 next unless delete $_->{was_loaded};
220 $_->upload 327 $_->upload;
221 for values %TEXTURES; 328 }
222}; 329};
223 330
224$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Texture"} = sub { 331$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Texture"} = sub {
225 $_->shutdown
226 for values %TEXTURES; 332 for (values %TEXTURES) {
333 next unless $_->{name};
334 $_->{was_loaded} = 1;
335 $_->unload;
336 }
227}; 337};
228 338
2291; 3391;
230 340
231=back 341=back

Diff Legend

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