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.49 by root, Sun Apr 30 08:09:44 2006 UTC vs.
Revision 1.69 by root, Thu May 25 23:06:05 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 utf8;
25
24use Carp (); 26use Carp ();
25use AnyEvent; 27use AnyEvent ();
26use BerkeleyDB; 28use BerkeleyDB;
29
27use CFClient::OpenGL; 30use CFClient::OpenGL;
28 31
29our %GL_EXT; 32our %GL_EXT;
30our $GL_VERSION; 33our $GL_VERSION;
31 34
… …
35sub gl_init { 38sub gl_init {
36 $GL_VERSION = gl_version * 1; 39 $GL_VERSION = gl_version * 1;
37 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 40 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
38 41
39 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 42 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
43 $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
40 44
41 glDisable GL_COLOR_MATERIAL; 45 glDisable GL_COLOR_MATERIAL;
42 glShadeModel GL_FLAT; 46 glShadeModel GL_FLAT;
43 glDisable GL_DITHER; 47 glDisable GL_DITHER;
44 glDisable GL_DEPTH_TEST; 48 glDisable GL_DEPTH_TEST;
49 glDepthMask 0;
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 50 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46 51
47 CFClient::Texture::restore_state (); 52 CFClient::Texture::restore_state ();
48} 53}
49 54
50sub gl_check { 55sub gl_check {
51 return unless $GL_DEBUG; 56 return unless $GL_DEBUG;
52 57
53 if (my $error = glGetError) { 58 if (my $error = glGetError) {
59 my ($format, @args) = @_;
54 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_; 60 Carp::cluck sprintf "opengl error %x while $format", $error, @args;
55 } 61 }
56} 62}
57 63
58sub find_rcfile($) { 64sub find_rcfile($) {
59 my $path; 65 my $path;
… …
104 -Home => "$Crossfire::VARDIR/pclient", 110 -Home => "$Crossfire::VARDIR/pclient",
105 -Cachesize => 1_000_000, 111 -Cachesize => 1_000_000,
106 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 112 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
107# -ErrPrefix => "DATABASE", 113# -ErrPrefix => "DATABASE",
108 -Verbose => 1, 114 -Verbose => 1,
109 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 115 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
110 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 116 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
111 117
112sub db_table($) { 118sub db_table($) {
113 my ($table) = @_; 119 my ($table) = @_;
114 120
… …
117 new CFClient::Database 123 new CFClient::Database
118 -Env => $DB_ENV, 124 -Env => $DB_ENV,
119 -Filename => $table, 125 -Filename => $table,
120# -Filename => "database", 126# -Filename => "database",
121# -Subname => $table, 127# -Subname => $table,
128 -Property => DB_CHKSUM,
122 -Flags => DB_CREATE | DB_UPGRADE, 129 -Flags => DB_CREATE | DB_UPGRADE,
123 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 130 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
131}
132
133sub pod_to_pango($) {
134 my ($pom) = @_;
135
136 $pom->present ("CFClient::PodToPango")
137}
138
139sub pod_to_pango_list($) {
140 my ($pom) = @_;
141
142 [
143 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
144 split /\n/, $pom->present ("CFClient::PodToPango")
145 ]
146}
147
148package CFClient::PodToPango;
149
150use base Pod::POM::View::Text;
151
152our $indent = 0;
153
154*view_seq_code =
155*view_seq_bold = sub { "<b>$_[1]</b>" };
156*view_seq_italic = sub { "<i>$_[1]</i>" };
157*view_seq_space =
158*view_seq_link =
159*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
160
161sub view_seq_text {
162 my $text = $_[1];
163 $text =~ s/\s+/ /g;
164 CFClient::UI::Label::escape ($text)
165}
166
167sub view_item {
168 ("\t" x ($indent / 4))
169 . $_[1]->title->present ($_[0])
170 . "\n"
171 . $_[1]->content->present ($_[0])
172}
173
174sub view_verbatim {
175 (join "",
176 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
177 split /\n/, CFClient::UI::Label::escape ($_[1]))
178 . "\n"
179}
180
181sub view_textblock {
182 ("\t" x ($indent / 2)) . "$_[1]\n\n"
183}
184
185sub view_head1 {
186 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
187 . $_[1]->content->present ($_[0])
188};
189
190sub view_head2 {
191 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
192 . $_[1]->content->present ($_[0])
193};
194
195sub view_head3 {
196 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
197 . $_[1]->content->present ($_[0])
198};
199
200sub view_over {
201 local $indent = $indent + $_[1]->indent;
202 $_[1]->content->present ($_[0])
124} 203}
125 204
126package CFClient::Database; 205package CFClient::Database;
127 206
128our @ISA = BerkeleyDB::Btree::; 207our @ISA = BerkeleyDB::Btree::;
… …
141 my ($db, $key, $data) = @_; 220 my ($db, $key, $data) = @_;
142 221
143 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 222 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
144 223
145 $db->db_put ($key => $data) 224 $db->db_put ($key => $data)
225}
226
227package CFClient::Item;
228
229sub desc_string {
230 my ($self) = @_;
231
232 my $desc =
233 $self->{nrof} < 2
234 ? $self->{name}
235 : "$self->{nrof} × $self->{name_pl}";
236
237 $self->{flags} & Crossfire::Protocol::F_OPEN
238 and $desc .= " (open)";
239 $self->{flags} & Crossfire::Protocol::F_APPLIED
240 and $desc .= " (applied)";
241 $self->{flags} & Crossfire::Protocol::F_UNPAID
242 and $desc .= " (unpaid)";
243 $self->{flags} & Crossfire::Protocol::F_MAGIC
244 and $desc .= " (magic)";
245 $self->{flags} & Crossfire::Protocol::F_CURSED
246 and $desc .= " (cursed)";
247 $self->{flags} & Crossfire::Protocol::F_DAMNED
248 and $desc .= " (damned)";
249 $self->{flags} & Crossfire::Protocol::F_LOCKED
250 and $desc .= " *";
251
252 $desc
253}
254
255sub weight_string {
256 my ($self) = @_;
257
258 my $weight = ($self->{nrof} || 1) * $self->{weight};
259
260 $weight < 0 ? "?" : $weight * 0.001
261}
262
263sub update_widgets {
264 my ($self) = @_;
265
266 my $button_cb = sub {
267 my (undef, $ev, $x, $y) = @_;
268
269 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
270 my $targ = $::CONN->{player}{tag};
271
272 if ($self->{container} == $::CONN->{player}{tag}) {
273 $targ = $::CONN->{open_container};
274 }
275
276 $::CONN->send ("move $targ $self->{tag} 0");
277 } elsif ($ev->{button} == 1) {
278 $::CONN->send ("examine $self->{tag}");
279 } elsif ($ev->{button} == 2) {
280 $::CONN->send ("apply $self->{tag}");
281 } elsif ($ev->{button} == 3) {
282 my @menu_items = (
283 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
284 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
285 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
286 (
287 $self->{flags} & Crossfire::Protocol::F_LOCKED
288 ? (
289 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
290 )
291 : (
292 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
293 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
294 )
295 ),
296 );
297
298 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
299 }
300
301 1
302 };
303
304 my $tooltip_std = "<small>"
305 . "Left click - examine item\n"
306 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
307 . "Middle click - apply\n"
308 . "Right click - further options"
309 . "</small>\n";
310
311 $self->{face_widget} ||= new CFClient::UI::Face
312 can_events => 1,
313 can_hover => 1,
314 anim => $self->{anim},
315 animspeed => $self->{animspeed}, # TODO# must be set at creation time
316 connect_button_down => $button_cb,
317 ;
318 $self->{face_widget}{face} = $self->{face};
319 $self->{face_widget}{anim} = $self->{anim};
320 $self->{face_widget}{animspeed} = $self->{animspeed};
321 $self->{face_widget}->set_tooltip (
322 "<b>Face/Animation.</b>\n"
323 . "Item uses face #$self->{face}. "
324 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
325 . "\n\n$tooltip_std"
326 );
327
328 $self->{desc_widget} ||= new CFClient::UI::Label
329 can_events => 1,
330 can_hover => 1,
331 ellipsise => 2,
332 align => -1,
333 connect_button_down => $button_cb,
334 ;
335 my $desc = CFClient::Item::desc_string $self;
336 $self->{desc_widget}->set_text ($desc);
337 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
338
339 $self->{weight_widget} ||= new CFClient::UI::Label
340 can_events => 1,
341 can_hover => 1,
342 ellipsise => 0,
343 align => 0,
344 connect_button_down => $button_cb,
345 ;
346 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
347
348 $self->{weight_widget}->set_tooltip (
349 "<b>Weight</b>.\n"
350 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
351 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
352 . "\n\n$tooltip_std"
353 );
146} 354}
147 355
148package CFClient::Texture; 356package CFClient::Texture;
149 357
150use strict; 358use strict;
… …
201#} 409#}
202 410
203sub new_from_layout { 411sub new_from_layout {
204 my ($class, $layout, %arg) = @_; 412 my ($class, $layout, %arg) = @_;
205 413
206 my ($w, $h, $data) = $layout->render; 414 my ($w, $h, $data, $format, $internalformat) = $layout->render;
207 415
208 $class->new ( 416 $class->new (
209 w => $w, 417 w => $w,
210 h => $h, 418 h => $h,
211 data => $data, 419 data => $data,
212 format => GL_ALPHA, 420 format => $format,
213 internalformat => GL_ALPHA, 421 internalformat => $format,
214 type => GL_UNSIGNED_BYTE, 422 type => GL_UNSIGNED_BYTE,
215 %arg, 423 %arg,
216 ) 424 )
217} 425}
218 426
… …
300 glGetError; 508 glGetError;
301 509
302 if (defined $data) { 510 if (defined $data) {
303 glTexImage2D GL_TEXTURE_2D, 0, 511 glTexImage2D GL_TEXTURE_2D, 0,
304 $self->{internalformat}, 512 $self->{internalformat},
305 $tw, $th, # need to pad texture first 513 $tw, $th,
306 0, 514 0,
307 $self->{format}, 515 $self->{format},
308 $self->{type}, 516 $self->{type},
309 $data; 517 $data;
310 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x", 518 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
… …
316 $tw, $th, 524 $tw, $th,
317 0; 525 0;
318 CFClient::gl_check "copying to texture %dx%d if=%x", 526 CFClient::gl_check "copying to texture %dx%d if=%x",
319 $tw, $th, $self->{internalformat}; 527 $tw, $th, $self->{internalformat};
320 } 528 }
529
530 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
321} 531}
322 532
323sub DESTROY { 533sub DESTROY {
324 my ($self) = @_; 534 my ($self) = @_;
325 535
… …
327 537
328 glDeleteTexture delete $self->{name} 538 glDeleteTexture delete $self->{name}
329 if $self->{name}; 539 if $self->{name};
330} 540}
331 541
332sub restore_state{ 542sub restore_state {
333 $_->upload 543 $_->upload
334 for values %TEXTURES; 544 for values %TEXTURES;
335}; 545}
336 546
3371; 5471;
338 548
339=back 549=back
340 550

Diff Legend

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