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.51 by root, Sun May 14 20:51:19 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
… …
35sub gl_init { 36sub gl_init {
36 $GL_VERSION = gl_version * 1; 37 $GL_VERSION = gl_version * 1;
37 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
38 39
39 $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...
40 42
41 glDisable GL_COLOR_MATERIAL; 43 glDisable GL_COLOR_MATERIAL;
42 glShadeModel GL_FLAT; 44 glShadeModel GL_FLAT;
43 glDisable GL_DITHER; 45 glDisable GL_DITHER;
44 glDisable GL_DEPTH_TEST; 46 glDisable GL_DEPTH_TEST;
47 glDepthMask 0;
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 ();
48} 51}
49 52
50sub gl_check { 53sub gl_check {
51 return unless $GL_DEBUG; 54 return unless $GL_DEBUG;
52 55
53 if (my $error = glGetError) { 56 if (my $error = glGetError) {
57 my ($format, @args) = @_;
54 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_; 58 Carp::cluck sprintf "opengl error %x while $format", $error, @args;
55 } 59 }
56} 60}
57 61
58sub find_rcfile($) { 62sub find_rcfile($) {
59 my $path; 63 my $path;
… …
104 -Home => "$Crossfire::VARDIR/pclient", 108 -Home => "$Crossfire::VARDIR/pclient",
105 -Cachesize => 1_000_000, 109 -Cachesize => 1_000_000,
106 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 110 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
107# -ErrPrefix => "DATABASE", 111# -ErrPrefix => "DATABASE",
108 -Verbose => 1, 112 -Verbose => 1,
109 -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,
110 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";
111 115
112sub db_table($) { 116sub db_table($) {
113 my ($table) = @_; 117 my ($table) = @_;
114 118
… …
120# -Filename => "database", 124# -Filename => "database",
121# -Subname => $table, 125# -Subname => $table,
122 -Property => DB_CHKSUM, 126 -Property => DB_CHKSUM,
123 -Flags => DB_CREATE | DB_UPGRADE, 127 -Flags => DB_CREATE | DB_UPGRADE,
124 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])
125} 196}
126 197
127package CFClient::Database; 198package CFClient::Database;
128 199
129our @ISA = BerkeleyDB::Btree::; 200our @ISA = BerkeleyDB::Btree::;
… …
301 glGetError; 372 glGetError;
302 373
303 if (defined $data) { 374 if (defined $data) {
304 glTexImage2D GL_TEXTURE_2D, 0, 375 glTexImage2D GL_TEXTURE_2D, 0,
305 $self->{internalformat}, 376 $self->{internalformat},
306 $tw, $th, # need to pad texture first 377 $tw, $th,
307 0, 378 0,
308 $self->{format}, 379 $self->{format},
309 $self->{type}, 380 $self->{type},
310 $data; 381 $data;
311 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x", 382 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
… …
317 $tw, $th, 388 $tw, $th,
318 0; 389 0;
319 CFClient::gl_check "copying to texture %dx%d if=%x", 390 CFClient::gl_check "copying to texture %dx%d if=%x",
320 $tw, $th, $self->{internalformat}; 391 $tw, $th, $self->{internalformat};
321 } 392 }
393
394 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
322} 395}
323 396
324sub DESTROY { 397sub DESTROY {
325 my ($self) = @_; 398 my ($self) = @_;
326 399
… …
328 401
329 glDeleteTexture delete $self->{name} 402 glDeleteTexture delete $self->{name}
330 if $self->{name}; 403 if $self->{name};
331} 404}
332 405
333sub restore_state{ 406sub restore_state {
334 $_->upload 407 $_->upload
335 for values %TEXTURES; 408 for values %TEXTURES;
336}; 409}
337 410
3381; 4111;
339 412
340=back 413=back
341 414

Diff Legend

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