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.49 by root, Sun Apr 30 08:09:44 2006 UTC vs.
Revision 1.59 by elmex, Tue May 23 17:30:18 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) {
54 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_; 57 Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
55 } 58 }
56} 59}
57 60
58sub find_rcfile($) { 61sub find_rcfile($) {
59 my $path; 62 my $path;
… …
104 -Home => "$Crossfire::VARDIR/pclient", 107 -Home => "$Crossfire::VARDIR/pclient",
105 -Cachesize => 1_000_000, 108 -Cachesize => 1_000_000,
106 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 109 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
107# -ErrPrefix => "DATABASE", 110# -ErrPrefix => "DATABASE",
108 -Verbose => 1, 111 -Verbose => 1,
109 -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,
110 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";
111 114
112sub db_table($) { 115sub db_table($) {
113 my ($table) = @_; 116 my ($table) = @_;
114 117
… …
117 new CFClient::Database 120 new CFClient::Database
118 -Env => $DB_ENV, 121 -Env => $DB_ENV,
119 -Filename => $table, 122 -Filename => $table,
120# -Filename => "database", 123# -Filename => "database",
121# -Subname => $table, 124# -Subname => $table,
125 -Property => DB_CHKSUM,
122 -Flags => DB_CREATE | DB_UPGRADE, 126 -Flags => DB_CREATE | DB_UPGRADE,
123 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
136package CFClient::PodToPango;
137
138use base Pod::POM::View::Text;
139
140our $indent = 0;
141
142*view_seq_code =
143*view_seq_bold = sub { "<b>$_[1]</b>" };
144*view_seq_italic = sub { "<i>$_[1]</i>" };
145*view_seq_space =
146*view_seq_link =
147*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
148
149sub view_seq_text {
150 my $text = $_[1];
151 $text =~ s/\s+/ /g;
152 CFClient::UI::Label::escape ($text)
153}
154
155sub view_item {
156 ("\t" x ($indent / 4))
157 . $_[1]->title->present ($_[0])
158 . "\n"
159 . $_[1]->content->present ($_[0])
160}
161
162sub view_verbatim {
163 (join "",
164 map +("\t" x ($indent / 2)) . "$_\n",
165 split /\n/, CFClient::UI::Label::escape ($_[1]))
166 . "\n"
167}
168
169sub view_textblock {
170 ("\t" x ($indent / 2)) . "$_[1]\n\n"
171}
172
173sub view_head2 {
174 "<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"
175 . $_[1]->content->present ($_[0])
176};
177
178sub view_over {
179 local $indent = $indent + $_[1]->indent;
180 $_[1]->content->present ($_[0])
124} 181}
125 182
126package CFClient::Database; 183package CFClient::Database;
127 184
128our @ISA = BerkeleyDB::Btree::; 185our @ISA = BerkeleyDB::Btree::;
… …
201#} 258#}
202 259
203sub new_from_layout { 260sub new_from_layout {
204 my ($class, $layout, %arg) = @_; 261 my ($class, $layout, %arg) = @_;
205 262
206 my ($w, $h, $data) = $layout->render; 263 my ($w, $h, $data, $format, $internalformat) = $layout->render;
207 264
208 $class->new ( 265 $class->new (
209 w => $w, 266 w => $w,
210 h => $h, 267 h => $h,
211 data => $data, 268 data => $data,
212 format => GL_ALPHA, 269 format => $format,
213 internalformat => GL_ALPHA, 270 internalformat => $format,
214 type => GL_UNSIGNED_BYTE, 271 type => GL_UNSIGNED_BYTE,
215 %arg, 272 %arg,
216 ) 273 )
217} 274}
218 275
… …
300 glGetError; 357 glGetError;
301 358
302 if (defined $data) { 359 if (defined $data) {
303 glTexImage2D GL_TEXTURE_2D, 0, 360 glTexImage2D GL_TEXTURE_2D, 0,
304 $self->{internalformat}, 361 $self->{internalformat},
305 $tw, $th, # need to pad texture first 362 $tw, $th,
306 0, 363 0,
307 $self->{format}, 364 $self->{format},
308 $self->{type}, 365 $self->{type},
309 $data; 366 $data;
310 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x", 367 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
… …
316 $tw, $th, 373 $tw, $th,
317 0; 374 0;
318 CFClient::gl_check "copying to texture %dx%d if=%x", 375 CFClient::gl_check "copying to texture %dx%d if=%x",
319 $tw, $th, $self->{internalformat}; 376 $tw, $th, $self->{internalformat};
320 } 377 }
378
379 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
321} 380}
322 381
323sub DESTROY { 382sub DESTROY {
324 my ($self) = @_; 383 my ($self) = @_;
325 384
… …
327 386
328 glDeleteTexture delete $self->{name} 387 glDeleteTexture delete $self->{name}
329 if $self->{name}; 388 if $self->{name};
330} 389}
331 390
332sub restore_state{ 391sub restore_state {
333 $_->upload 392 $_->upload
334 for values %TEXTURES; 393 for values %TEXTURES;
335}; 394}
336 395
3371; 3961;
338 397
339=back 398=back
340 399

Diff Legend

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