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

Diff Legend

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