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.48 by root, Tue Apr 25 11:18:48 2006 UTC vs.
Revision 1.53 by root, Wed May 17 16:17:01 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;
39 41
40 glEnable GL_TEXTURE_2D;
41 glEnable GL_COLOR_MATERIAL; 42 glDisable GL_COLOR_MATERIAL;
42 glShadeModel GL_FLAT; 43 glShadeModel GL_FLAT;
44 glDisable GL_DITHER;
43 glDisable GL_DEPTH_TEST; 45 glDisable GL_DEPTH_TEST;
44 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
45
46 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 46 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
47 47
48 CFClient::Texture::restore_state (); 48 CFClient::Texture::restore_state ();
49}
50
51sub gl_check {
52 return unless $GL_DEBUG;
53
54 if (my $error = glGetError) {
55 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;
56 }
49} 57}
50 58
51sub find_rcfile($) { 59sub find_rcfile($) {
52 my $path; 60 my $path;
53 61
… …
110 new CFClient::Database 118 new CFClient::Database
111 -Env => $DB_ENV, 119 -Env => $DB_ENV,
112 -Filename => $table, 120 -Filename => $table,
113# -Filename => "database", 121# -Filename => "database",
114# -Subname => $table, 122# -Subname => $table,
123 -Property => DB_CHKSUM,
115 -Flags => DB_CREATE | DB_UPGRADE, 124 -Flags => DB_CREATE | DB_UPGRADE,
116 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 125 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
126}
127
128sub pod_to_pango($) {
129 my ($pom) = @_;
130
131 $pom->present ("CFClient::PodToPango")
132}
133
134package CFClient::PodToPango;
135
136use base Pod::POM::View::Text;
137
138our $indent = 0;
139
140*view_seq_code =
141*view_seq_bold = sub { "<b>$_[1]</b>" };
142*view_seq_italic = sub { "<i>$_[1]</i>" };
143*view_seq_space =
144*view_seq_link =
145*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
146
147sub view_seq_text {
148 my $text = $_[1];
149 $text =~ s/\s+/ /g;
150 CFClient::UI::Label::escape ($text)
151}
152
153sub view_item {
154 ("\t" x ($indent / 4))
155 . $_[1]->title->present ($_[0])
156 . "\n"
157 . $_[1]->content->present ($_[0])
158}
159
160sub view_verbatim {
161 (join "",
162 map +("\t" x ($indent / 2)) . "$_\n",
163 split /\n/, CFClient::UI::Label::escape ($_[1]))
164 . "\n"
165}
166
167sub view_textblock {
168 ("\t" x ($indent / 2)) . "$_[1]\n\n"
169}
170
171sub view_head2 {
172 "<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"
173 . $_[1]->content->present ($_[0])
174};
175
176sub view_over {
177 local $indent = $indent + $_[1]->indent;
178 $_[1]->content->present ($_[0])
117} 179}
118 180
119package CFClient::Database; 181package CFClient::Database;
120 182
121our @ISA = BerkeleyDB::Btree::; 183our @ISA = BerkeleyDB::Btree::;
… …
194#} 256#}
195 257
196sub new_from_layout { 258sub new_from_layout {
197 my ($class, $layout, %arg) = @_; 259 my ($class, $layout, %arg) = @_;
198 260
199 my ($w, $h, $data) = $layout->render; 261 my ($w, $h, $data, $format, $internalformat) = $layout->render;
200 262
201 $class->new ( 263 $class->new (
202 w => $w, 264 w => $w,
203 h => $h, 265 h => $h,
204 data => $data, 266 data => $data,
205 format => GL_ALPHA, 267 format => $format,
206 internalformat => GL_ALPHA, 268 internalformat => $format,
207 type => GL_UNSIGNED_BYTE, 269 type => GL_UNSIGNED_BYTE,
208 %arg, 270 %arg,
209 ) 271 )
210} 272}
211 273
… …
298 $tw, $th, # need to pad texture first 360 $tw, $th, # need to pad texture first
299 0, 361 0,
300 $self->{format}, 362 $self->{format},
301 $self->{type}, 363 $self->{type},
302 $data; 364 $data;
303 if (my $error = glGetError) { 365 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
304 Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x",
305 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; 366 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
306 }
307 } else { 367 } else {
308 glCopyTexImage2D GL_TEXTURE_2D, 0, 368 glCopyTexImage2D GL_TEXTURE_2D, 0,
309 $self->{internalformat}, 369 $self->{internalformat},
310 0, 0, 370 0, 0,
311 $tw, $th, 371 $tw, $th,
312 0; 372 0;
313 if (my $error = glGetError) { 373 CFClient::gl_check "copying to texture %dx%d if=%x",
314 Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
315 $error, $tw, $th, $self->{internalformat}; 374 $tw, $th, $self->{internalformat};
316 }
317 } 375 }
318} 376}
319 377
320sub DESTROY { 378sub DESTROY {
321 my ($self) = @_; 379 my ($self) = @_;

Diff Legend

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