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.37 by root, Sun Apr 16 07:25:29 2006 UTC vs.
Revision 1.59 by elmex, Tue May 23 17:30:18 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;
26use SDL::OpenGL; 27
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;
41 $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
38 42
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL; 43 glDisable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT; 44 glShadeModel GL_FLAT;
45 glDisable GL_DITHER;
42 glDisable GL_DEPTH_TEST; 46 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 47 glDepthMask 0;
44
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 ();
51}
52
53sub gl_check {
54 return unless $GL_DEBUG;
55
56 if (my $error = glGetError) {
57 Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
58 }
48} 59}
49 60
50sub find_rcfile($) { 61sub find_rcfile($) {
51 my $path; 62 my $path;
52 63
53 for (@INC) { 64 for (grep !ref, @INC) {
54 $path = "$_/CFClient/resources/$_[0]"; 65 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path; 66 return $path if -r $path;
56 } 67 }
57 68
58 die "FATAL: can't find required file $_[0]\n"; 69 die "FATAL: can't find required file $_[0]\n";
… …
93mkdir "$Crossfire::VARDIR/pclient", 0777; 104mkdir "$Crossfire::VARDIR/pclient", 0777;
94 105
95our $DB_ENV = new BerkeleyDB::Env 106our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient", 107 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000, 108 -Cachesize => 1_000_000,
98 -ErrFile => "/proc/self/fd/2", 109 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99 -ErrPrefix => "DATABASE", 110# -ErrPrefix => "DATABASE",
100 -Verbose => 1, 111 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | 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,
102 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";
103 114
104sub db_table($) { 115sub db_table($) {
116 my ($table) = @_;
117
118 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
119
105 new CFClient::Database 120 new CFClient::Database
106 -Env => $DB_ENV, 121 -Env => $DB_ENV,
122 -Filename => $table,
107 -Filename => "database", 123# -Filename => "database",
108 -Subname => $_[0], 124# -Subname => $table,
125 -Property => DB_CHKSUM,
109 -Flags => DB_CREATE | DB_UPGRADE, 126 -Flags => DB_CREATE | DB_UPGRADE,
110 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])
111} 181}
112 182
113package CFClient::Database; 183package CFClient::Database;
114 184
115our @ISA = BerkeleyDB::Btree::; 185our @ISA = BerkeleyDB::Btree::;
… …
136 206
137use strict; 207use strict;
138 208
139use Scalar::Util; 209use Scalar::Util;
140 210
141use SDL::OpenGL; 211use CFClient::OpenGL;
142 212
143my %TEXTURES; 213my %TEXTURES;
144 214
145sub new { 215sub new {
146 my ($class, %data) = @_; 216 my ($class, %data) = @_;
… …
164 234
165 $class->new (image => $image, %arg) 235 $class->new (image => $image, %arg)
166} 236}
167 237
168sub new_from_file { 238sub new_from_file {
169 my ($class, $path) = @_; 239 my ($class, $path, %arg) = @_;
170 240
171 open my $fh, "<:raw", $path 241 open my $fh, "<:raw", $path
172 or die "$path: $!"; 242 or die "$path: $!";
173 243
174 local $/; 244 local $/;
175 $class->new_from_image (<$fh>) 245 $class->new_from_image (<$fh>, %arg)
176} 246}
177 247
178#sub new_from_surface { 248#sub new_from_surface {
179# my ($class, $surface) = @_; 249# my ($class, $surface) = @_;
180# 250#
… …
186# h => $surface->height, 256# h => $surface->height,
187# ) 257# )
188#} 258#}
189 259
190sub new_from_layout { 260sub new_from_layout {
191 my ($class, $layout) = @_; 261 my ($class, $layout, %arg) = @_;
192 262
193 my ($w, $h, $data) = $layout->render; 263 my ($w, $h, $data, $format, $internalformat) = $layout->render;
194 264
195 $class->new ( 265 $class->new (
196 w => $w, 266 w => $w,
197 h => $h, 267 h => $h,
198 data => $data, 268 data => $data,
199 internalformat => GL_ALPHA4,
200 format => GL_ALPHA, 269 format => $format,
270 internalformat => $format,
201 type => GL_UNSIGNED_BYTE, 271 type => GL_UNSIGNED_BYTE,
272 %arg,
202 ) 273 )
203} 274}
204 275
205sub new_from_opengl { 276sub new_from_opengl {
206 my ($class, $w, $h, $cb) = @_; 277 my ($class, $w, $h, $cb) = @_;
207 278
208 $class->new (w => $w, h => $h, render_cb => $cb) 279 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
209} 280}
210 281
211sub topot { 282sub topot {
212 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 283 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
213} 284}
… …
236 = CFClient::load_image_inline $self->{image}; 307 = CFClient::load_image_inline $self->{image};
237 } 308 }
238 309
239 my ($tw, $th) = @$self{qw(w h)}; 310 my ($tw, $th) = @$self{qw(w h)};
240 311
241 unless ($tw && $th) { 312 unless ($tw > 0 && $th > 0) {
242 $tw = $th = 1; 313 $tw = $th = 1;
243 $data = "\x00" x 64; 314 $data = "\x00" x 64;
244 } 315 }
245 316
246 $self->{minified} = [CFClient::average $tw, $th, $data] 317 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
249 unless ($GL_NPOT) { 320 unless ($GL_NPOT) {
250 # TODO: does not work for zero-sized textures 321 # TODO: does not work for zero-sized textures
251 $tw = topot $tw; 322 $tw = topot $tw;
252 $th = topot $th; 323 $th = topot $th;
253 324
254 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 325 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
255 my $bpp = (length $data) / ($self->{w} * $self->{h}); 326 my $bpp = (length $data) / ($self->{w} * $self->{h});
256 $data = pack "(a" . ($tw * $bpp) . ")*", 327 $data = pack "(a" . ($tw * $bpp) . ")*",
257 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 328 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
258 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 329 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
259 } 330 }
260 } 331 }
261 332
262 $self->{s} = $self->{w} / $tw; 333 $self->{s} = $self->{w} / $tw;
263 $self->{t} = $self->{h} / $th; 334 $self->{t} = $self->{h} / $th;
264 335
265 $self->{name} ||= (glGenTextures 1)->[0]; 336 $self->{name} ||= glGenTexture;
266 337
267 glBindTexture GL_TEXTURE_2D, $self->{name}; 338 glBindTexture GL_TEXTURE_2D, $self->{name};
268 339
269 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
270 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
271 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 340 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
272 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 341 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
342
343 if ($::FAST) {
344 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
345 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
346 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
347 # alternatively check for 0x8191
348 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
349 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
350 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
351 } else {
352 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
353 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
354 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
355 }
273 356
357 glGetError;
358
274 if (defined $data) { 359 if (defined $data) {
275 glTexImage2D GL_TEXTURE_2D, 0, 360 glTexImage2D GL_TEXTURE_2D, 0,
276 $self->{internalformat}, 361 $self->{internalformat},
277 $tw, $th, # need to pad texture first 362 $tw, $th,
278 0, 363 0,
279 $self->{format}, 364 $self->{format},
280 $self->{type}, 365 $self->{type},
281 $data; 366 $data;
282 glGetError and die; 367 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
368 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
283 } else { 369 } else {
284 glCopyTexImage2D GL_TEXTURE_2D, 0, 370 glCopyTexImage2D GL_TEXTURE_2D, 0,
285 $self->{internalformat}, 371 $self->{internalformat},
286 0, 0, 372 0, 0,
287 $tw, $th, 373 $tw, $th,
288 0; 374 0;
289 glGetError and die "glCopyTexImage2D $tw,$th"; 375 CFClient::gl_check "copying to texture %dx%d if=%x",
376 $tw, $th, $self->{internalformat};
290 } 377 }
378
379 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
291} 380}
292 381
293sub DESTROY { 382sub DESTROY {
294 my ($self) = @_; 383 my ($self) = @_;
295 384
296 delete $TEXTURES{$self+0}; 385 delete $TEXTURES{$self+0};
297 386
298 glDeleteTextures delete $self->{name} 387 glDeleteTexture delete $self->{name}
299 if $self->{name}; 388 if $self->{name};
300} 389}
301 390
302sub restore_state{ 391sub restore_state {
303 $_->upload 392 $_->upload
304 for values %TEXTURES; 393 for values %TEXTURES;
305}; 394}
306 395
3071; 3961;
308 397
309=back 398=back
310 399

Diff Legend

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