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.44 by root, Mon Apr 24 08:22:20 2006 UTC vs.
Revision 1.60 by root, Tue May 23 23:14:44 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 Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
58 }
49} 59}
50 60
51sub find_rcfile($) { 61sub find_rcfile($) {
52 my $path; 62 my $path;
53 63
54 for (@INC) { 64 for (grep !ref, @INC) {
55 $path = "$_/CFClient/resources/$_[0]"; 65 $path = "$_/CFClient/resources/$_[0]";
56 return $path if -r $path; 66 return $path if -r $path;
57 } 67 }
58 68
59 die "FATAL: can't find required file $_[0]\n"; 69 die "FATAL: can't find required file $_[0]\n";
… …
97 -Home => "$Crossfire::VARDIR/pclient", 107 -Home => "$Crossfire::VARDIR/pclient",
98 -Cachesize => 1_000_000, 108 -Cachesize => 1_000_000,
99 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 109 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
100# -ErrPrefix => "DATABASE", 110# -ErrPrefix => "DATABASE",
101 -Verbose => 1, 111 -Verbose => 1,
102 -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,
103 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";
104 114
105sub db_table($) { 115sub db_table($) {
106 my ($table) = @_; 116 my ($table) = @_;
107 117
… …
110 new CFClient::Database 120 new CFClient::Database
111 -Env => $DB_ENV, 121 -Env => $DB_ENV,
112 -Filename => $table, 122 -Filename => $table,
113# -Filename => "database", 123# -Filename => "database",
114# -Subname => $table, 124# -Subname => $table,
125 -Property => DB_CHKSUM,
115 -Flags => DB_CREATE | DB_UPGRADE, 126 -Flags => DB_CREATE | DB_UPGRADE,
116 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])
117} 195}
118 196
119package CFClient::Database; 197package CFClient::Database;
120 198
121our @ISA = BerkeleyDB::Btree::; 199our @ISA = BerkeleyDB::Btree::;
… …
194#} 272#}
195 273
196sub new_from_layout { 274sub new_from_layout {
197 my ($class, $layout, %arg) = @_; 275 my ($class, $layout, %arg) = @_;
198 276
199 my ($w, $h, $data) = $layout->render; 277 my ($w, $h, $data, $format, $internalformat) = $layout->render;
200 278
201 $class->new ( 279 $class->new (
202 w => $w, 280 w => $w,
203 h => $h, 281 h => $h,
204 data => $data, 282 data => $data,
205 format => GL_ALPHA, 283 format => $format,
206 internalformat => GL_ALPHA, 284 internalformat => $format,
207 type => GL_UNSIGNED_BYTE, 285 type => GL_UNSIGNED_BYTE,
208 %arg, 286 %arg,
209 ) 287 )
210} 288}
211 289
212sub new_from_opengl { 290sub new_from_opengl {
213 my ($class, $w, $h, $cb) = @_; 291 my ($class, $w, $h, $cb) = @_;
214 292
215 $class->new (w => $w, h => $h, render_cb => $cb) 293 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
216} 294}
217 295
218sub topot { 296sub topot {
219 (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]
220} 298}
… …
243 = CFClient::load_image_inline $self->{image}; 321 = CFClient::load_image_inline $self->{image};
244 } 322 }
245 323
246 my ($tw, $th) = @$self{qw(w h)}; 324 my ($tw, $th) = @$self{qw(w h)};
247 325
248 unless ($tw && $th) { 326 unless ($tw > 0 && $th > 0) {
249 $tw = $th = 1; 327 $tw = $th = 1;
250 $data = "\x00" x 64; 328 $data = "\x00" x 64;
251 } 329 }
252 330
253 $self->{minified} = [CFClient::average $tw, $th, $data] 331 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
267 } 345 }
268 346
269 $self->{s} = $self->{w} / $tw; 347 $self->{s} = $self->{w} / $tw;
270 $self->{t} = $self->{h} / $th; 348 $self->{t} = $self->{h} / $th;
271 349
272 glGetError;
273
274 $self->{name} ||= glGenTexture; 350 $self->{name} ||= glGenTexture;
275 351
276 glBindTexture GL_TEXTURE_2D, $self->{name}; 352 glBindTexture GL_TEXTURE_2D, $self->{name};
277 353
278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 354 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
279 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 355 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
280 356
281 if ($::FAST) { 357 if ($::FAST) {
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 358 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
283 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;
284 } else { 365 } else {
285 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; 366 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
286 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 367 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; 368 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
288 } 369 }
289 370
371 glGetError;
372
290 if (defined $data) { 373 if (defined $data) {
291 glTexImage2D GL_TEXTURE_2D, 0, 374 glTexImage2D GL_TEXTURE_2D, 0,
292 $self->{internalformat}, 375 $self->{internalformat},
293 $tw, $th, # need to pad texture first 376 $tw, $th,
294 0, 377 0,
295 $self->{format}, 378 $self->{format},
296 $self->{type}, 379 $self->{type},
297 $data; 380 $data;
298 if (my $error = glGetError) { 381 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}; 382 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
301 }
302 } else { 383 } else {
303 glCopyTexImage2D GL_TEXTURE_2D, 0, 384 glCopyTexImage2D GL_TEXTURE_2D, 0,
304 $self->{internalformat}, 385 $self->{internalformat},
305 0, 0, 386 0, 0,
306 $tw, $th, 387 $tw, $th,
307 0; 388 0;
308 if (my $error = glGetError) { 389 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}; 390 $tw, $th, $self->{internalformat};
311 }
312 } 391 }
392
393 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
313} 394}
314 395
315sub DESTROY { 396sub DESTROY {
316 my ($self) = @_; 397 my ($self) = @_;
317 398
… …
319 400
320 glDeleteTexture delete $self->{name} 401 glDeleteTexture delete $self->{name}
321 if $self->{name}; 402 if $self->{name};
322} 403}
323 404
324sub restore_state{ 405sub restore_state {
325 $_->upload 406 $_->upload
326 for values %TEXTURES; 407 for values %TEXTURES;
327}; 408}
328 409
3291; 4101;
330 411
331=back 412=back
332 413

Diff Legend

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