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.132 by root, Sun Jul 13 12:17:00 2008 UTC vs.
Revision 1.138 by root, Sun Jul 20 04:17:02 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
… …
390 $self->refresh_hook; 384 $self->refresh_hook;
391 385
392 0 386 0
393} 387}
394 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
395sub set_magicmap { 406sub set_magicmap {
396 my ($self, $w, $h, $x, $y, $data) = @_; 407 my ($self, $w, $h, $x, $y, $data) = @_;
397 408
398 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 409 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
399 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 410 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
401 $self->{magicmap} = [$x, $y, $w, $h, $data]; 412 $self->{magicmap} = [$x, $y, $w, $h, $data];
402 413
403 $self->update; 414 $self->update;
404} 415}
405 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
406sub refresh_hook { 454sub refresh_hook {
407 my ($self) = @_; 455 my ($self) = @_;
408 456
409 if ($::MAP && $::CONN) { 457 if ($::MAP && $::CONN) {
410 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
459 $self->movement_update;
460
411 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
412 462
463 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
464 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
465
466 # width/height of map, in tiles
413 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 467 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
414 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 468 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
415 469
470 # the map displacement, in tiles
416 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize; 471 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
417 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize; 472 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
418 473
474 # the upper left "visible" corner, in pixels
419 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 475 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
420 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 476 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
421 477
422 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 478 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
423 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 479 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
424 480
425 if ($::CFG->{fow_enable}) { 481 if ($::CFG->{fow_enable}) {
482 $sdx_t = $sdy_t = 0;#d#
426 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 483 my ($w, $h, $data) = $::MAP->fow_texture (
484 $dx + (min 0, $sdx_t),
485 $dy + (min 0, $sdy_t),
486 $sw + abs $sdx_t,
487 $sh + abs $sdy_t
488 );
427 489
428 $self->{fow_texture} = new DC::Texture 490 $self->{fow_texture} = new DC::Texture
429 w => $w, 491 w => $w,
430 h => $h, 492 h => $h,
431 data => $data, 493 data => $data,
… …
438 glNewList ($self->{list} ||= glGenList); 500 glNewList ($self->{list} ||= glGenList);
439 501
440 glPushMatrix; 502 glPushMatrix;
441 glTranslate $sx0, $sy0; 503 glTranslate $sx0, $sy0;
442 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
505 glTranslate $self->{sdx}, $self->{sdy};
443 506
444 $::MAP->draw ($dx, $dy, $sw, $sh, 507 $::MAP->draw ($dx, $dy, $sw, $sh,
445 $self->{tilesize}, 508 $self->{tilesize},
446 $::CONN->{player}{tag}, 0, 0); 509 $::CONN->{player}{tag},
510 -$self->{sdx}, -$self->{sdy});
447 511
512 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
448 glScale $self->{tilesize}, $self->{tilesize}; 513 glScale $self->{tilesize}, $self->{tilesize};
449 514
450 if (my $tex = $self->{fow_texture}) { 515 if (my $tex = $self->{fow_texture}) {
451 glPushMatrix; 516 glPushMatrix;
517 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
452 glScale 1/3, 1/3; 518 glScale 1/3, 1/3;
453 glEnable GL_TEXTURE_2D; 519 glEnable GL_TEXTURE_2D;
454 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
455 521
456 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 522 glColor +($::CFG->{fow_intensity}) x 3, 0.9;

Diff Legend

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