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.57 by root, Sun May 21 00:02:00 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; 46 glDepthMask 0;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 47 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46 48
47 CFClient::Texture::restore_state (); 49 CFClient::Texture::restore_state ();
50}
51
52sub gl_check {
53 return unless $GL_DEBUG;
54
55 if (my $error = glGetError) {
56 Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
57 }
48} 58}
49 59
50sub find_rcfile($) { 60sub find_rcfile($) {
51 my $path; 61 my $path;
52 62
53 for (@INC) { 63 for (grep !ref, @INC) {
54 $path = "$_/CFClient/resources/$_[0]"; 64 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path; 65 return $path if -r $path;
56 } 66 }
57 67
58 die "FATAL: can't find required file $_[0]\n"; 68 die "FATAL: can't find required file $_[0]\n";
… …
109 new CFClient::Database 119 new CFClient::Database
110 -Env => $DB_ENV, 120 -Env => $DB_ENV,
111 -Filename => $table, 121 -Filename => $table,
112# -Filename => "database", 122# -Filename => "database",
113# -Subname => $table, 123# -Subname => $table,
124 -Property => DB_CHKSUM,
114 -Flags => DB_CREATE | DB_UPGRADE, 125 -Flags => DB_CREATE | DB_UPGRADE,
115 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 126 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
127}
128
129sub pod_to_pango($) {
130 my ($pom) = @_;
131
132 $pom->present ("CFClient::PodToPango")
133}
134
135package CFClient::PodToPango;
136
137use base Pod::POM::View::Text;
138
139our $indent = 0;
140
141*view_seq_code =
142*view_seq_bold = sub { "<b>$_[1]</b>" };
143*view_seq_italic = sub { "<i>$_[1]</i>" };
144*view_seq_space =
145*view_seq_link =
146*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
147
148sub view_seq_text {
149 my $text = $_[1];
150 $text =~ s/\s+/ /g;
151 CFClient::UI::Label::escape ($text)
152}
153
154sub view_item {
155 ("\t" x ($indent / 4))
156 . $_[1]->title->present ($_[0])
157 . "\n"
158 . $_[1]->content->present ($_[0])
159}
160
161sub view_verbatim {
162 (join "",
163 map +("\t" x ($indent / 2)) . "$_\n",
164 split /\n/, CFClient::UI::Label::escape ($_[1]))
165 . "\n"
166}
167
168sub view_textblock {
169 ("\t" x ($indent / 2)) . "$_[1]\n\n"
170}
171
172sub view_head2 {
173 "<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"
174 . $_[1]->content->present ($_[0])
175};
176
177sub view_over {
178 local $indent = $indent + $_[1]->indent;
179 $_[1]->content->present ($_[0])
116} 180}
117 181
118package CFClient::Database; 182package CFClient::Database;
119 183
120our @ISA = BerkeleyDB::Btree::; 184our @ISA = BerkeleyDB::Btree::;
… …
193#} 257#}
194 258
195sub new_from_layout { 259sub new_from_layout {
196 my ($class, $layout, %arg) = @_; 260 my ($class, $layout, %arg) = @_;
197 261
198 my ($w, $h, $data) = $layout->render; 262 my ($w, $h, $data, $format, $internalformat) = $layout->render;
199 263
200 $class->new ( 264 $class->new (
201 w => $w, 265 w => $w,
202 h => $h, 266 h => $h,
203 data => $data, 267 data => $data,
204 internalformat => GL_ALPHA4,
205 format => GL_ALPHA, 268 format => $format,
269 internalformat => $format,
206 type => GL_UNSIGNED_BYTE, 270 type => GL_UNSIGNED_BYTE,
207 %arg, 271 %arg,
208 ) 272 )
209} 273}
210 274
211sub new_from_opengl { 275sub new_from_opengl {
212 my ($class, $w, $h, $cb) = @_; 276 my ($class, $w, $h, $cb) = @_;
213 277
214 $class->new (w => $w, h => $h, render_cb => $cb) 278 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
215} 279}
216 280
217sub topot { 281sub topot {
218 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 282 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
219} 283}
… …
242 = CFClient::load_image_inline $self->{image}; 306 = CFClient::load_image_inline $self->{image};
243 } 307 }
244 308
245 my ($tw, $th) = @$self{qw(w h)}; 309 my ($tw, $th) = @$self{qw(w h)};
246 310
247 unless ($tw && $th) { 311 unless ($tw > 0 && $th > 0) {
248 $tw = $th = 1; 312 $tw = $th = 1;
249 $data = "\x00" x 64; 313 $data = "\x00" x 64;
250 } 314 }
251 315
252 $self->{minified} = [CFClient::average $tw, $th, $data] 316 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
255 unless ($GL_NPOT) { 319 unless ($GL_NPOT) {
256 # TODO: does not work for zero-sized textures 320 # TODO: does not work for zero-sized textures
257 $tw = topot $tw; 321 $tw = topot $tw;
258 $th = topot $th; 322 $th = topot $th;
259 323
260 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 324 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
261 my $bpp = (length $data) / ($self->{w} * $self->{h}); 325 my $bpp = (length $data) / ($self->{w} * $self->{h});
262 $data = pack "(a" . ($tw * $bpp) . ")*", 326 $data = pack "(a" . ($tw * $bpp) . ")*",
263 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 327 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
264 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 328 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
265 } 329 }
266 } 330 }
267 331
268 $self->{s} = $self->{w} / $tw; 332 $self->{s} = $self->{w} / $tw;
269 $self->{t} = $self->{h} / $th; 333 $self->{t} = $self->{h} / $th;
270 334
271 glGetError;
272
273 $self->{name} ||= glGenTexture; 335 $self->{name} ||= glGenTexture;
274 336
275 glBindTexture GL_TEXTURE_2D, $self->{name}; 337 glBindTexture GL_TEXTURE_2D, $self->{name};
276 338
277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 339 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 340 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
279 341
280 if ($::FAST) { 342 if ($::FAST) {
281 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 343 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; 344 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
345 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
346 # alternatively check for 0x8191
347 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
348 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
349 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
283 } else { 350 } else {
284 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; 351 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 352 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; 353 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
287 } 354 }
288 355
356 glGetError;
357
289 if (defined $data) { 358 if (defined $data) {
290 glTexImage2D GL_TEXTURE_2D, 0, 359 glTexImage2D GL_TEXTURE_2D, 0,
291 $self->{internalformat}, 360 $self->{internalformat},
292 $tw, $th, # need to pad texture first 361 $tw, $th,
293 0, 362 0,
294 $self->{format}, 363 $self->{format},
295 $self->{type}, 364 $self->{type},
296 $data; 365 $data;
297 if (my $error = glGetError) { 366 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}; 367 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
300 }
301 } else { 368 } else {
302 glCopyTexImage2D GL_TEXTURE_2D, 0, 369 glCopyTexImage2D GL_TEXTURE_2D, 0,
303 $self->{internalformat}, 370 $self->{internalformat},
304 0, 0, 371 0, 0,
305 $tw, $th, 372 $tw, $th,
306 0; 373 0;
307 glGetError and die "glCopyTexImage2D $tw,$th"; 374 CFClient::gl_check "copying to texture %dx%d if=%x",
375 $tw, $th, $self->{internalformat};
308 } 376 }
377
378 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
309} 379}
310 380
311sub DESTROY { 381sub DESTROY {
312 my ($self) = @_; 382 my ($self) = @_;
313 383
… …
315 385
316 glDeleteTexture delete $self->{name} 386 glDeleteTexture delete $self->{name}
317 if $self->{name}; 387 if $self->{name};
318} 388}
319 389
320sub restore_state{ 390sub restore_state {
321 $_->upload 391 $_->upload
322 for values %TEXTURES; 392 for values %TEXTURES;
323}; 393}
324 394
3251; 3951;
326 396
327=back 397=back
328 398

Diff Legend

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