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.130 by root, Thu May 8 18:58:55 2008 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
… …
352 346
353 my $res = 0; 347 my $res = 0;
354 my $mod = $ev->{mod}; 348 my $mod = $ev->{mod};
355 my $sym = $ev->{sym}; 349 my $sym = $ev->{sym};
356 350
351 delete $self->{last_mod};
352 delete $self->{last_sym};
353
357 if ($::CFG->{shift_fire_stop}) { 354 if ($::CFG->{shift_fire_stop}) {
358 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { 355 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
359 $::CONN->user_send ("fire_stop"); 356 $::CONN->user_send ("fire_stop");
360 delete $self->{fire_dir}; 357 delete $self->{fire_dir};
361 $res = 1; 358 $res = 1;
… …
387 $self->refresh_hook; 384 $self->refresh_hook;
388 385
389 0 386 0
390} 387}
391 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
392sub set_magicmap { 406sub set_magicmap {
393 my ($self, $w, $h, $x, $y, $data) = @_; 407 my ($self, $w, $h, $x, $y, $data) = @_;
394 408
395 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 409 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
396 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 410 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
398 $self->{magicmap} = [$x, $y, $w, $h, $data]; 412 $self->{magicmap} = [$x, $y, $w, $h, $data];
399 413
400 $self->update; 414 $self->update;
401} 415}
402 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
403sub refresh_hook { 454sub refresh_hook {
404 my ($self) = @_; 455 my ($self) = @_;
405 456
406 if ($::MAP && $::CONN) { 457 if ($::MAP && $::CONN) {
407 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
459 $self->movement_update;
460
408 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
409 462
463 # width/height of map, in tiles
410 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 464 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
411 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 465 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
412 466
467 # the map displacement, in tiles
413 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize; 468 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize};
414 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize; 469 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize};
415 470
471 # the upper left "visible" corner, in pixels
416 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
417 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
418 474
419 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;
420 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;
… …
435 glNewList ($self->{list} ||= glGenList); 491 glNewList ($self->{list} ||= glGenList);
436 492
437 glPushMatrix; 493 glPushMatrix;
438 glTranslate $sx0, $sy0; 494 glTranslate $sx0, $sy0;
439 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
496 glTranslate $self->{sdx}, $self->{sdy};
440 497
498 warn "mapdraw -$self->{sdx}\n";#d#
441 $::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});
442 503
504 glTranslate -$self->{sdx}, -$self->{sdy};
443 glScale $self->{tilesize}, $self->{tilesize}; 505 glScale $self->{tilesize}, $self->{tilesize};
444 506
445 if (my $tex = $self->{fow_texture}) { 507 if (my $tex = $self->{fow_texture}) {
446 glPushMatrix; 508 glPushMatrix;
447 glScale 1/3, 1/3; 509 glScale 1/3, 1/3;

Diff Legend

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