ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.126 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC

… …
25 tilesize => 32, 25 tilesize => 32,
26 @_ 26 @_
27 ); 27 );
28 28
29 $self 29 $self
30}
31
32sub set_tilesize {
33 my ($self, $tilesize) = @_;
34
35 $self->{tilesize} = $tilesize;
36} 30}
37 31
38sub add_command { 32sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 33 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 34
… …
206 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
212 [ 206 [
213 $::PICKUP_ENABLE->{state} 207 $::PICKUP_ENABLE->{state}
214 ? "Disable automatic pickup" 208 ? "Disable automatic pickup"
215 : "Enable automatic pickup", 209 : "Enable automatic pickup",
216 sub { $::PICKUP_ENABLE->toggle } 210 sub { $::PICKUP_ENABLE->toggle }
217 ], 211 ],
218 ); 212 );
219 213
220 if ($::CONN && $::CONN->{editor_support}) { 214 if ($::CONN && $::CONN->{editor_support}) {
221 push @items, [ 215# push @items, [
222 "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
223 \&editor_invoke, 217# \&editor_invoke,
224 ]; 218# ];
225 219
226 for my $type (qw(test name)) { 220 for my $type (qw(test name)) {
227 $::CONN->{editor_support}{type} ne $type 221 $::CONN->{editor_support}{type} ne $type
228 or next; 222 or next;
229 my $server = $::CONN->{editor_support}{"${type}server"} 223 my $server = $::CONN->{editor_support}{"${type}server"}
… …
319 my $mod = $ev->{mod}; 313 my $mod = $ev->{mod};
320 my $sym = $ev->{sym}; 314 my $sym = $ev->{sym};
321 my $uni = $ev->{unicode}; 315 my $uni = $ev->{unicode};
322 316
323 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; 317 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT;
318
319 # ignore repeated keypresses
320 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
321 $self->{last_mod} = $mod;
322 $self->{last_sym} = $sym;
324 323
325 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { 324 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
326 if ($mod & DC::KMOD_SHIFT) { 325 if ($mod & DC::KMOD_SHIFT) {
327 $self->{shft}++; 326 $self->{shft}++;
328 if ($dir->[0] != $self->{fire_dir}) { 327 if ($dir->[0] != $self->{fire_dir}) {
… …
347 346
348 my $res = 0; 347 my $res = 0;
349 my $mod = $ev->{mod}; 348 my $mod = $ev->{mod};
350 my $sym = $ev->{sym}; 349 my $sym = $ev->{sym};
351 350
351 delete $self->{last_mod};
352 delete $self->{last_sym};
353
352 if ($::CFG->{shift_fire_stop}) { 354 if ($::CFG->{shift_fire_stop}) {
353 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { 355 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
354 $::CONN->user_send ("fire_stop"); 356 $::CONN->user_send ("fire_stop");
355 delete $self->{fire_dir}; 357 delete $self->{fire_dir};
356 $res = 1; 358 $res = 1;
… …
382 $self->refresh_hook; 384 $self->refresh_hook;
383 385
384 0 386 0
385} 387}
386 388
389sub set_tilesize {
390 my ($self, $tilesize) = @_;
391
392 $self->{tilesize} = $tilesize;
393}
394
395sub scroll {
396 my ($self, $dx, $dy) = @_;
397
398 $::MAP->scroll ($dx, $dy);
399
400 $self->movement_update;
401
402 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
403 $self->{sdy} += $dy * $self->{tilesize};
404}
405
387sub set_magicmap { 406sub set_magicmap {
388 my ($self, $w, $h, $x, $y, $data) = @_; 407 my ($self, $w, $h, $x, $y, $data) = @_;
389 408
390 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 409 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
391 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 410 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
393 $self->{magicmap} = [$x, $y, $w, $h, $data]; 412 $self->{magicmap} = [$x, $y, $w, $h, $data];
394 413
395 $self->update; 414 $self->update;
396} 415}
397 416
417sub movement_update {
418 my ($self) = @_;
419
420 if ($::CFG->{smooth_movement}) {
421 if ($self->{sdx} || $self->{sdy}) {
422 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
423 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
424
425 # the minimum time for a single tile movement
426 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK);
427
428 # jump if "impossibly high" speed
429 if (
430 (max abs $self->{sdx}, abs $self->{sdy})
431 > $spd * $self->{tilesize} * $mintime * 1.1
432 ) {
433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
434 $self->{sdx} = $self->{sdy} = 0;
435 } else {
436 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
437
438 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
439 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
440
441 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
442 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
443
444 $self->update;
445 }
446 }
447 } else {
448 $self->{sdx} = $self->{sdy} = 0;
449 }
450
451 $self->{last_update} = EV::time;
452}
453
398sub refresh_hook { 454sub refresh_hook {
399 my ($self) = @_; 455 my ($self) = @_;
400 456
401 if ($::MAP && $::CONN) { 457 if ($::MAP && $::CONN) {
402 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
459 $self->movement_update;
460
403 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
404 462
463 # width/height of map, in tiles
405 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 464 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
406 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 465 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
407 466
467 # the map displacement, in tiles
408 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize; 468 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize};
409 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize; 469 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize};
410 470
471 # the upper left "visible" corner, in pixels
411 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
412 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
413 474
414 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 475 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
415 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 476 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
… …
430 glNewList ($self->{list} ||= glGenList); 491 glNewList ($self->{list} ||= glGenList);
431 492
432 glPushMatrix; 493 glPushMatrix;
433 glTranslate $sx0, $sy0; 494 glTranslate $sx0, $sy0;
434 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
496 glTranslate $self->{sdx}, $self->{sdy};
435 497
498 warn "mapdraw -$self->{sdx}\n";#d#
436 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 499 $::MAP->draw ($dx, $dy, $sw, $sh,
500 $self->{tilesize},
501 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy});
437 503
504 glTranslate -$self->{sdx}, -$self->{sdy};
438 glScale $self->{tilesize}, $self->{tilesize}; 505 glScale $self->{tilesize}, $self->{tilesize};
439 506
440 if (my $tex = $self->{fow_texture}) { 507 if (my $tex = $self->{fow_texture}) {
441 glPushMatrix; 508 glPushMatrix;
442 glScale 1/3, 1/3; 509 glScale 1/3, 1/3;
… …
630 $self->add ($self->{vbox} = new DC::UI::VBox); 697 $self->add ($self->{vbox} = new DC::UI::VBox);
631 698
632 $self->{label} = [ 699 $self->{label} = [
633 map 700 map
634 DC::UI::Label->new ( 701 DC::UI::Label->new (
702 align => 0,
635 can_hover => 1, 703 can_hover => 1,
636 can_events => 1, 704 can_events => 1,
637 tooltip_width => 0.33, 705 tooltip_width => 0.33,
638 fontsize => $_, 706 fontsize => $_,
639 ), (0.8) x 16 707 ), (0.8) x 16

Diff Legend

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