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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.42 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.50 by root, Thu May 11 23:41:45 2006 UTC

… …
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use Carp ();
24use AnyEvent; 25use AnyEvent;
25use BerkeleyDB; 26use BerkeleyDB;
26use CFClient::OpenGL; 27use CFClient::OpenGL;
27 28
28our %GL_EXT; 29our %GL_EXT;
29our $GL_VERSION; 30our $GL_VERSION;
30 31
31our $GL_NPOT; 32our $GL_NPOT;
33our $GL_DEBUG = 1;
32 34
33sub gl_init { 35sub gl_init {
34 $GL_VERSION = gl_version * 1; 36 $GL_VERSION = gl_version * 1;
35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 37 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36 38
37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 39 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
38 40
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL; 41 glDisable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT; 42 glShadeModel GL_FLAT;
43 glDisable GL_DITHER;
42 glDisable GL_DEPTH_TEST; 44 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46 46
47 CFClient::Texture::restore_state (); 47 CFClient::Texture::restore_state ();
48}
49
50sub gl_check {
51 return unless $GL_DEBUG;
52
53 if (my $error = glGetError) {
54 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;
55 }
48} 56}
49 57
50sub find_rcfile($) { 58sub find_rcfile($) {
51 my $path; 59 my $path;
52 60
53 for (@INC) { 61 for (grep !ref, @INC) {
54 $path = "$_/CFClient/resources/$_[0]"; 62 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path; 63 return $path if -r $path;
56 } 64 }
57 65
58 die "FATAL: can't find required file $_[0]\n"; 66 die "FATAL: can't find required file $_[0]\n";
… …
193#} 201#}
194 202
195sub new_from_layout { 203sub new_from_layout {
196 my ($class, $layout, %arg) = @_; 204 my ($class, $layout, %arg) = @_;
197 205
198 my ($w, $h, $data) = $layout->render; 206 my ($w, $h, $data, $format, $internalformat) = $layout->render;
199 207
200 $class->new ( 208 $class->new (
201 w => $w, 209 w => $w,
202 h => $h, 210 h => $h,
203 data => $data, 211 data => $data,
204 internalformat => GL_ALPHA4,
205 format => GL_ALPHA, 212 format => $format,
213 internalformat => $format,
206 type => GL_UNSIGNED_BYTE, 214 type => GL_UNSIGNED_BYTE,
207 %arg, 215 %arg,
208 ) 216 )
209} 217}
210 218
211sub new_from_opengl { 219sub new_from_opengl {
212 my ($class, $w, $h, $cb) = @_; 220 my ($class, $w, $h, $cb) = @_;
213 221
214 $class->new (w => $w, h => $h, render_cb => $cb) 222 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
215} 223}
216 224
217sub topot { 225sub topot {
218 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 226 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
219} 227}
… …
242 = CFClient::load_image_inline $self->{image}; 250 = CFClient::load_image_inline $self->{image};
243 } 251 }
244 252
245 my ($tw, $th) = @$self{qw(w h)}; 253 my ($tw, $th) = @$self{qw(w h)};
246 254
247 unless ($tw && $th) { 255 unless ($tw > 0 && $th > 0) {
248 $tw = $th = 1; 256 $tw = $th = 1;
249 $data = "\x00" x 64; 257 $data = "\x00" x 64;
250 } 258 }
251 259
252 $self->{minified} = [CFClient::average $tw, $th, $data] 260 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
255 unless ($GL_NPOT) { 263 unless ($GL_NPOT) {
256 # TODO: does not work for zero-sized textures 264 # TODO: does not work for zero-sized textures
257 $tw = topot $tw; 265 $tw = topot $tw;
258 $th = topot $th; 266 $th = topot $th;
259 267
260 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 268 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
261 my $bpp = (length $data) / ($self->{w} * $self->{h}); 269 my $bpp = (length $data) / ($self->{w} * $self->{h});
262 $data = pack "(a" . ($tw * $bpp) . ")*", 270 $data = pack "(a" . ($tw * $bpp) . ")*",
263 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 271 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
264 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 272 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
265 } 273 }
266 } 274 }
267 275
268 $self->{s} = $self->{w} / $tw; 276 $self->{s} = $self->{w} / $tw;
269 $self->{t} = $self->{h} / $th; 277 $self->{t} = $self->{h} / $th;
270 278
271 glGetError;
272
273 $self->{name} ||= glGenTexture; 279 $self->{name} ||= glGenTexture;
274 280
275 glBindTexture GL_TEXTURE_2D, $self->{name}; 281 glBindTexture GL_TEXTURE_2D, $self->{name};
276 282
277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 283 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 284 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
279 285
280 if ($::FAST) { 286 if ($::FAST) {
281 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 287 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; 288 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
289 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
290 # alternatively check for 0x8191
291 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
292 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
293 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
283 } else { 294 } else {
284 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; 295 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 296 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
286 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR; 297 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
287 } 298 }
288 299
300 glGetError;
301
289 if (defined $data) { 302 if (defined $data) {
290 glTexImage2D GL_TEXTURE_2D, 0, 303 glTexImage2D GL_TEXTURE_2D, 0,
291 $self->{internalformat}, 304 $self->{internalformat},
292 $tw, $th, # need to pad texture first 305 $tw, $th, # need to pad texture first
293 0, 306 0,
294 $self->{format}, 307 $self->{format},
295 $self->{type}, 308 $self->{type},
296 $data; 309 $data;
297 if (my $error = glGetError) { 310 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
298 warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
299 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; 311 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
300 }
301 } else { 312 } else {
302 glCopyTexImage2D GL_TEXTURE_2D, 0, 313 glCopyTexImage2D GL_TEXTURE_2D, 0,
303 $self->{internalformat}, 314 $self->{internalformat},
304 0, 0, 315 0, 0,
305 $tw, $th, 316 $tw, $th,
306 0; 317 0;
307 glGetError and die "glCopyTexImage2D $tw,$th"; 318 CFClient::gl_check "copying to texture %dx%d if=%x",
319 $tw, $th, $self->{internalformat};
308 } 320 }
309} 321}
310 322
311sub DESTROY { 323sub DESTROY {
312 my ($self) = @_; 324 my ($self) = @_;

Diff Legend

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