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.51 by root, Sun May 14 20:51:19 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";
… …
109 new CFClient::Database 117 new CFClient::Database
110 -Env => $DB_ENV, 118 -Env => $DB_ENV,
111 -Filename => $table, 119 -Filename => $table,
112# -Filename => "database", 120# -Filename => "database",
113# -Subname => $table, 121# -Subname => $table,
122 -Property => DB_CHKSUM,
114 -Flags => DB_CREATE | DB_UPGRADE, 123 -Flags => DB_CREATE | DB_UPGRADE,
115 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 124 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
116} 125}
117 126
118package CFClient::Database; 127package CFClient::Database;
… …
193#} 202#}
194 203
195sub new_from_layout { 204sub new_from_layout {
196 my ($class, $layout, %arg) = @_; 205 my ($class, $layout, %arg) = @_;
197 206
198 my ($w, $h, $data) = $layout->render; 207 my ($w, $h, $data, $format, $internalformat) = $layout->render;
199 208
200 $class->new ( 209 $class->new (
201 w => $w, 210 w => $w,
202 h => $h, 211 h => $h,
203 data => $data, 212 data => $data,
204 internalformat => GL_ALPHA4,
205 format => GL_ALPHA, 213 format => $format,
214 internalformat => $format,
206 type => GL_UNSIGNED_BYTE, 215 type => GL_UNSIGNED_BYTE,
207 %arg, 216 %arg,
208 ) 217 )
209} 218}
210 219
211sub new_from_opengl { 220sub new_from_opengl {
212 my ($class, $w, $h, $cb) = @_; 221 my ($class, $w, $h, $cb) = @_;
213 222
214 $class->new (w => $w, h => $h, render_cb => $cb) 223 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
215} 224}
216 225
217sub topot { 226sub topot {
218 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 227 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
219} 228}
… …
242 = CFClient::load_image_inline $self->{image}; 251 = CFClient::load_image_inline $self->{image};
243 } 252 }
244 253
245 my ($tw, $th) = @$self{qw(w h)}; 254 my ($tw, $th) = @$self{qw(w h)};
246 255
247 unless ($tw && $th) { 256 unless ($tw > 0 && $th > 0) {
248 $tw = $th = 1; 257 $tw = $th = 1;
249 $data = "\x00" x 64; 258 $data = "\x00" x 64;
250 } 259 }
251 260
252 $self->{minified} = [CFClient::average $tw, $th, $data] 261 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
255 unless ($GL_NPOT) { 264 unless ($GL_NPOT) {
256 # TODO: does not work for zero-sized textures 265 # TODO: does not work for zero-sized textures
257 $tw = topot $tw; 266 $tw = topot $tw;
258 $th = topot $th; 267 $th = topot $th;
259 268
260 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 269 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
261 my $bpp = (length $data) / ($self->{w} * $self->{h}); 270 my $bpp = (length $data) / ($self->{w} * $self->{h});
262 $data = pack "(a" . ($tw * $bpp) . ")*", 271 $data = pack "(a" . ($tw * $bpp) . ")*",
263 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 272 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
264 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 273 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
265 } 274 }
266 } 275 }
267 276
268 $self->{s} = $self->{w} / $tw; 277 $self->{s} = $self->{w} / $tw;
269 $self->{t} = $self->{h} / $th; 278 $self->{t} = $self->{h} / $th;
270 279
271 glGetError;
272
273 $self->{name} ||= glGenTexture; 280 $self->{name} ||= glGenTexture;
274 281
275 glBindTexture GL_TEXTURE_2D, $self->{name}; 282 glBindTexture GL_TEXTURE_2D, $self->{name};
276 283
277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 284 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
279 286
280 if ($::FAST) { 287 if ($::FAST) {
281 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 288 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; 289 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
290 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
291 # alternatively check for 0x8191
292 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
293 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
294 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
283 } else { 295 } else {
284 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; 296 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 297 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; 298 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
287 } 299 }
288 300
301 glGetError;
302
289 if (defined $data) { 303 if (defined $data) {
290 glTexImage2D GL_TEXTURE_2D, 0, 304 glTexImage2D GL_TEXTURE_2D, 0,
291 $self->{internalformat}, 305 $self->{internalformat},
292 $tw, $th, # need to pad texture first 306 $tw, $th, # need to pad texture first
293 0, 307 0,
294 $self->{format}, 308 $self->{format},
295 $self->{type}, 309 $self->{type},
296 $data; 310 $data;
297 if (my $error = glGetError) { 311 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}; 312 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
300 }
301 } else { 313 } else {
302 glCopyTexImage2D GL_TEXTURE_2D, 0, 314 glCopyTexImage2D GL_TEXTURE_2D, 0,
303 $self->{internalformat}, 315 $self->{internalformat},
304 0, 0, 316 0, 0,
305 $tw, $th, 317 $tw, $th,
306 0; 318 0;
307 glGetError and die "glCopyTexImage2D $tw,$th"; 319 CFClient::gl_check "copying to texture %dx%d if=%x",
320 $tw, $th, $self->{internalformat};
308 } 321 }
309} 322}
310 323
311sub DESTROY { 324sub DESTROY {
312 my ($self) = @_; 325 my ($self) = @_;

Diff Legend

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