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.43 by root, Fri Apr 21 07:19:56 2006 UTC vs.
Revision 1.61 by root, Wed May 24 21:49:58 2006 UTC

… …
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use Carp (); 24use Carp ();
25use AnyEvent; 25use AnyEvent ();
26use BerkeleyDB; 26use BerkeleyDB;
27
27use CFClient::OpenGL; 28use CFClient::OpenGL;
28 29
29our %GL_EXT; 30our %GL_EXT;
30our $GL_VERSION; 31our $GL_VERSION;
31 32
32our $GL_NPOT; 33our $GL_NPOT;
34our $GL_DEBUG = 1;
33 35
34sub gl_init { 36sub gl_init {
35 $GL_VERSION = gl_version * 1; 37 $GL_VERSION = gl_version * 1;
36 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
37 39
38 $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...
39 42
40 glEnable GL_TEXTURE_2D;
41 glEnable GL_COLOR_MATERIAL; 43 glDisable GL_COLOR_MATERIAL;
42 glShadeModel GL_FLAT; 44 glShadeModel GL_FLAT;
45 glDisable GL_DITHER;
43 glDisable GL_DEPTH_TEST; 46 glDisable GL_DEPTH_TEST;
44 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 47 glDepthMask 0;
45
46 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 48 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
47 49
48 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 }
49} 60}
50 61
51sub find_rcfile($) { 62sub find_rcfile($) {
52 my $path; 63 my $path;
53 64
54 for (@INC) { 65 for (grep !ref, @INC) {
55 $path = "$_/CFClient/resources/$_[0]"; 66 $path = "$_/CFClient/resources/$_[0]";
56 return $path if -r $path; 67 return $path if -r $path;
57 } 68 }
58 69
59 die "FATAL: can't find required file $_[0]\n"; 70 die "FATAL: can't find required file $_[0]\n";
… …
97 -Home => "$Crossfire::VARDIR/pclient", 108 -Home => "$Crossfire::VARDIR/pclient",
98 -Cachesize => 1_000_000, 109 -Cachesize => 1_000_000,
99 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 110 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
100# -ErrPrefix => "DATABASE", 111# -ErrPrefix => "DATABASE",
101 -Verbose => 1, 112 -Verbose => 1,
102 -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,
103 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";
104 115
105sub db_table($) { 116sub db_table($) {
106 my ($table) = @_; 117 my ($table) = @_;
107 118
… …
110 new CFClient::Database 121 new CFClient::Database
111 -Env => $DB_ENV, 122 -Env => $DB_ENV,
112 -Filename => $table, 123 -Filename => $table,
113# -Filename => "database", 124# -Filename => "database",
114# -Subname => $table, 125# -Subname => $table,
126 -Property => DB_CHKSUM,
115 -Flags => DB_CREATE | DB_UPGRADE, 127 -Flags => DB_CREATE | DB_UPGRADE,
116 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])
117} 196}
118 197
119package CFClient::Database; 198package CFClient::Database;
120 199
121our @ISA = BerkeleyDB::Btree::; 200our @ISA = BerkeleyDB::Btree::;
… …
194#} 273#}
195 274
196sub new_from_layout { 275sub new_from_layout {
197 my ($class, $layout, %arg) = @_; 276 my ($class, $layout, %arg) = @_;
198 277
199 my ($w, $h, $data) = $layout->render; 278 my ($w, $h, $data, $format, $internalformat) = $layout->render;
200 279
201 $class->new ( 280 $class->new (
202 w => $w, 281 w => $w,
203 h => $h, 282 h => $h,
204 data => $data, 283 data => $data,
205 internalformat => GL_ALPHA4,
206 format => GL_ALPHA, 284 format => $format,
285 internalformat => $format,
207 type => GL_UNSIGNED_BYTE, 286 type => GL_UNSIGNED_BYTE,
208 %arg, 287 %arg,
209 ) 288 )
210} 289}
211 290
212sub new_from_opengl { 291sub new_from_opengl {
213 my ($class, $w, $h, $cb) = @_; 292 my ($class, $w, $h, $cb) = @_;
214 293
215 $class->new (w => $w, h => $h, render_cb => $cb) 294 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
216} 295}
217 296
218sub topot { 297sub topot {
219 (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]
220} 299}
… …
243 = CFClient::load_image_inline $self->{image}; 322 = CFClient::load_image_inline $self->{image};
244 } 323 }
245 324
246 my ($tw, $th) = @$self{qw(w h)}; 325 my ($tw, $th) = @$self{qw(w h)};
247 326
248 unless ($tw && $th) { 327 unless ($tw > 0 && $th > 0) {
249 $tw = $th = 1; 328 $tw = $th = 1;
250 $data = "\x00" x 64; 329 $data = "\x00" x 64;
251 } 330 }
252 331
253 $self->{minified} = [CFClient::average $tw, $th, $data] 332 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
267 } 346 }
268 347
269 $self->{s} = $self->{w} / $tw; 348 $self->{s} = $self->{w} / $tw;
270 $self->{t} = $self->{h} / $th; 349 $self->{t} = $self->{h} / $th;
271 350
272 glGetError;
273
274 $self->{name} ||= glGenTexture; 351 $self->{name} ||= glGenTexture;
275 352
276 glBindTexture GL_TEXTURE_2D, $self->{name}; 353 glBindTexture GL_TEXTURE_2D, $self->{name};
277 354
278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 355 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
279 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 356 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
280 357
281 if ($::FAST) { 358 if ($::FAST) {
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 359 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
283 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;
284 } else { 366 } else {
285 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; 367 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
286 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 368 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
287 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;
288 } 370 }
289 371
372 glGetError;
373
290 if (defined $data) { 374 if (defined $data) {
291 glTexImage2D GL_TEXTURE_2D, 0, 375 glTexImage2D GL_TEXTURE_2D, 0,
292 $self->{internalformat}, 376 $self->{internalformat},
293 $tw, $th, # need to pad texture first 377 $tw, $th,
294 0, 378 0,
295 $self->{format}, 379 $self->{format},
296 $self->{type}, 380 $self->{type},
297 $data; 381 $data;
298 if (my $error = glGetError) { 382 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
299 Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x",
300 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; 383 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
301 }
302 } else { 384 } else {
303 glCopyTexImage2D GL_TEXTURE_2D, 0, 385 glCopyTexImage2D GL_TEXTURE_2D, 0,
304 $self->{internalformat}, 386 $self->{internalformat},
305 0, 0, 387 0, 0,
306 $tw, $th, 388 $tw, $th,
307 0; 389 0;
308 if (my $error = glGetError) { 390 CFClient::gl_check "copying to texture %dx%d if=%x",
309 Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
310 $error, $tw, $th, $self->{internalformat}; 391 $tw, $th, $self->{internalformat};
311 }
312 } 392 }
393
394 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
313} 395}
314 396
315sub DESTROY { 397sub DESTROY {
316 my ($self) = @_; 398 my ($self) = @_;
317 399
… …
319 401
320 glDeleteTexture delete $self->{name} 402 glDeleteTexture delete $self->{name}
321 if $self->{name}; 403 if $self->{name};
322} 404}
323 405
324sub restore_state{ 406sub restore_state {
325 $_->upload 407 $_->upload
326 for values %TEXTURES; 408 for values %TEXTURES;
327}; 409}
328 410
3291; 4111;
330 412
331=back 413=back
332 414

Diff Legend

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