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.95 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.105 by root, Wed Apr 4 02:54:02 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
… …
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) = @_;
… …
323 my $sym = $ev->{sym}; 332 my $sym = $ev->{sym};
324 my $uni = $ev->{unicode}; 333 my $uni = $ev->{unicode};
325 334
326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 335 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
327 336
328 if ($uni == ord "\t") { 337 if ($sym == 9) {
329 $::PL_WINDOW->toggle_visibility; 338 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 339 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
331 $::HELP_WINDOW->toggle_visibility; 340 $::HELP_WINDOW->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
333 ::toggle_player_page ($::STATS_PAGE); 342 ::toggle_player_page ($::STATS_PAGE);
334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
337 ::toggle_player_page ($::SPELL_PAGE); 346 ::toggle_player_page ($::SPELL_PAGE);
338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
339 ::toggle_player_page ($::INVENTORY_PAGE); 348 ::toggle_player_page ($::INVENTORY_PAGE);
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 ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
343 $::BIND_EDITOR->set_binding (undef, undef, [],
344 sub {
345 my ($mod, $sym, $cmds) = @_;
346 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
347 });
348 $::BIND_EDITOR->start;
349 $::BIND_EDITOR->show;
350#TODO: elmex, what was this supposed to do? it currently crashes the client.
351# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
352# $::BIND_EDITOR->stop;
353# $::BIND_EDITOR->ask_for_bind_and_commit;
354# $::BIND_EDITOR->hide;
355 } elsif (!$::CONN) { 351 } elsif (!$::CONN) {
356 return 0; # bindings further down need a valid connection 352 return 0; # bindings further down need a valid connection
357 353
358 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 354 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
359 $::CONN->user_send ("stay fire"); 355 $::CONN->user_send ("stay fire");
… …
364 } elsif ($uni == 13) { 360 } elsif ($uni == 13) {
365 $::CONN->user_send ("examine"); 361 $::CONN->user_send ("examine");
366 } elsif ($uni == ord ".") { 362 } elsif ($uni == ord ".") {
367 $::CONN->user_send ($self->{completer}{last_command}) 363 $::CONN->user_send ($self->{completer}{last_command})
368 if exists $self->{completer}{last_command}; 364 if exists $self->{completer}{last_command};
369 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 365 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
370 $::CONN->user_send ($_) for @$bind_cmd; 366 $::CONN->macro_send ($_) for @macros;
371 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 367 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
372 $::CONN->user_send ("rotateshoottype +"); 368 $::CONN->user_send ("rotateshoottype +");
373 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 369 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
374 $::CONN->user_send ("rotateshoottype -"); 370 $::CONN->user_send ("rotateshoottype -");
371 } elsif ($uni == ord '!') {
372 $self->{completer}->set_prefix ("shout ");
373 $self->{completer}->show;
375 } elsif ($uni == ord '"') { 374 } elsif ($uni == ord '"') {
376 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 375 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
377 $self->{completer}->show; 376 $self->{completer}->show;
378 } elsif ($uni == ord "'") { 377 } elsif ($uni == ord "'") {
379 $self->{completer}->set_prefix (""); 378 $self->{completer}->set_prefix ("");
… …
455 454
456 return 455 return
457 unless $focused || !$::FAST; 456 unless $focused || !$::FAST;
458 457
459 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
460 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 459 my $tilesize = $self->{tilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
461 460
462 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
463 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
464 463
465 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
… …
502 501
503 glPushMatrix; 502 glPushMatrix;
504 glTranslate $sx0, $sy0; 503 glTranslate $sx0, $sy0;
505 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
506 505
507 $::MAP->draw ($dx, $dy, $sw, $sh); 506 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
508 507
509 glScale 32, 32; 508 glScale $self->{tilesize}, $self->{tilesize};
510 509
511 if (my $tex = $self->{fow_texture}) { 510 if (my $tex = $self->{fow_texture}) {
512 glEnable GL_TEXTURE_2D; 511 glEnable GL_TEXTURE_2D;
513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
514 513
… …
558 $self->SUPER::DESTROY; 557 $self->SUPER::DESTROY;
559} 558}
560 559
561package CFPlus::MapWidget::MapMap; 560package CFPlus::MapWidget::MapMap;
562 561
562use strict;
563use utf8;
564
563our @ISA = CFPlus::UI::Base::; 565our @ISA = CFPlus::UI::Base::;
564 566
565use Time::HiRes qw(time); 567use Time::HiRes qw(time);
566use CFPlus::OpenGL; 568use CFPlus::OpenGL;
567 569
… …
589 591
590 $::MAP or return; 592 $::MAP or return;
591 593
592 my ($w, $h) = @$self{qw(w h)}; 594 my ($w, $h) = @$self{qw(w h)};
593 595
594 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 596 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
595 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 597 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
596 598
597 my $sx = int $::CFG->{map_shift_x} / 32; 599 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
598 my $sy = int $::CFG->{map_shift_y} / 32; 600 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
599 601
600 my $ox = 0.5 * ($w - $sw); 602 my $ox = 0.5 * ($w - $sw);
601 my $oy = 0.5 * ($h - $sh); 603 my $oy = 0.5 * ($h - $sh);
602 604
603 glEnable GL_BLEND; 605 glEnable GL_BLEND;

Diff Legend

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