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.133 by root, Sat Jul 19 20:33:47 2008 UTC vs.
Revision 1.139 by root, Sun Jul 20 15:05:13 2008 UTC

… …
431 > $spd * $self->{tilesize} * $mintime * 1.1 431 > $spd * $self->{tilesize} * $mintime * 1.1
432 ) { 432 ) {
433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# 433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
434 $self->{sdx} = $self->{sdy} = 0; 434 $self->{sdx} = $self->{sdy} = 0;
435 } else { 435 } else {
436 my $upd = 0; 436 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
437
438 $spd *= $self->{tilesize} * $diff * 1.0001;
439 437
440 my $dx = $self->{sdx} < 0 ? -$spd : $spd; 438 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
441 my $dy = $self->{sdy} < 0 ? -$spd : $spd; 439 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
442 440
443 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx; $upd = 1 } 441 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
444 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy; $upd = 1 } 442 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
445 443
446 $self->update if $upd; 444 $self->update;
447 } 445 }
448 } 446 }
449 } else { 447 } else {
450 $self->{sdx} = $self->{sdy} = 0; 448 $self->{sdx} = $self->{sdy} = 0;
451 } 449 }
… …
460 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
461 $self->movement_update; 459 $self->movement_update;
462 460
463 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
464 462
463 my $sdx_t = DC::ceilabs $self->{sdx} / $tilesize;
464 my $sdy_t = DC::ceilabs $self->{sdy} / $tilesize;
465
465 # width/height of map, in tiles 466 # width/height of map, in tiles
466 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 467 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
467 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 468 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
468 469
469 # the map displacement, in tiles 470 # the map displacement, in tiles
470 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize}; 471 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
471 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize}; 472 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
472 473
473 # the upper left "visible" corner, in pixels 474 # the upper left "visible" corner, in pixels
474 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 475 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
475 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 476 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
476 477
477 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;
478 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;
479 480
480 if ($::CFG->{fow_enable}) { 481 if ($::CFG->{fow_enable}) {
482 $sdx_t = $sdy_t = 0;#d#
481 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 );
482 489
483 $self->{fow_texture} = new DC::Texture 490 $self->{fow_texture} = new DC::Texture
484 w => $w, 491 w => $w,
485 h => $h, 492 h => $h,
486 data => $data, 493 data => $data,
… …
491 } 498 }
492 499
493 glNewList ($self->{list} ||= glGenList); 500 glNewList ($self->{list} ||= glGenList);
494 501
495 glPushMatrix; 502 glPushMatrix;
496 glTranslate $sx0 + $self->{sdx}, $sy0 + $self->{sdy}; 503 glTranslate $sx0, $sy0;
497 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
505 glTranslate $self->{sdx}, $self->{sdy};
498 506
499 $::MAP->draw ($dx, $dy, $sw, $sh, 507 $::MAP->draw ($dx, $dy, $sw, $sh,
500 $self->{tilesize}, 508 $self->{tilesize},
501 $::CONN->{player}{tag}, 509 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy}); 510 -$self->{sdx}, -$self->{sdy});
503 511
512 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
504 glScale $self->{tilesize}, $self->{tilesize}; 513 glScale $self->{tilesize}, $self->{tilesize};
505 514
506 if (my $tex = $self->{fow_texture}) { 515 if (my $tex = $self->{fow_texture}) {
507 glPushMatrix; 516 glPushMatrix;
517 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
508 glScale 1/3, 1/3; 518 glScale 1/3, 1/3;
509 glEnable GL_TEXTURE_2D; 519 glEnable GL_TEXTURE_2D;
510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
511 521
512 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