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.136 by root, Sun Jul 20 02:55:36 2008 UTC vs.
Revision 1.137 by root, Sun Jul 20 03:46:02 2008 UTC

458 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
459 $self->movement_update; 459 $self->movement_update;
460 460
461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
462 462
463 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
464 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
465
463 # width/height of map, in tiles 466 # width/height of map, in tiles
464 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 467 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
465 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 468 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
466 469
467 # the map displacement, in tiles 470 # the map displacement, in tiles
468 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;
469 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;
470 473
471 # the upper left "visible" corner, in pixels 474 # the upper left "visible" corner, in pixels
472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 475 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 476 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
474 477
475 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;
476 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;
477 480
478 if ($::CFG->{fow_enable}) { 481 if ($::CFG->{fow_enable}) {
479 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 482 my ($w, $h, $data) = $::MAP->fow_texture (
483 $dx + (min 0, $sdx_t),
484 $dy + (min 0, $sdy_t),
485 $sw + abs $sdx_t,
486 $sh + abs $sdy_t
487 );
480 488
481 $self->{fow_texture} = new DC::Texture 489 $self->{fow_texture} = new DC::Texture
482 w => $w, 490 w => $w,
483 h => $h, 491 h => $h,
484 data => $data, 492 data => $data,
503 glTranslate -$self->{sdx}, -$self->{sdy}; 511 glTranslate -$self->{sdx}, -$self->{sdy};
504 glScale $self->{tilesize}, $self->{tilesize}; 512 glScale $self->{tilesize}, $self->{tilesize};
505 513
506 if (my $tex = $self->{fow_texture}) { 514 if (my $tex = $self->{fow_texture}) {
507 glPushMatrix; 515 glPushMatrix;
516 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
508 glScale 1/3, 1/3; 517 glScale 1/3, 1/3;
509 glEnable GL_TEXTURE_2D; 518 glEnable GL_TEXTURE_2D;
510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
511 520
512 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 521 glColor +($::CFG->{fow_intensity}) x 3, 0.9;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines