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.35 by root, Sat Apr 15 22:55:59 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;
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;
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";
… …
93mkdir "$Crossfire::VARDIR/pclient", 0777; 102mkdir "$Crossfire::VARDIR/pclient", 0777;
94 103
95our $DB_ENV = new BerkeleyDB::Env 104our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient", 105 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000, 106 -Cachesize => 1_000_000,
98 -ErrFile => "/proc/self/fd/2", 107 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99 -ErrPrefix => "DATABASE", 108# -ErrPrefix => "DATABASE",
100 -Verbose => 1, 109 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 110 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 111 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
103 112
104sub db_table($) { 113sub db_table($) {
114 my ($table) = @_;
115
116 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
117
105 new CFClient::Database 118 new CFClient::Database
106 -Env => $DB_ENV, 119 -Env => $DB_ENV,
120 -Filename => $table,
107 -Filename => "database", 121# -Filename => "database",
108 -Subname => $_[0], 122# -Subname => $table,
123 -Property => DB_CHKSUM,
109 -Flags => DB_CREATE | DB_UPGRADE, 124 -Flags => DB_CREATE | DB_UPGRADE,
110 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 125 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
111} 126}
112 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])
172}
173
113package CFClient::Database; 174package CFClient::Database;
114 175
115our @ISA = BerkeleyDB::Btree::; 176our @ISA = BerkeleyDB::Btree::;
116 177
117sub get($$) { 178sub get($$) {
118 my $data; 179 my $data;
119 180
120 $_[0]->db_get ($_[1], $data) == 0 181 $_[0]->db_get ($_[1], $data) == 0
121 ? $data 182 ? $data
122 : (); 183 : ()
123} 184}
124 185
125my %DB_SYNC; 186my %DB_SYNC;
126 187
127sub put($$$) { 188sub put($$$) {
128 my ($db, $key, $data) = @_; 189 my ($db, $key, $data) = @_;
129 190
130 $db->db_put ($key => $data);
131
132 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 191 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
133 192
193 $db->db_put ($key => $data)
134} 194}
135 195
136package CFClient::Texture; 196package CFClient::Texture;
137 197
138use strict; 198use strict;
139 199
140use Scalar::Util; 200use Scalar::Util;
141 201
142use SDL::OpenGL; 202use CFClient::OpenGL;
143 203
144my %TEXTURES; 204my %TEXTURES;
145my @NAMES;
146 205
147sub new { 206sub new {
148 my ($class, %data) = @_; 207 my ($class, %data) = @_;
149 208
150 my $self = bless { 209 my $self = bless {
… …
166 225
167 $class->new (image => $image, %arg) 226 $class->new (image => $image, %arg)
168} 227}
169 228
170sub new_from_file { 229sub new_from_file {
171 my ($class, $path) = @_; 230 my ($class, $path, %arg) = @_;
172 231
173 open my $fh, "<:raw", $path 232 open my $fh, "<:raw", $path
174 or die "$path: $!"; 233 or die "$path: $!";
175 234
176 local $/; 235 local $/;
177 $class->new_from_image (<$fh>) 236 $class->new_from_image (<$fh>, %arg)
178} 237}
179 238
180#sub new_from_surface { 239#sub new_from_surface {
181# my ($class, $surface) = @_; 240# my ($class, $surface) = @_;
182# 241#
… …
188# h => $surface->height, 247# h => $surface->height,
189# ) 248# )
190#} 249#}
191 250
192sub new_from_layout { 251sub new_from_layout {
193 my ($class, $layout) = @_; 252 my ($class, $layout, %arg) = @_;
194 253
195 my ($w, $h, $data) = $layout->render; 254 my ($w, $h, $data, $format, $internalformat) = $layout->render;
196 255
197 $class->new ( 256 $class->new (
198 w => $w, 257 w => $w,
199 h => $h, 258 h => $h,
200 data => $data, 259 data => $data,
201 internalformat => GL_ALPHA4,
202 format => GL_ALPHA, 260 format => $format,
261 internalformat => $format,
203 type => GL_UNSIGNED_BYTE, 262 type => GL_UNSIGNED_BYTE,
263 %arg,
204 ) 264 )
205} 265}
206 266
207sub new_from_opengl { 267sub new_from_opengl {
208 my ($class, $w, $h, $cb) = @_; 268 my ($class, $w, $h, $cb) = @_;
209 269
210 $class->new (w => $w, h => $h, render_cb => $cb) 270 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
211} 271}
212 272
213sub topot { 273sub topot {
214 (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]
215} 275}
… …
238 = CFClient::load_image_inline $self->{image}; 298 = CFClient::load_image_inline $self->{image};
239 } 299 }
240 300
241 my ($tw, $th) = @$self{qw(w h)}; 301 my ($tw, $th) = @$self{qw(w h)};
242 302
243 unless ($tw && $th) { 303 unless ($tw > 0 && $th > 0) {
244 $tw = $th = 1; 304 $tw = $th = 1;
245 $data = "\x00" x 64; 305 $data = "\x00" x 64;
246 } 306 }
247 307
248 $self->{minified} = [CFClient::average $tw, $th, $data] 308 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
251 unless ($GL_NPOT) { 311 unless ($GL_NPOT) {
252 # TODO: does not work for zero-sized textures 312 # TODO: does not work for zero-sized textures
253 $tw = topot $tw; 313 $tw = topot $tw;
254 $th = topot $th; 314 $th = topot $th;
255 315
256 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 316 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
257 my $bpp = (length $data) / ($self->{w} * $self->{h}); 317 my $bpp = (length $data) / ($self->{w} * $self->{h});
258 $data = pack "(a" . ($tw * $bpp) . ")*", 318 $data = pack "(a" . ($tw * $bpp) . ")*",
259 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 319 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
260 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 320 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
261 } 321 }
262 } 322 }
263 323
264 $self->{s} = $self->{w} / $tw; 324 $self->{s} = $self->{w} / $tw;
265 $self->{t} = $self->{h} / $th; 325 $self->{t} = $self->{h} / $th;
266 326
267 $self->{name} ||= (pop @NAMES) || (glGenTextures 1)->[0]; 327 $self->{name} ||= glGenTexture;
268 328
269 glBindTexture GL_TEXTURE_2D, $self->{name}; 329 glBindTexture GL_TEXTURE_2D, $self->{name};
270 330
271 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
272 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
273 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 331 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
274 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 332 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
333
334 if ($::FAST) {
335 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_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;
342 } else {
343 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
344 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
345 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
346 }
275 347
348 glGetError;
349
276 if (defined $data) { 350 if (defined $data) {
277 glTexImage2D GL_TEXTURE_2D, 0, 351 glTexImage2D GL_TEXTURE_2D, 0,
278 $self->{internalformat}, 352 $self->{internalformat},
279 $tw, $th, # need to pad texture first 353 $tw, $th, # need to pad texture first
280 0, 354 0,
281 $self->{format}, 355 $self->{format},
282 $self->{type}, 356 $self->{type},
283 $data; 357 $data;
284 glGetError and die; 358 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
359 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
285 } else { 360 } else {
286 glCopyTexImage2D GL_TEXTURE_2D, 0, 361 glCopyTexImage2D GL_TEXTURE_2D, 0,
287 $self->{internalformat}, 362 $self->{internalformat},
288 0, 0, 363 0, 0,
289 $tw, $th, 364 $tw, $th,
290 0; 365 0;
291 glGetError and die "glCopyTexImage2D $tw,$th"; 366 CFClient::gl_check "copying to texture %dx%d if=%x",
367 $tw, $th, $self->{internalformat};
292 } 368 }
293} 369}
294 370
295sub DESTROY { 371sub DESTROY {
296 my ($self) = @_; 372 my ($self) = @_;
297 373
298 delete $TEXTURES{$self+0}; 374 delete $TEXTURES{$self+0};
299 375
300 if (my $name = delete $self->{name}) { 376 glDeleteTexture delete $self->{name}
301 glDeleteTextures $name; 377 if $self->{name};
302 push @NAMES, $name;
303 }
304
305} 378}
306 379
307sub restore_state{ 380sub restore_state{
308 $_->upload 381 $_->upload
309 for grep $_, values %TEXTURES; 382 for values %TEXTURES;
310}; 383};
311 384
3121; 3851;
313 386
314=back 387=back

Diff Legend

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