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.96 by root, Sat Dec 9 21:44:43 2006 UTC vs.
Revision 1.108 by root, Wed Apr 25 01:12:31 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) = @_;
… …
299 $self->{need_update} = 1; 308 $self->{need_update} = 1;
300 $self->SUPER::update; 309 $self->SUPER::update;
301} 310}
302 311
303my %DIR = ( 312my %DIR = (
313 CFPlus::SDLK_KP5, [0, "stay fire"],
304 CFPlus::SDLK_KP8, [1, "north"], 314 CFPlus::SDLK_KP8, [1, "north"],
305 CFPlus::SDLK_KP9, [2, "northeast"], 315 CFPlus::SDLK_KP9, [2, "northeast"],
306 CFPlus::SDLK_KP6, [3, "east"], 316 CFPlus::SDLK_KP6, [3, "east"],
307 CFPlus::SDLK_KP3, [4, "southeast"], 317 CFPlus::SDLK_KP3, [4, "southeast"],
308 CFPlus::SDLK_KP2, [5, "south"], 318 CFPlus::SDLK_KP2, [5, "south"],
… …
323 my $sym = $ev->{sym}; 333 my $sym = $ev->{sym};
324 my $uni = $ev->{unicode}; 334 my $uni = $ev->{unicode};
325 335
326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 336 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
327 337
328 if ($uni == ord "\t") { 338 if ($sym == 9) {
329 $::PL_WINDOW->toggle_visibility; 339 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
331 $::HELP_WINDOW->toggle_visibility; 341 $::HELP_WINDOW->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
333 ::toggle_player_page ($::STATS_PAGE); 343 ::toggle_player_page ($::STATS_PAGE);
334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 344 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 350 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
341 $::SETUP_DIALOG->toggle_visibility; 351 $::SETUP_DIALOG->toggle_visibility;
342 } elsif (!$::CONN) { 352 } elsif (!$::CONN) {
343 return 0; # bindings further down need a valid connection 353 return 0; # bindings further down need a valid connection
344 354
345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
346 $::CONN->user_send ("stay fire");
347 } elsif ($uni == ord ",") { 355 } elsif ($uni == ord ",") {
348 $::CONN->user_send ("take"); 356 $::CONN->user_send ("take");
349 } elsif ($uni == ord " ") { 357 } elsif ($uni == ord " ") {
350 $::CONN->user_send ("apply"); 358 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) { 359 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine"); 360 $::CONN->user_send ("examine");
353 } elsif ($uni == ord ".") { 361 } elsif ($uni == ord ".") {
354 $::CONN->user_send ($self->{completer}{last_command}) 362 $::CONN->user_send ($self->{completer}{last_command})
355 if exists $self->{completer}{last_command}; 363 if exists $self->{completer}{last_command};
356 } elsif (my $macro = CFPlus::Macro::match_event $ev) { 364 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
357 $::CONN->macro_send ($macro); 365 $::CONN->macro_send ($_) for @macros;
358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 366 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
359 $::CONN->user_send ("rotateshoottype +"); 367 $::CONN->user_send ("rotateshoottype +");
360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 368 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
361 $::CONN->user_send ("rotateshoottype -"); 369 $::CONN->user_send ("rotateshoottype -");
370 } elsif ($uni == ord '!') {
371 $self->{completer}->set_prefix ("shout ");
372 $self->{completer}->show;
362 } elsif ($uni == ord '"') { 373 } elsif ($uni == ord '"') {
363 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 374 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
364 $self->{completer}->show; 375 $self->{completer}->show;
365 } elsif ($uni == ord "'") { 376 } elsif ($uni == ord "'") {
366 $self->{completer}->set_prefix (""); 377 $self->{completer}->set_prefix ("");
… …
442 453
443 return 454 return
444 unless $focused || !$::FAST; 455 unless $focused || !$::FAST;
445 456
446 if (delete $self->{need_update}) { 457 if (delete $self->{need_update}) {
447 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 458 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
448 459
449 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 460 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
450 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 461 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
451 462
452 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 463 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
… …
489 500
490 glPushMatrix; 501 glPushMatrix;
491 glTranslate $sx0, $sy0; 502 glTranslate $sx0, $sy0;
492 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 503 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
493 504
494 $::MAP->draw ($dx, $dy, $sw, $sh); 505 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
495 506
496 glScale 32, 32; 507 glScale $self->{tilesize}, $self->{tilesize};
497 508
498 if (my $tex = $self->{fow_texture}) { 509 if (my $tex = $self->{fow_texture}) {
499 glEnable GL_TEXTURE_2D; 510 glEnable GL_TEXTURE_2D;
500 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
501 512
… …
545 $self->SUPER::DESTROY; 556 $self->SUPER::DESTROY;
546} 557}
547 558
548package CFPlus::MapWidget::MapMap; 559package CFPlus::MapWidget::MapMap;
549 560
561use strict;
562use utf8;
563
550our @ISA = CFPlus::UI::Base::; 564our @ISA = CFPlus::UI::Base::;
551 565
552use Time::HiRes qw(time); 566use Time::HiRes qw(time);
553use CFPlus::OpenGL; 567use CFPlus::OpenGL;
554 568
… …
576 590
577 $::MAP or return; 591 $::MAP or return;
578 592
579 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
580 594
581 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 595 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
582 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 596 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
583 597
584 my $sx = int $::CFG->{map_shift_x} / 32; 598 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
585 my $sy = int $::CFG->{map_shift_y} / 32; 599 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
586 600
587 my $ox = 0.5 * ($w - $sw); 601 my $ox = 0.5 * ($w - $sw);
588 my $oy = 0.5 * ($h - $sh); 602 my $oy = 0.5 * ($h - $sh);
589 603
590 glEnable GL_BLEND; 604 glEnable GL_BLEND;

Diff Legend

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