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.42 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC

… …
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use Carp ();
24use AnyEvent; 25use AnyEvent ();
25use BerkeleyDB; 26use BerkeleyDB;
27
26use CFClient::OpenGL; 28use CFClient::OpenGL;
27 29
28our %GL_EXT; 30our %GL_EXT;
29our $GL_VERSION; 31our $GL_VERSION;
30 32
31our $GL_NPOT; 33our $GL_NPOT;
34our $GL_DEBUG = 1;
32 35
33sub gl_init { 36sub gl_init {
34 $GL_VERSION = gl_version * 1; 37 $GL_VERSION = gl_version * 1;
35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36 39
37 $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;
38 41
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL; 42 glDisable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT; 43 glShadeModel GL_FLAT;
44 glDisable GL_DITHER;
42 glDisable GL_DEPTH_TEST; 45 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 46 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46 47
47 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 }
48} 57}
49 58
50sub find_rcfile($) { 59sub find_rcfile($) {
51 my $path; 60 my $path;
52 61
53 for (@INC) { 62 for (grep !ref, @INC) {
54 $path = "$_/CFClient/resources/$_[0]"; 63 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path; 64 return $path if -r $path;
56 } 65 }
57 66
58 die "FATAL: can't find required file $_[0]\n"; 67 die "FATAL: can't find required file $_[0]\n";
… …
109 new CFClient::Database 118 new CFClient::Database
110 -Env => $DB_ENV, 119 -Env => $DB_ENV,
111 -Filename => $table, 120 -Filename => $table,
112# -Filename => "database", 121# -Filename => "database",
113# -Subname => $table, 122# -Subname => $table,
123 -Property => DB_CHKSUM,
114 -Flags => DB_CREATE | DB_UPGRADE, 124 -Flags => DB_CREATE | DB_UPGRADE,
115 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_textblock {
161 ("\t" x ($indent / 2)) . "$_[1]\n\n"
162}
163
164sub view_head2 {
165 "<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"
166 . $_[1]->content->present ($_[0])
167};
168
169sub view_over {
170 local $indent = $indent + $_[1]->indent;
171 $_[1]->content->present ($_[0])
116} 172}
117 173
118package CFClient::Database; 174package CFClient::Database;
119 175
120our @ISA = BerkeleyDB::Btree::; 176our @ISA = BerkeleyDB::Btree::;
… …
193#} 249#}
194 250
195sub new_from_layout { 251sub new_from_layout {
196 my ($class, $layout, %arg) = @_; 252 my ($class, $layout, %arg) = @_;
197 253
198 my ($w, $h, $data) = $layout->render; 254 my ($w, $h, $data, $format, $internalformat) = $layout->render;
199 255
200 $class->new ( 256 $class->new (
201 w => $w, 257 w => $w,
202 h => $h, 258 h => $h,
203 data => $data, 259 data => $data,
204 internalformat => GL_ALPHA4,
205 format => GL_ALPHA, 260 format => $format,
261 internalformat => $format,
206 type => GL_UNSIGNED_BYTE, 262 type => GL_UNSIGNED_BYTE,
207 %arg, 263 %arg,
208 ) 264 )
209} 265}
210 266
211sub new_from_opengl { 267sub new_from_opengl {
212 my ($class, $w, $h, $cb) = @_; 268 my ($class, $w, $h, $cb) = @_;
213 269
214 $class->new (w => $w, h => $h, render_cb => $cb) 270 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
215} 271}
216 272
217sub topot { 273sub topot {
218 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 274 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
219} 275}
… …
242 = CFClient::load_image_inline $self->{image}; 298 = CFClient::load_image_inline $self->{image};
243 } 299 }
244 300
245 my ($tw, $th) = @$self{qw(w h)}; 301 my ($tw, $th) = @$self{qw(w h)};
246 302
247 unless ($tw && $th) { 303 unless ($tw > 0 && $th > 0) {
248 $tw = $th = 1; 304 $tw = $th = 1;
249 $data = "\x00" x 64; 305 $data = "\x00" x 64;
250 } 306 }
251 307
252 $self->{minified} = [CFClient::average $tw, $th, $data] 308 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
255 unless ($GL_NPOT) { 311 unless ($GL_NPOT) {
256 # TODO: does not work for zero-sized textures 312 # TODO: does not work for zero-sized textures
257 $tw = topot $tw; 313 $tw = topot $tw;
258 $th = topot $th; 314 $th = topot $th;
259 315
260 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 316 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
261 my $bpp = (length $data) / ($self->{w} * $self->{h}); 317 my $bpp = (length $data) / ($self->{w} * $self->{h});
262 $data = pack "(a" . ($tw * $bpp) . ")*", 318 $data = pack "(a" . ($tw * $bpp) . ")*",
263 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 319 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
264 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 320 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
265 } 321 }
266 } 322 }
267 323
268 $self->{s} = $self->{w} / $tw; 324 $self->{s} = $self->{w} / $tw;
269 $self->{t} = $self->{h} / $th; 325 $self->{t} = $self->{h} / $th;
270 326
271 glGetError;
272
273 $self->{name} ||= glGenTexture; 327 $self->{name} ||= glGenTexture;
274 328
275 glBindTexture GL_TEXTURE_2D, $self->{name}; 329 glBindTexture GL_TEXTURE_2D, $self->{name};
276 330
277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 331 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 332 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
279 333
280 if ($::FAST) { 334 if ($::FAST) {
281 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 335 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; 336 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
337 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
338 # alternatively check for 0x8191
339 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
340 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
341 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
283 } else { 342 } else {
284 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; 343 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 344 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
286 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR; 345 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
287 } 346 }
288 347
348 glGetError;
349
289 if (defined $data) { 350 if (defined $data) {
290 glTexImage2D GL_TEXTURE_2D, 0, 351 glTexImage2D GL_TEXTURE_2D, 0,
291 $self->{internalformat}, 352 $self->{internalformat},
292 $tw, $th, # need to pad texture first 353 $tw, $th, # need to pad texture first
293 0, 354 0,
294 $self->{format}, 355 $self->{format},
295 $self->{type}, 356 $self->{type},
296 $data; 357 $data;
297 if (my $error = glGetError) { 358 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
298 warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
299 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; 359 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
300 }
301 } else { 360 } else {
302 glCopyTexImage2D GL_TEXTURE_2D, 0, 361 glCopyTexImage2D GL_TEXTURE_2D, 0,
303 $self->{internalformat}, 362 $self->{internalformat},
304 0, 0, 363 0, 0,
305 $tw, $th, 364 $tw, $th,
306 0; 365 0;
307 glGetError and die "glCopyTexImage2D $tw,$th"; 366 CFClient::gl_check "copying to texture %dx%d if=%x",
367 $tw, $th, $self->{internalformat};
308 } 368 }
309} 369}
310 370
311sub DESTROY { 371sub DESTROY {
312 my ($self) = @_; 372 my ($self) = @_;

Diff Legend

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