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.60 by root, Tue May 23 23:14:44 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;
27
26use CFClient::OpenGL; 28use CFClient::OpenGL;
27 29
28our %GL_EXT; 30our %GL_EXT;
29our $GL_VERSION; 31our $GL_VERSION;
30 32
31our $GL_NPOT; 33our $GL_NPOT;
34our $GL_DEBUG = 1;
32 35
33sub gl_init { 36sub gl_init {
34 $GL_VERSION = gl_version * 1; 37 $GL_VERSION = gl_version * 1;
35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36 39
37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 40 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
41 $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
38 42
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL; 43 glDisable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT; 44 glShadeModel GL_FLAT;
45 glDisable GL_DITHER;
42 glDisable GL_DEPTH_TEST; 46 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 47 glDepthMask 0;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 48 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46 49
47 CFClient::Texture::restore_state (); 50 CFClient::Texture::restore_state ();
51}
52
53sub gl_check {
54 return unless $GL_DEBUG;
55
56 if (my $error = glGetError) {
57 Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
58 }
48} 59}
49 60
50sub find_rcfile($) { 61sub find_rcfile($) {
51 my $path; 62 my $path;
52 63
53 for (@INC) { 64 for (grep !ref, @INC) {
54 $path = "$_/CFClient/resources/$_[0]"; 65 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path; 66 return $path if -r $path;
56 } 67 }
57 68
58 die "FATAL: can't find required file $_[0]\n"; 69 die "FATAL: can't find required file $_[0]\n";
… …
96 -Home => "$Crossfire::VARDIR/pclient", 107 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000, 108 -Cachesize => 1_000_000,
98 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 109 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99# -ErrPrefix => "DATABASE", 110# -ErrPrefix => "DATABASE",
100 -Verbose => 1, 111 -Verbose => 1,
101 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 112 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 113 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
103 114
104sub db_table($) { 115sub db_table($) {
105 my ($table) = @_; 116 my ($table) = @_;
106 117
… …
109 new CFClient::Database 120 new CFClient::Database
110 -Env => $DB_ENV, 121 -Env => $DB_ENV,
111 -Filename => $table, 122 -Filename => $table,
112# -Filename => "database", 123# -Filename => "database",
113# -Subname => $table, 124# -Subname => $table,
125 -Property => DB_CHKSUM,
114 -Flags => DB_CREATE | DB_UPGRADE, 126 -Flags => DB_CREATE | DB_UPGRADE,
115 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 127 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
128}
129
130sub pod_to_pango($) {
131 my ($pom) = @_;
132
133 $pom->present ("CFClient::PodToPango")
134}
135
136sub pod_to_pango_list($) {
137 my ($pom) = @_;
138
139 [
140 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
141 split /\n/, $pom->present ("CFClient::PodToPango")
142 ]
143}
144
145package CFClient::PodToPango;
146
147use base Pod::POM::View::Text;
148
149our $indent = 0;
150
151*view_seq_code =
152*view_seq_bold = sub { "<b>$_[1]</b>" };
153*view_seq_italic = sub { "<i>$_[1]</i>" };
154*view_seq_space =
155*view_seq_link =
156*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
157
158sub view_seq_text {
159 my $text = $_[1];
160 $text =~ s/\s+/ /g;
161 CFClient::UI::Label::escape ($text)
162}
163
164sub view_item {
165 ("\t" x ($indent / 4))
166 . $_[1]->title->present ($_[0])
167 . "\n"
168 . $_[1]->content->present ($_[0])
169}
170
171sub view_verbatim {
172 (join "",
173 map +("\t" x ($indent / 2)) . "$_\n",
174 split /\n/, CFClient::UI::Label::escape ($_[1]))
175 . "\n"
176}
177
178sub view_textblock {
179 ("\t" x ($indent / 2)) . "$_[1]\n\n"
180}
181
182sub view_head1 {
183 "<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
184 . $_[1]->content->present ($_[0])
185};
186
187sub view_head2 {
188 "<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
189 . $_[1]->content->present ($_[0])
190};
191
192sub view_over {
193 local $indent = $indent + $_[1]->indent;
194 $_[1]->content->present ($_[0])
116} 195}
117 196
118package CFClient::Database; 197package CFClient::Database;
119 198
120our @ISA = BerkeleyDB::Btree::; 199our @ISA = BerkeleyDB::Btree::;
… …
193#} 272#}
194 273
195sub new_from_layout { 274sub new_from_layout {
196 my ($class, $layout, %arg) = @_; 275 my ($class, $layout, %arg) = @_;
197 276
198 my ($w, $h, $data) = $layout->render; 277 my ($w, $h, $data, $format, $internalformat) = $layout->render;
199 278
200 $class->new ( 279 $class->new (
201 w => $w, 280 w => $w,
202 h => $h, 281 h => $h,
203 data => $data, 282 data => $data,
204 internalformat => GL_ALPHA4,
205 format => GL_ALPHA, 283 format => $format,
284 internalformat => $format,
206 type => GL_UNSIGNED_BYTE, 285 type => GL_UNSIGNED_BYTE,
207 %arg, 286 %arg,
208 ) 287 )
209} 288}
210 289
211sub new_from_opengl { 290sub new_from_opengl {
212 my ($class, $w, $h, $cb) = @_; 291 my ($class, $w, $h, $cb) = @_;
213 292
214 $class->new (w => $w, h => $h, render_cb => $cb) 293 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
215} 294}
216 295
217sub topot { 296sub topot {
218 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 297 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
219} 298}
… …
242 = CFClient::load_image_inline $self->{image}; 321 = CFClient::load_image_inline $self->{image};
243 } 322 }
244 323
245 my ($tw, $th) = @$self{qw(w h)}; 324 my ($tw, $th) = @$self{qw(w h)};
246 325
247 unless ($tw && $th) { 326 unless ($tw > 0 && $th > 0) {
248 $tw = $th = 1; 327 $tw = $th = 1;
249 $data = "\x00" x 64; 328 $data = "\x00" x 64;
250 } 329 }
251 330
252 $self->{minified} = [CFClient::average $tw, $th, $data] 331 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
255 unless ($GL_NPOT) { 334 unless ($GL_NPOT) {
256 # TODO: does not work for zero-sized textures 335 # TODO: does not work for zero-sized textures
257 $tw = topot $tw; 336 $tw = topot $tw;
258 $th = topot $th; 337 $th = topot $th;
259 338
260 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 339 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
261 my $bpp = (length $data) / ($self->{w} * $self->{h}); 340 my $bpp = (length $data) / ($self->{w} * $self->{h});
262 $data = pack "(a" . ($tw * $bpp) . ")*", 341 $data = pack "(a" . ($tw * $bpp) . ")*",
263 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 342 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
264 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 343 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
265 } 344 }
266 } 345 }
267 346
268 $self->{s} = $self->{w} / $tw; 347 $self->{s} = $self->{w} / $tw;
269 $self->{t} = $self->{h} / $th; 348 $self->{t} = $self->{h} / $th;
270 349
271 glGetError;
272
273 $self->{name} ||= glGenTexture; 350 $self->{name} ||= glGenTexture;
274 351
275 glBindTexture GL_TEXTURE_2D, $self->{name}; 352 glBindTexture GL_TEXTURE_2D, $self->{name};
276 353
277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 354 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 355 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
279 356
280 if ($::FAST) { 357 if ($::FAST) {
281 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 358 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; 359 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
360 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
361 # alternatively check for 0x8191
362 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
363 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
364 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
283 } else { 365 } else {
284 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; 366 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 367 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; 368 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
287 } 369 }
288 370
371 glGetError;
372
289 if (defined $data) { 373 if (defined $data) {
290 glTexImage2D GL_TEXTURE_2D, 0, 374 glTexImage2D GL_TEXTURE_2D, 0,
291 $self->{internalformat}, 375 $self->{internalformat},
292 $tw, $th, # need to pad texture first 376 $tw, $th,
293 0, 377 0,
294 $self->{format}, 378 $self->{format},
295 $self->{type}, 379 $self->{type},
296 $data; 380 $data;
297 if (my $error = glGetError) { 381 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}; 382 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
300 }
301 } else { 383 } else {
302 glCopyTexImage2D GL_TEXTURE_2D, 0, 384 glCopyTexImage2D GL_TEXTURE_2D, 0,
303 $self->{internalformat}, 385 $self->{internalformat},
304 0, 0, 386 0, 0,
305 $tw, $th, 387 $tw, $th,
306 0; 388 0;
307 glGetError and die "glCopyTexImage2D $tw,$th"; 389 CFClient::gl_check "copying to texture %dx%d if=%x",
390 $tw, $th, $self->{internalformat};
308 } 391 }
392
393 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
309} 394}
310 395
311sub DESTROY { 396sub DESTROY {
312 my ($self) = @_; 397 my ($self) = @_;
313 398
… …
315 400
316 glDeleteTexture delete $self->{name} 401 glDeleteTexture delete $self->{name}
317 if $self->{name}; 402 if $self->{name};
318} 403}
319 404
320sub restore_state{ 405sub restore_state {
321 $_->upload 406 $_->upload
322 for values %TEXTURES; 407 for values %TEXTURES;
323}; 408}
324 409
3251; 4101;
326 411
327=back 412=back
328 413

Diff Legend

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