| … | |
… | |
| 421 | if ($self->{sdx} || $self->{sdy}) { |
421 | if ($self->{sdx} || $self->{sdy}) { |
| 422 | my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); |
422 | my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); |
| 423 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
423 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
| 424 | |
424 | |
| 425 | # the minimum time for a single tile movement |
425 | # the minimum time for a single tile movement |
| 426 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK); |
426 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); |
| 427 | |
427 | |
| 428 | # jump if "impossibly high" speed |
428 | # jump if "impossibly high" speed |
| 429 | if ( |
429 | if ( |
| 430 | (max abs $self->{sdx}, abs $self->{sdy}) |
430 | (max abs $self->{sdx}, abs $self->{sdy}) |
| 431 | > $spd * $self->{tilesize} * $mintime * 1.1 |
431 | > $spd * $self->{tilesize} * $mintime * 1.1 |
| … | |
… | |
| 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} = 2 + DC::ceil $self->{w} / $tilesize; |
| 465 | my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; |
468 | my $sh = $self->{sh} = 2 + 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}) { |
|
|
482 | $sdx_t = $sdy_t = 0;#d# |
| 479 | 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 | ); |
| 480 | |
489 | |
| 481 | $self->{fow_texture} = new DC::Texture |
490 | $self->{fow_texture} = new DC::Texture |
| 482 | w => $w, |
491 | w => $w, |
| 483 | h => $h, |
492 | h => $h, |
| 484 | data => $data, |
493 | data => $data, |
| … | |
… | |
| 493 | glPushMatrix; |
502 | glPushMatrix; |
| 494 | glTranslate $sx0, $sy0; |
503 | glTranslate $sx0, $sy0; |
| 495 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
504 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
| 496 | glTranslate $self->{sdx}, $self->{sdy}; |
505 | glTranslate $self->{sdx}, $self->{sdy}; |
| 497 | |
506 | |
| 498 | warn "mapdraw -$self->{sdx}\n";#d# |
|
|
| 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 | |
| 504 | glTranslate -$self->{sdx}, -$self->{sdy}; |
512 | #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player |
| 505 | glScale $self->{tilesize}, $self->{tilesize}; |
513 | glScale $self->{tilesize}, $self->{tilesize}; |
| 506 | |
514 | |
| 507 | if (my $tex = $self->{fow_texture}) { |
515 | if (my $tex = $self->{fow_texture}) { |
| 508 | glPushMatrix; |
516 | glPushMatrix; |
|
|
517 | glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); |
| 509 | glScale 1/3, 1/3; |
518 | glScale 1/3, 1/3; |
| 510 | glEnable GL_TEXTURE_2D; |
519 | glEnable GL_TEXTURE_2D; |
| 511 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
520 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
| 512 | |
521 | |
| 513 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
522 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
