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.99 by root, Sat Dec 23 08:07:56 2006 UTC vs.
Revision 1.107 by root, Sat Apr 14 06:51:45 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
23 z => -1, 23 z => -1,
24 can_focus => 1, 24 can_focus => 1,
25 list => glGenList, 25 list => glGenList,
26 tilesize => 32,
26 27
27 smooth_matrix => [ 28 smooth_matrix => [
28 0.05, 0.13, 0.05, 29 0.05, 0.13, 0.05,
29 0.13, 0.30, 0.13, 30 0.13, 0.30, 0.13,
30 0.05, 0.13, 0.05, 31 0.05, 0.13, 0.05,
… …
37 command => $self->{command}, 38 command => $self->{command},
38 tooltip => "#completer_help", 39 tooltip => "#completer_help",
39 ; 40 ;
40 41
41 $self 42 $self
43}
44
45sub set_tilesize {
46 my ($self, $tilesize) = @_;
47
48 $self->{tilesize} = $tilesize;
42} 49}
43 50
44sub add_command { 51sub add_command {
45 my ($self, $command, $tooltip, $widget, $cb) = @_; 52 my ($self, $command, $tooltip, $widget, $cb) = @_;
46 53
… …
177 184
178 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
179 $self->grab_focus; 186 $self->grab_focus;
180 return unless $::CONN; 187 return unless $::CONN;
181 188
182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; 189 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; 190 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
184 191
185 $x -= CFPlus::floor $::MAP->w * 0.5; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
186 $y -= CFPlus::floor $::MAP->h * 0.5; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
187 194
188 if ($::CONN) { 195 if ($::CONN) {
… …
285 292
286 1 293 1
287} 294}
288 295
289sub size_request { 296sub size_request {
297 my ($self) = @_;
298
290 ( 299 (
291 32 * CFPlus::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
292 32 * CFPlus::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
293 ) 302 )
294} 303}
295 304
296sub update { 305sub update {
297 my ($self) = @_; 306 my ($self) = @_;
… …
340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 349 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
341 $::SETUP_DIALOG->toggle_visibility; 350 $::SETUP_DIALOG->toggle_visibility;
342 } elsif (!$::CONN) { 351 } elsif (!$::CONN) {
343 return 0; # bindings further down need a valid connection 352 return 0; # bindings further down need a valid connection
344 353
345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 354 } elsif ($sym == CFPlus::SDLK_KP5 && !($mod & ~CFPlus::KMOD_SHIFT)) {
346 $::CONN->user_send ("stay fire"); 355 $::CONN->user_send ("stay fire");
347 } elsif ($uni == ord ",") { 356 } elsif ($uni == ord ",") {
348 $::CONN->user_send ("take"); 357 $::CONN->user_send ("take");
349 } elsif ($uni == ord " ") { 358 } elsif ($uni == ord " ") {
350 $::CONN->user_send ("apply"); 359 $::CONN->user_send ("apply");
… …
357 $::CONN->macro_send ($_) for @macros; 366 $::CONN->macro_send ($_) for @macros;
358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 367 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
359 $::CONN->user_send ("rotateshoottype +"); 368 $::CONN->user_send ("rotateshoottype +");
360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 369 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
361 $::CONN->user_send ("rotateshoottype -"); 370 $::CONN->user_send ("rotateshoottype -");
371 } elsif ($uni == ord '!') {
372 $self->{completer}->set_prefix ("shout ");
373 $self->{completer}->show;
362 } elsif ($uni == ord '"') { 374 } elsif ($uni == ord '"') {
363 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 375 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
364 $self->{completer}->show; 376 $self->{completer}->show;
365 } elsif ($uni == ord "'") { 377 } elsif ($uni == ord "'") {
366 $self->{completer}->set_prefix (""); 378 $self->{completer}->set_prefix ("");
… …
442 454
443 return 455 return
444 unless $focused || !$::FAST; 456 unless $focused || !$::FAST;
445 457
446 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
447 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 459 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
448 460
449 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
450 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
451 463
452 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
… …
489 501
490 glPushMatrix; 502 glPushMatrix;
491 glTranslate $sx0, $sy0; 503 glTranslate $sx0, $sy0;
492 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
493 505
494 $::MAP->draw ($dx, $dy, $sw, $sh); 506 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
495 507
496 glScale 32, 32; 508 glScale $self->{tilesize}, $self->{tilesize};
497 509
498 if (my $tex = $self->{fow_texture}) { 510 if (my $tex = $self->{fow_texture}) {
499 glEnable GL_TEXTURE_2D; 511 glEnable GL_TEXTURE_2D;
500 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
501 513
… …
545 $self->SUPER::DESTROY; 557 $self->SUPER::DESTROY;
546} 558}
547 559
548package CFPlus::MapWidget::MapMap; 560package CFPlus::MapWidget::MapMap;
549 561
562use strict;
563use utf8;
564
550our @ISA = CFPlus::UI::Base::; 565our @ISA = CFPlus::UI::Base::;
551 566
552use Time::HiRes qw(time); 567use Time::HiRes qw(time);
553use CFPlus::OpenGL; 568use CFPlus::OpenGL;
554 569
… …
576 591
577 $::MAP or return; 592 $::MAP or return;
578 593
579 my ($w, $h) = @$self{qw(w h)}; 594 my ($w, $h) = @$self{qw(w h)};
580 595
581 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 596 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
582 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 597 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
583 598
584 my $sx = int $::CFG->{map_shift_x} / 32; 599 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
585 my $sy = int $::CFG->{map_shift_y} / 32; 600 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
586 601
587 my $ox = 0.5 * ($w - $sw); 602 my $ox = 0.5 * ($w - $sw);
588 my $oy = 0.5 * ($h - $sh); 603 my $oy = 0.5 * ($h - $sh);
589 604
590 glEnable GL_BLEND; 605 glEnable GL_BLEND;

Diff Legend

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