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.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC vs.
Revision 1.101 by root, Sun Apr 1 01:19:18 2007 UTC

… …
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro; 11use CFPlus::Macro;
12 12
13our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
14
15sub ::T() { 32 }
14 16
15my $magicmap_tex = 17my $magicmap_tex =
16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 18 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 19 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 20
… …
286 1 288 1
287} 289}
288 290
289sub size_request { 291sub size_request {
290 ( 292 (
291 32 * CFPlus::ceil $::WIDTH / 32, 293 ::T * CFPlus::ceil $::WIDTH / ::T,
292 32 * CFPlus::ceil $::HEIGHT / 32, 294 ::T * CFPlus::ceil $::HEIGHT / ::T,
293 ) 295 )
294} 296}
295 297
296sub update { 298sub update {
297 my ($self) = @_; 299 my ($self) = @_;
… …
445 447
446 return 448 return
447 unless $focused || !$::FAST; 449 unless $focused || !$::FAST;
448 450
449 if (delete $self->{need_update}) { 451 if (delete $self->{need_update}) {
450 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 452 my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};
451 453
452 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 454 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
453 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 455 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
454 456
455 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 457 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
… …
492 494
493 glPushMatrix; 495 glPushMatrix;
494 glTranslate $sx0, $sy0; 496 glTranslate $sx0, $sy0;
495 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 497 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
496 498
497 $::MAP->draw ($dx, $dy, $sw, $sh); 499 $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
498 500
499 glScale 32, 32; 501 glScale ::T, ::T;
500 502
501 if (my $tex = $self->{fow_texture}) { 503 if (my $tex = $self->{fow_texture}) {
502 glEnable GL_TEXTURE_2D; 504 glEnable GL_TEXTURE_2D;
503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
504 506
… …
579 581
580 $::MAP or return; 582 $::MAP or return;
581 583
582 my ($w, $h) = @$self{qw(w h)}; 584 my ($w, $h) = @$self{qw(w h)};
583 585
584 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 586 my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99;
585 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 587 my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;
586 588
587 my $sx = int $::CFG->{map_shift_x} / 32; 589 my $sx = int $::CFG->{map_shift_x} / ::T;
588 my $sy = int $::CFG->{map_shift_y} / 32; 590 my $sy = int $::CFG->{map_shift_y} / ::T;
589 591
590 my $ox = 0.5 * ($w - $sw); 592 my $ox = 0.5 * ($w - $sw);
591 my $oy = 0.5 * ($h - $sh); 593 my $oy = 0.5 * ($h - $sh);
592 594
593 glEnable GL_BLEND; 595 glEnable GL_BLEND;

Diff Legend

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