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.54 by root, Fri May 19 03:49:47 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";
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])
111} 179}
112 180
113package CFClient::Database; 181package CFClient::Database;
114 182
115our @ISA = BerkeleyDB::Btree::; 183our @ISA = BerkeleyDB::Btree::;
… …
136 204
137use strict; 205use strict;
138 206
139use Scalar::Util; 207use Scalar::Util;
140 208
141use SDL::OpenGL; 209use CFClient::OpenGL;
142 210
143my %TEXTURES; 211my %TEXTURES;
144 212
145sub new { 213sub new {
146 my ($class, %data) = @_; 214 my ($class, %data) = @_;
… …
164 232
165 $class->new (image => $image, %arg) 233 $class->new (image => $image, %arg)
166} 234}
167 235
168sub new_from_file { 236sub new_from_file {
169 my ($class, $path) = @_; 237 my ($class, $path, %arg) = @_;
170 238
171 open my $fh, "<:raw", $path 239 open my $fh, "<:raw", $path
172 or die "$path: $!"; 240 or die "$path: $!";
173 241
174 local $/; 242 local $/;
175 $class->new_from_image (<$fh>) 243 $class->new_from_image (<$fh>, %arg)
176} 244}
177 245
178#sub new_from_surface { 246#sub new_from_surface {
179# my ($class, $surface) = @_; 247# my ($class, $surface) = @_;
180# 248#
… …
186# h => $surface->height, 254# h => $surface->height,
187# ) 255# )
188#} 256#}
189 257
190sub new_from_layout { 258sub new_from_layout {
191 my ($class, $layout) = @_; 259 my ($class, $layout, %arg) = @_;
192 260
193 my ($w, $h, $data) = $layout->render; 261 my ($w, $h, $data, $format, $internalformat) = $layout->render;
194 262
195 $class->new ( 263 $class->new (
196 w => $w, 264 w => $w,
197 h => $h, 265 h => $h,
198 data => $data, 266 data => $data,
199 internalformat => GL_ALPHA4,
200 format => GL_ALPHA, 267 format => $format,
268 internalformat => $format,
201 type => GL_UNSIGNED_BYTE, 269 type => GL_UNSIGNED_BYTE,
270 %arg,
202 ) 271 )
203} 272}
204 273
205sub new_from_opengl { 274sub new_from_opengl {
206 my ($class, $w, $h, $cb) = @_; 275 my ($class, $w, $h, $cb) = @_;
207 276
208 $class->new (w => $w, h => $h, render_cb => $cb) 277 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
209} 278}
210 279
211sub topot { 280sub topot {
212 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 281 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
213} 282}
… …
236 = CFClient::load_image_inline $self->{image}; 305 = CFClient::load_image_inline $self->{image};
237 } 306 }
238 307
239 my ($tw, $th) = @$self{qw(w h)}; 308 my ($tw, $th) = @$self{qw(w h)};
240 309
241 unless ($tw && $th) { 310 unless ($tw > 0 && $th > 0) {
242 $tw = $th = 1; 311 $tw = $th = 1;
243 $data = "\x00" x 64; 312 $data = "\x00" x 64;
244 } 313 }
245 314
246 $self->{minified} = [CFClient::average $tw, $th, $data] 315 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
249 unless ($GL_NPOT) { 318 unless ($GL_NPOT) {
250 # TODO: does not work for zero-sized textures 319 # TODO: does not work for zero-sized textures
251 $tw = topot $tw; 320 $tw = topot $tw;
252 $th = topot $th; 321 $th = topot $th;
253 322
254 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 323 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
255 my $bpp = (length $data) / ($self->{w} * $self->{h}); 324 my $bpp = (length $data) / ($self->{w} * $self->{h});
256 $data = pack "(a" . ($tw * $bpp) . ")*", 325 $data = pack "(a" . ($tw * $bpp) . ")*",
257 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 326 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
258 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 327 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
259 } 328 }
260 } 329 }
261 330
262 $self->{s} = $self->{w} / $tw; 331 $self->{s} = $self->{w} / $tw;
263 $self->{t} = $self->{h} / $th; 332 $self->{t} = $self->{h} / $th;
264 333
265 $self->{name} ||= (glGenTextures 1)->[0]; 334 $self->{name} ||= glGenTexture;
266 335
267 glBindTexture GL_TEXTURE_2D, $self->{name}; 336 glBindTexture GL_TEXTURE_2D, $self->{name};
268 337
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; 338 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
272 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 339 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
340
341 if ($::FAST) {
342 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
343 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
344 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
345 # alternatively check for 0x8191
346 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
347 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
348 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
349 } else {
350 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
351 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
352 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
353 }
273 354
355 glGetError;
356
274 if (defined $data) { 357 if (defined $data) {
275 glTexImage2D GL_TEXTURE_2D, 0, 358 glTexImage2D GL_TEXTURE_2D, 0,
276 $self->{internalformat}, 359 $self->{internalformat},
277 $tw, $th, # need to pad texture first 360 $tw, $th,
278 0, 361 0,
279 $self->{format}, 362 $self->{format},
280 $self->{type}, 363 $self->{type},
281 $data; 364 $data;
282 glGetError and die; 365 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
366 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
283 } else { 367 } else {
284 glCopyTexImage2D GL_TEXTURE_2D, 0, 368 glCopyTexImage2D GL_TEXTURE_2D, 0,
285 $self->{internalformat}, 369 $self->{internalformat},
286 0, 0, 370 0, 0,
287 $tw, $th, 371 $tw, $th,
288 0; 372 0;
289 glGetError and die "glCopyTexImage2D $tw,$th"; 373 CFClient::gl_check "copying to texture %dx%d if=%x",
374 $tw, $th, $self->{internalformat};
290 } 375 }
291} 376}
292 377
293sub DESTROY { 378sub DESTROY {
294 my ($self) = @_; 379 my ($self) = @_;
295 380
296 delete $TEXTURES{$self+0}; 381 delete $TEXTURES{$self+0};
297 382
298 glDeleteTextures delete $self->{name} 383 glDeleteTexture delete $self->{name}
299 if $self->{name}; 384 if $self->{name};
300} 385}
301 386
302sub restore_state{ 387sub restore_state {
303 $_->upload 388 $_->upload
304 for values %TEXTURES; 389 for values %TEXTURES;
305}; 390}
306 391
3071; 3921;
308 393
309=back 394=back
310 395

Diff Legend

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