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.33 by root, Sat Apr 15 01:13:45 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 SDL::OpenGL; 24use Carp ();
25use AnyEvent ();
26use BerkeleyDB;
27
28use CFClient::OpenGL;
25 29
26our %GL_EXT; 30our %GL_EXT;
27our $GL_VERSION; 31our $GL_VERSION;
28 32
29our $GL_NPOT; 33our $GL_NPOT;
34our $GL_DEBUG = 1;
30 35
31sub gl_init { 36sub gl_init {
32 $GL_VERSION = gl_version * 1; 37 $GL_VERSION = gl_version * 1;
33 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
34 39
35 $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...
36 42
37 glEnable GL_TEXTURE_2D;
38 glEnable GL_COLOR_MATERIAL; 43 glDisable GL_COLOR_MATERIAL;
39 glShadeModel GL_FLAT; 44 glShadeModel GL_FLAT;
45 glDisable GL_DITHER;
40 glDisable GL_DEPTH_TEST; 46 glDisable GL_DEPTH_TEST;
41 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 47 glDepthMask 0;
42
43 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 48 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
44 49
45 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 }
46} 59}
47 60
48sub find_rcfile($) { 61sub find_rcfile($) {
49 my $path; 62 my $path;
50 63
51 for (@INC) { 64 for (grep !ref, @INC) {
52 $path = "$_/CFClient/resources/$_[0]"; 65 $path = "$_/CFClient/resources/$_[0]";
53 return $path if -r $path; 66 return $path if -r $path;
54 } 67 }
55 68
56 die "FATAL: can't find required file $_[0]\n"; 69 die "FATAL: can't find required file $_[0]\n";
… …
86 } 99 }
87 100
88 close CFG; 101 close CFG;
89} 102}
90 103
104mkdir "$Crossfire::VARDIR/pclient", 0777;
105
106our $DB_ENV = new BerkeleyDB::Env
107 -Home => "$Crossfire::VARDIR/pclient",
108 -Cachesize => 1_000_000,
109 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
110# -ErrPrefix => "DATABASE",
111 -Verbose => 1,
112 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
113 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
114
115sub db_table($) {
116 my ($table) = @_;
117
118 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
119
120 new CFClient::Database
121 -Env => $DB_ENV,
122 -Filename => $table,
123# -Filename => "database",
124# -Subname => $table,
125 -Property => DB_CHKSUM,
126 -Flags => DB_CREATE | DB_UPGRADE,
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])
181}
182
183package CFClient::Database;
184
185our @ISA = BerkeleyDB::Btree::;
186
187sub get($$) {
188 my $data;
189
190 $_[0]->db_get ($_[1], $data) == 0
191 ? $data
192 : ()
193}
194
195my %DB_SYNC;
196
197sub put($$$) {
198 my ($db, $key, $data) = @_;
199
200 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
201
202 $db->db_put ($key => $data)
203}
204
91package CFClient::Texture; 205package CFClient::Texture;
92 206
93use strict; 207use strict;
94 208
95use Scalar::Util; 209use Scalar::Util;
96 210
97use SDL::OpenGL; 211use CFClient::OpenGL;
98 212
99my @textures; 213my %TEXTURES;
100 214
101sub new { 215sub new {
102 my ($class, %data) = @_; 216 my ($class, %data) = @_;
103 217
104 my $self = bless { 218 my $self = bless {
… …
106 format => GL_RGBA, 220 format => GL_RGBA,
107 type => GL_UNSIGNED_BYTE, 221 type => GL_UNSIGNED_BYTE,
108 %data, 222 %data,
109 }, $class; 223 }, $class;
110 224
111 push @textures, $self; 225 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
112 Scalar::Util::weaken $textures[-1];
113 226
114 $self->upload; 227 $self->upload;
115 228
116 $self 229 $self
117} 230}
… …
121 234
122 $class->new (image => $image, %arg) 235 $class->new (image => $image, %arg)
123} 236}
124 237
125sub new_from_file { 238sub new_from_file {
126 my ($class, $path) = @_; 239 my ($class, $path, %arg) = @_;
127 240
128 open my $fh, "<:raw", $path 241 open my $fh, "<:raw", $path
129 or die "$path: $!"; 242 or die "$path: $!";
130 243
131 local $/; 244 local $/;
132 $class->new_from_image (<$fh>) 245 $class->new_from_image (<$fh>, %arg)
133} 246}
134 247
135#sub new_from_surface { 248#sub new_from_surface {
136# my ($class, $surface) = @_; 249# my ($class, $surface) = @_;
137# 250#
… …
143# h => $surface->height, 256# h => $surface->height,
144# ) 257# )
145#} 258#}
146 259
147sub new_from_layout { 260sub new_from_layout {
148 my ($class, $layout) = @_; 261 my ($class, $layout, %arg) = @_;
149 262
150 my ($w, $h, $data) = $layout->render; 263 my ($w, $h, $data, $format, $internalformat) = $layout->render;
151 264
152 $class->new ( 265 $class->new (
153 w => $w, 266 w => $w,
154 h => $h, 267 h => $h,
155 data => $data, 268 data => $data,
156 internalformat => GL_ALPHA4,
157 format => GL_ALPHA, 269 format => $format,
270 internalformat => $format,
158 type => GL_UNSIGNED_BYTE, 271 type => GL_UNSIGNED_BYTE,
272 %arg,
159 ) 273 )
160} 274}
161 275
162sub new_from_opengl { 276sub new_from_opengl {
163 my ($class, $w, $h, $cb) = @_; 277 my ($class, $w, $h, $cb) = @_;
164 278
165 $class->new (w => $w, h => $h, render_cb => $cb) 279 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
166} 280}
167 281
168sub topot { 282sub topot {
169 (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]
170} 284}
… …
193 = CFClient::load_image_inline $self->{image}; 307 = CFClient::load_image_inline $self->{image};
194 } 308 }
195 309
196 my ($tw, $th) = @$self{qw(w h)}; 310 my ($tw, $th) = @$self{qw(w h)};
197 311
198 unless ($tw && $th) { 312 unless ($tw > 0 && $th > 0) {
199 $tw = $th = 1; 313 $tw = $th = 1;
200 $data = "\x00" x 64; 314 $data = "\x00" x 64;
201 } 315 }
202 316
203 $self->{minified} = [CFClient::average $tw, $th, $data] 317 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
206 unless ($GL_NPOT) { 320 unless ($GL_NPOT) {
207 # TODO: does not work for zero-sized textures 321 # TODO: does not work for zero-sized textures
208 $tw = topot $tw; 322 $tw = topot $tw;
209 $th = topot $th; 323 $th = topot $th;
210 324
211 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 325 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
212 my $bpp = (length $data) / ($self->{w} * $self->{h}); 326 my $bpp = (length $data) / ($self->{w} * $self->{h});
213 $data = pack "(a" . ($tw * $bpp) . ")*", 327 $data = pack "(a" . ($tw * $bpp) . ")*",
214 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 328 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
215 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 329 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
216 } 330 }
217 } 331 }
218 332
219 $self->{s} = $self->{w} / $tw; 333 $self->{s} = $self->{w} / $tw;
220 $self->{t} = $self->{h} / $th; 334 $self->{t} = $self->{h} / $th;
221 335
222 $self->{name} ||= (glGenTextures 1)->[0]; 336 $self->{name} ||= glGenTexture;
223 337
224 glBindTexture GL_TEXTURE_2D, $self->{name}; 338 glBindTexture GL_TEXTURE_2D, $self->{name};
225 339
226 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
227 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
228 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 340 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
229 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 }
230 356
357 glGetError;
358
231 if (defined $data) { 359 if (defined $data) {
232 glTexImage2D GL_TEXTURE_2D, 0, 360 glTexImage2D GL_TEXTURE_2D, 0,
233 $self->{internalformat}, 361 $self->{internalformat},
234 $tw, $th, # need to pad texture first 362 $tw, $th,
235 0, 363 0,
236 $self->{format}, 364 $self->{format},
237 $self->{type}, 365 $self->{type},
238 $data; 366 $data;
239 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};
240 } else { 369 } else {
241 glCopyTexImage2D GL_TEXTURE_2D, 0, 370 glCopyTexImage2D GL_TEXTURE_2D, 0,
242 $self->{internalformat}, 371 $self->{internalformat},
243 0, 0, 372 0, 0,
244 $tw, $th, 373 $tw, $th,
245 0; 374 0;
246 glGetError and die "glCopyTexImage2D $tw,$th"; 375 CFClient::gl_check "copying to texture %dx%d if=%x",
376 $tw, $th, $self->{internalformat};
247 } 377 }
378
379 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
248} 380}
249 381
250sub DESTROY { 382sub DESTROY {
251 my ($self) = @_; 383 my ($self) = @_;
252 384
253 return unless exists $self->{name}; 385 delete $TEXTURES{$self+0};
254 386
255 glDeleteTextures delete $self->{name}; 387 glDeleteTexture delete $self->{name}
388 if $self->{name};
256} 389}
257 390
258sub restore_state{ 391sub restore_state {
259 $_->upload 392 $_->upload
260 for grep $_, @textures; 393 for values %TEXTURES;
261}; 394}
262 395
2631; 3961;
264 397
265=back 398=back
266 399

Diff Legend

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