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

Diff Legend

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