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

Diff Legend

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