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.30 by root, Wed Apr 12 21:35:10 2006 UTC vs.
Revision 1.61 by root, Wed May 24 21:49:58 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 my ($format, @args) = @_;
58 Carp::cluck sprintf "opengl error %x while $format", $error, @args;
59 }
46} 60}
47 61
48sub find_rcfile($) { 62sub find_rcfile($) {
49 my $path; 63 my $path;
50 64
51 for (@INC) { 65 for (grep !ref, @INC) {
52 $path = "$_/CFClient/resources/$_[0]"; 66 $path = "$_/CFClient/resources/$_[0]";
53 return $path if -r $path; 67 return $path if -r $path;
54 } 68 }
55 69
56 die "FATAL: can't find required file $_[0]\n"; 70 die "FATAL: can't find required file $_[0]\n";
… …
86 } 100 }
87 101
88 close CFG; 102 close CFG;
89} 103}
90 104
105mkdir "$Crossfire::VARDIR/pclient", 0777;
106
107our $DB_ENV = new BerkeleyDB::Env
108 -Home => "$Crossfire::VARDIR/pclient",
109 -Cachesize => 1_000_000,
110 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
111# -ErrPrefix => "DATABASE",
112 -Verbose => 1,
113 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
114 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
115
116sub db_table($) {
117 my ($table) = @_;
118
119 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
120
121 new CFClient::Database
122 -Env => $DB_ENV,
123 -Filename => $table,
124# -Filename => "database",
125# -Subname => $table,
126 -Property => DB_CHKSUM,
127 -Flags => DB_CREATE | DB_UPGRADE,
128 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
129}
130
131sub pod_to_pango($) {
132 my ($pom) = @_;
133
134 $pom->present ("CFClient::PodToPango")
135}
136
137sub pod_to_pango_list($) {
138 my ($pom) = @_;
139
140 [
141 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
142 split /\n/, $pom->present ("CFClient::PodToPango")
143 ]
144}
145
146package CFClient::PodToPango;
147
148use base Pod::POM::View::Text;
149
150our $indent = 0;
151
152*view_seq_code =
153*view_seq_bold = sub { "<b>$_[1]</b>" };
154*view_seq_italic = sub { "<i>$_[1]</i>" };
155*view_seq_space =
156*view_seq_link =
157*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
158
159sub view_seq_text {
160 my $text = $_[1];
161 $text =~ s/\s+/ /g;
162 CFClient::UI::Label::escape ($text)
163}
164
165sub view_item {
166 ("\t" x ($indent / 4))
167 . $_[1]->title->present ($_[0])
168 . "\n"
169 . $_[1]->content->present ($_[0])
170}
171
172sub view_verbatim {
173 (join "",
174 map +("\t" x ($indent / 2)) . "$_\n",
175 split /\n/, CFClient::UI::Label::escape ($_[1]))
176 . "\n"
177}
178
179sub view_textblock {
180 ("\t" x ($indent / 2)) . "$_[1]\n\n"
181}
182
183sub view_head1 {
184 "<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
185 . $_[1]->content->present ($_[0])
186};
187
188sub view_head2 {
189 "<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
190 . $_[1]->content->present ($_[0])
191};
192
193sub view_over {
194 local $indent = $indent + $_[1]->indent;
195 $_[1]->content->present ($_[0])
196}
197
198package CFClient::Database;
199
200our @ISA = BerkeleyDB::Btree::;
201
202sub get($$) {
203 my $data;
204
205 $_[0]->db_get ($_[1], $data) == 0
206 ? $data
207 : ()
208}
209
210my %DB_SYNC;
211
212sub put($$$) {
213 my ($db, $key, $data) = @_;
214
215 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
216
217 $db->db_put ($key => $data)
218}
219
91package CFClient::Texture; 220package CFClient::Texture;
92 221
93use strict; 222use strict;
94 223
95use Scalar::Util; 224use Scalar::Util;
96 225
97use SDL::OpenGL; 226use CFClient::OpenGL;
98 227
99my @textures; 228my %TEXTURES;
100 229
101sub new { 230sub new {
102 my ($class, %data) = @_; 231 my ($class, %data) = @_;
103 232
104 my $self = bless { 233 my $self = bless {
… …
106 format => GL_RGBA, 235 format => GL_RGBA,
107 type => GL_UNSIGNED_BYTE, 236 type => GL_UNSIGNED_BYTE,
108 %data, 237 %data,
109 }, $class; 238 }, $class;
110 239
111 push @textures, $self; 240 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
112 Scalar::Util::weaken $textures[-1];
113 241
114 $self->upload; 242 $self->upload;
115 243
116 $self 244 $self
117} 245}
118 246
119sub new_from_image { 247sub new_from_image {
120 my ($class, $image) = @_; 248 my ($class, $image, %arg) = @_;
121 249
122 $class->new (image => $image) 250 $class->new (image => $image, %arg)
123} 251}
124 252
125sub new_from_file { 253sub new_from_file {
126 my ($class, $path) = @_; 254 my ($class, $path, %arg) = @_;
127 255
128 open my $fh, "<:raw", $path 256 open my $fh, "<:raw", $path
129 or die "$path: $!"; 257 or die "$path: $!";
130 258
131 local $/; 259 local $/;
132 $class->new_from_image (<$fh>) 260 $class->new_from_image (<$fh>, %arg)
133} 261}
134 262
135#sub new_from_surface { 263#sub new_from_surface {
136# my ($class, $surface) = @_; 264# my ($class, $surface) = @_;
137# 265#
… …
143# h => $surface->height, 271# h => $surface->height,
144# ) 272# )
145#} 273#}
146 274
147sub new_from_layout { 275sub new_from_layout {
148 my ($class, $layout) = @_; 276 my ($class, $layout, %arg) = @_;
149 277
150 my ($w, $h, $data) = $layout->render; 278 my ($w, $h, $data, $format, $internalformat) = $layout->render;
151 279
152 $class->new ( 280 $class->new (
153 w => $w, 281 w => $w,
154 h => $h, 282 h => $h,
155 data => $data, 283 data => $data,
156 internalformat => GL_ALPHA4,
157 format => GL_ALPHA, 284 format => $format,
285 internalformat => $format,
158 type => GL_UNSIGNED_BYTE, 286 type => GL_UNSIGNED_BYTE,
287 %arg,
159 ) 288 )
160} 289}
161 290
162sub new_from_opengl { 291sub new_from_opengl {
163 my ($class, $w, $h, $cb) = @_; 292 my ($class, $w, $h, $cb) = @_;
164 293
165 $class->new (w => $w, h => $h, render_cb => $cb) 294 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
166} 295}
167 296
168sub topot { 297sub topot {
169 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 298 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
170} 299}
… …
179 if (exists $self->{data}) { 308 if (exists $self->{data}) {
180 $data = $self->{data}; 309 $data = $self->{data};
181 310
182 } elsif (exists $self->{render_cb}) { 311 } elsif (exists $self->{render_cb}) {
183 glViewport 0, 0, $self->{w}, $self->{h}; 312 glViewport 0, 0, $self->{w}, $self->{h};
184 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
185 glMatrixMode GL_PROJECTION; 313 glMatrixMode GL_PROJECTION;
186 glLoadIdentity; 314 glLoadIdentity;
315 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
187 glMatrixMode GL_MODELVIEW; 316 glMatrixMode GL_MODELVIEW;
188 glLoadIdentity; 317 glLoadIdentity;
189 glClear GL_COLOR_BUFFER_BIT;
190 $self->{render_cb}->($self, $self->{w}, $self->{h}); 318 $self->{render_cb}->($self, $self->{w}, $self->{h});
191 319
192 } else { 320 } else {
193 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 321 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
194 = CFClient::load_image_inline $self->{image}; 322 = CFClient::load_image_inline $self->{image};
195 } 323 }
196 324
197 my ($tw, $th) = @$self{qw(w h)}; 325 my ($tw, $th) = @$self{qw(w h)};
198 326
199 unless ($tw && $th) { 327 unless ($tw > 0 && $th > 0) {
200 $tw = $th = 1; 328 $tw = $th = 1;
201 $data = "\x00" x 64; 329 $data = "\x00" x 64;
202 } 330 }
331
332 $self->{minified} = [CFClient::average $tw, $th, $data]
333 if $self->{minify};
203 334
204 unless ($GL_NPOT) { 335 unless ($GL_NPOT) {
205 # TODO: does not work for zero-sized textures 336 # TODO: does not work for zero-sized textures
206 $tw = topot $tw; 337 $tw = topot $tw;
207 $th = topot $th; 338 $th = topot $th;
208 339
209 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 340 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
210 my $bpp = (length $data) / ($self->{w} * $self->{h}); 341 my $bpp = (length $data) / ($self->{w} * $self->{h});
211 $data = pack "(a" . ($tw * $bpp) . ")*", 342 $data = pack "(a" . ($tw * $bpp) . ")*",
212 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 343 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
213 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 344 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
214 } 345 }
215 } 346 }
216 347
217 $self->{s} = $self->{w} / $tw; 348 $self->{s} = $self->{w} / $tw;
218 $self->{t} = $self->{h} / $th; 349 $self->{t} = $self->{h} / $th;
219 350
220 $self->{name} ||= (glGenTextures 1)->[0]; 351 $self->{name} ||= glGenTexture;
221 352
222 glBindTexture GL_TEXTURE_2D, $self->{name}; 353 glBindTexture GL_TEXTURE_2D, $self->{name};
223 354
224 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
225 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
226 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 355 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
227 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 356 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
357
358 if ($::FAST) {
359 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
360 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
361 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
362 # alternatively check for 0x8191
363 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
364 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
365 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
366 } else {
367 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
368 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
369 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
370 }
228 371
372 glGetError;
373
229 if (defined $data) { 374 if (defined $data) {
230 glTexImage2D GL_TEXTURE_2D, 0, 375 glTexImage2D GL_TEXTURE_2D, 0,
231 $self->{internalformat}, 376 $self->{internalformat},
232 $tw, $th, # need to pad texture first 377 $tw, $th,
233 0, 378 0,
234 $self->{format}, 379 $self->{format},
235 $self->{type}, 380 $self->{type},
236 $data; 381 $data;
237 glGetError and die; 382 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
383 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
238 } else { 384 } else {
239 glCopyTexImage2D GL_TEXTURE_2D, 0, 385 glCopyTexImage2D GL_TEXTURE_2D, 0,
240 $self->{internalformat}, 386 $self->{internalformat},
241 0, 0, 387 0, 0,
242 $tw, $th, 388 $tw, $th,
243 0; 389 0;
244 glGetError and die; 390 CFClient::gl_check "copying to texture %dx%d if=%x",
391 $tw, $th, $self->{internalformat};
245 } 392 }
393
394 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
246} 395}
247 396
248sub DESTROY { 397sub DESTROY {
249 my ($self) = @_; 398 my ($self) = @_;
250 399
251 return unless exists $self->{name}; 400 delete $TEXTURES{$self+0};
252 401
253 glDeleteTextures delete $self->{name}; 402 glDeleteTexture delete $self->{name}
403 if $self->{name};
254} 404}
255 405
256sub restore_state{ 406sub restore_state {
257 $_->upload 407 $_->upload
258 for grep $_, @textures; 408 for values %TEXTURES;
259}; 409}
260 410
2611; 4111;
262 412
263=back 413=back
264 414

Diff Legend

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