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.54 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.60 by root, Tue May 23 23:14:44 2006 UTC

… …
36sub gl_init { 36sub gl_init {
37 $GL_VERSION = gl_version * 1; 37 $GL_VERSION = gl_version * 1;
38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
39 39
40 $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...
41 42
42 glDisable GL_COLOR_MATERIAL; 43 glDisable GL_COLOR_MATERIAL;
43 glShadeModel GL_FLAT; 44 glShadeModel GL_FLAT;
44 glDisable GL_DITHER; 45 glDisable GL_DITHER;
45 glDisable GL_DEPTH_TEST; 46 glDisable GL_DEPTH_TEST;
47 glDepthMask 0;
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 ();
49} 51}
50 52
51sub gl_check { 53sub gl_check {
52 return unless $GL_DEBUG; 54 return unless $GL_DEBUG;
53 55
54 if (my $error = glGetError) { 56 if (my $error = glGetError) {
55 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_; 57 Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
56 } 58 }
57} 59}
58 60
59sub find_rcfile($) { 61sub find_rcfile($) {
60 my $path; 62 my $path;
… …
105 -Home => "$Crossfire::VARDIR/pclient", 107 -Home => "$Crossfire::VARDIR/pclient",
106 -Cachesize => 1_000_000, 108 -Cachesize => 1_000_000,
107 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 109 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
108# -ErrPrefix => "DATABASE", 110# -ErrPrefix => "DATABASE",
109 -Verbose => 1, 111 -Verbose => 1,
110 -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,
111 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";
112 114
113sub db_table($) { 115sub db_table($) {
114 my ($table) = @_; 116 my ($table) = @_;
115 117
… …
129 my ($pom) = @_; 131 my ($pom) = @_;
130 132
131 $pom->present ("CFClient::PodToPango") 133 $pom->present ("CFClient::PodToPango")
132} 134}
133 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
134package CFClient::PodToPango; 145package CFClient::PodToPango;
135 146
136use base Pod::POM::View::Text; 147use base Pod::POM::View::Text;
137 148
138our $indent = 0; 149our $indent = 0;
… …
166 177
167sub view_textblock { 178sub view_textblock {
168 ("\t" x ($indent / 2)) . "$_[1]\n\n" 179 ("\t" x ($indent / 2)) . "$_[1]\n\n"
169} 180}
170 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
171sub view_head2 { 187sub view_head2 {
172 "<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n" 188 "<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
173 . $_[1]->content->present ($_[0]) 189 . $_[1]->content->present ($_[0])
174}; 190};
175 191
176sub view_over { 192sub view_over {
177 local $indent = $indent + $_[1]->indent; 193 local $indent = $indent + $_[1]->indent;
… …
371 $tw, $th, 387 $tw, $th,
372 0; 388 0;
373 CFClient::gl_check "copying to texture %dx%d if=%x", 389 CFClient::gl_check "copying to texture %dx%d if=%x",
374 $tw, $th, $self->{internalformat}; 390 $tw, $th, $self->{internalformat};
375 } 391 }
392
393 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
376} 394}
377 395
378sub DESTROY { 396sub DESTROY {
379 my ($self) = @_; 397 my ($self) = @_;
380 398

Diff Legend

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