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.90 by root, Wed Oct 18 13:41:01 2006 UTC vs.
Revision 1.118 by elmex, Tue Aug 14 13:25:25 2007 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
… …
19 my $class = shift; 20 my $class = shift;
20 21
21 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
22 z => -1, 23 z => -1,
23 can_focus => 1, 24 can_focus => 1,
24 list => glGenList, 25 tilesize => 32,
25
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
32 @_ 26 @_
33 ); 27 );
34 28
35 $self->{completer} = new CFPlus::MapWidget::Command:: 29 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command}, 30 command => $self->{command},
… …
38 ; 32 ;
39 33
40 $self 34 $self
41} 35}
42 36
37sub set_tilesize {
38 my ($self, $tilesize) = @_;
39
40 $self->{tilesize} = $tilesize;
41}
42
43sub add_command { 43sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 44 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 45
46 (my $data = $command) =~ s/\\//g; 46 (my $data = $command) =~ s/\\//g;
47 47
… …
67 ::stop_game (); 67 ::stop_game ();
68 local $::PROFILE->{host} = $server; 68 local $::PROFILE->{host} = $server;
69 ::start_game (); 69 ::start_game ();
70} 70}
71 71
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke { 72sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 73 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 74 or return;
84 75
85 CFPlus::background { 76 CFPlus::background {
86 print "preparing editor startup...\n"; 77 print "preparing editor startup...\n";
87 CFPlus::set_proxy;
88 78
89 my $server = $editsup->{gameserver} || "default"; 79 my $server = $editsup->{gameserver} || "default";
90 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 80 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
91 81
92 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 82 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
93 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 83 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
94 84
95 print "map directory is $mapdir\n"; 85 print "map directory is $mapdir\n";
96 print "lib directory is $libdir\n"; 86 print "lib directory is $libdir\n";
97 87
98 require LWP::UserAgent; 88 my $ua = CFPlus::lwp_useragent;
99
100 my $ua = LWP::UserAgent->new (
101 agent => "cfplus $CFPlus::VERSION",
102 keep_alive => 1,
103 env_proxy => 1,
104 timeout => 30,
105 );
106 89
107 for my $file (qw(archetypes crossfire.0)) { 90 for my $file (qw(archetypes crossfire.0)) {
108 my $url = "$editsup->{lib_root}$file"; 91 my $url = "$editsup->{lib_root}$file";
109 print "mirroring $url...\n"; 92 print "mirroring $url...\n";
110 check_lwp $ua->mirror ($url, "$libdir/$file"); 93 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
111 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 94 printf "%s size %d octets\n", $file, -s "$libdir/$file";
112 } 95 }
113 96
114 if (1) { # upload a map 97 if (1) { # upload a map
115 my $mapname = $::CONN->{map_info}[0]; 98 my $mapname = $::CONN->{map_info}[0];
… …
120 103
121 print "getting map revision for $mapname...\n"; 104 print "getting map revision for $mapname...\n";
122 105
123 # try to get the most recent head revision, what a hack, 106 # try to get the most recent head revision, what a hack,
124 # this should have been returned while downloading *sigh* 107 # this should have been returned while downloading *sigh*
125 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 108 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
126 109
127 if ($log =~ /\?rev=(\d+\.\d+)"/) { 110 if ($log =~ /\?rev=(\d+\.\d+)"/) {
128 my $rev = $1; 111 my $rev = $1;
129 112
130 print "downloading revision $rev...\n"; 113 print "downloading revision $rev...\n";
131 114
132 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 115 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
133 116
134 my $meta = { 117 my $meta = {
135 %$editsup, 118 %$editsup,
136 path => $mapname, 119 path => $mapname,
137 revision => $rev, 120 revision => $rev,
… …
193 176
194 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
195 $self->grab_focus; 178 $self->grab_focus;
196 return unless $::CONN; 179 return unless $::CONN;
197 180
198 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 181 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
199 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
200 183
201 $x -= int 0.5 * $self->{sw}; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
202 $y -= int 0.5 * $self->{sh}; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
203 186
187 if ($::CONN) {
204 $::CONN->lookat ($x, $y) 188 $::CONN->lookat ($x, $y)
205 if $::CONN; 189 }
206 190
207 } elsif ($ev->{button} == 2) { 191 } elsif ($ev->{button} == 2) {
208 $self->grab_focus; 192 $self->grab_focus;
209 return unless $::CONN; 193 return unless $::CONN;
210 194
… …
296 280
297 1 281 1
298} 282}
299 283
300sub size_request { 284sub size_request {
285 my ($self) = @_;
286
301 ( 287 (
302 32 * CFPlus::ceil $::WIDTH / 32, 288 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
303 32 * CFPlus::ceil $::HEIGHT / 32, 289 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
304 ) 290 )
305} 291}
306 292
307sub update { 293sub update {
308 my ($self) = @_; 294 my ($self) = @_;
… …
310 $self->{need_update} = 1; 296 $self->{need_update} = 1;
311 $self->SUPER::update; 297 $self->SUPER::update;
312} 298}
313 299
314my %DIR = ( 300my %DIR = (
301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
315 CFPlus::SDLK_KP8, [1, "north"], 302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
316 CFPlus::SDLK_KP9, [2, "northeast"], 303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
317 CFPlus::SDLK_KP6, [3, "east"], 304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
318 CFPlus::SDLK_KP3, [4, "southeast"], 305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
319 CFPlus::SDLK_KP2, [5, "south"], 306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
320 CFPlus::SDLK_KP1, [6, "southwest"], 307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
321 CFPlus::SDLK_KP4, [7, "west"], 308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
322 CFPlus::SDLK_KP7, [8, "northwest"], 309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
323 310
324 CFPlus::SDLK_UP, [1, "north"], 311 ( "," . CFPlus::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
325 CFPlus::SDLK_RIGHT, [3, "east"], 313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
326 CFPlus::SDLK_DOWN, [5, "south"], 315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
327 CFPlus::SDLK_LEFT, [7, "west"], 317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
328); 319);
329 320
330sub invoke_key_down { 321sub invoke_key_down {
331 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
332 323
… …
334 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
335 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
336 327
337 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
338 329
339 if ($uni == ord "\t") { 330 if ($sym == 9) {
340 $::PL_WINDOW->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
341 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
342 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
343 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
344 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
345 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
348 ::toggle_player_page ($::SPELL_PAGE); 339 ::toggle_player_page ($::SPELL_PAGE);
349 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
350 ::toggle_player_page ($::INVENTORY_PAGE); 341 ::toggle_player_page ($::INVENTORY_PAGE);
351 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
352 $::SETUP_DIALOG->toggle_visibility; 343 $::SETUP_DIALOG->toggle_visibility;
353 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { 344 } elsif ($uni >= ord "0" && $uni <= ord "9" && $mod & CFPlus::KMOD_ALT) {
354 $::BIND_EDITOR->set_binding (undef, undef, [], 345 $::MESSAGE_WINDOW->user_switch_to_page (chr $uni);
355 sub {
356 my ($mod, $sym, $cmds) = @_;
357 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
358 });
359 $::BIND_EDITOR->start;
360 $::BIND_EDITOR->show;
361#TODO: elmex, what was this supposed to do? it currently crashes the client.
362# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
363# $::BIND_EDITOR->stop;
364# $::BIND_EDITOR->ask_for_bind_and_commit;
365# $::BIND_EDITOR->hide;
366 } elsif (!$::CONN) { 346 } elsif (!$::CONN) {
367 return 0; # bindings further down need a valid connection 347 return 0; # bindings further down need a valid connection
368 348
369 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
370 $::CONN->user_send ("stay fire");
371 } elsif ($uni == ord ",") { 349 } elsif ($uni == ord ",") {
372 $::CONN->user_send ("take"); 350 $::CONN->user_send ("take");
373 } elsif ($uni == ord " ") { 351 } elsif ($uni == ord " ") {
374 $::CONN->user_send ("apply"); 352 $::CONN->user_send ("apply");
375 } elsif ($uni == 13) { 353 } elsif ($uni == 13) {
376 $::CONN->user_send ("examine"); 354 $::MESSAGE_WINDOW->activate_current;
377 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
378 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
379 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
380 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
381 $::CONN->user_send ($_) for @$bind_cmd; 359 $::CONN->macro_send ($_) for @macros;
382 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
383 $::CONN->user_send ("rotateshoottype +"); 361 $::CONN->user_send ("rotateshoottype +");
384 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
385 $::CONN->user_send ("rotateshoottype -"); 363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
386 } elsif ($uni == ord '"') { 367 } elsif ($uni == ord '"') {
387 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
388 $self->{completer}->show; 369 $self->{completer}->show;
389 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
390 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
391 $self->{completer}->show; 372 $self->{completer}->show;
392 } elsif (exists $DIR{$sym}) { 373 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
393 if ($mod & CFPlus::KMOD_SHIFT) { 374 if ($mod & CFPlus::KMOD_SHIFT) {
394 $self->{shft}++; 375 $self->{shft}++;
395 if ($DIR{$sym}[0] != $self->{fire_dir}) { 376 if ($dir->[0] != $self->{fire_dir}) {
396 $::CONN->user_send ("fire $DIR{$sym}[0]"); 377 $::CONN->user_send ("fire $dir->[0]");
397 } 378 }
398 $self->{fire_dir} = $DIR{$sym}[0]; 379 $self->{fire_dir} = $DIR{$sym}[0];
399 } elsif ($mod & CFPlus::KMOD_CTRL) { 380 } elsif ($mod & CFPlus::KMOD_CTRL) {
400 $self->{ctrl}++; 381 $self->{ctrl}++;
401 $::CONN->user_send ("run $DIR{$sym}[0]"); 382 $::CONN->user_send ("run $dir->[0]");
402 } else { 383 } else {
403 $::CONN->user_send ("$DIR{$sym}[1]"); 384 $::CONN->user_send ("$dir->[1]");
404 } 385 }
405 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
406 $self->{completer}->inject_key_down ($ev); 387 $self->{completer}->inject_key_down ($ev);
407 $self->{completer}->show; 388 $self->{completer}->show;
408 } else { 389 } else {
… …
443 } 424 }
444 425
445 $res 426 $res
446} 427}
447 428
429sub invoke_visibility_change {
430 my ($self) = @_;
431
432 $self->refresh_hook;
433
434 0
435}
436
448sub set_magicmap { 437sub set_magicmap {
449 my ($self, $w, $h, $x, $y, $data) = @_; 438 my ($self, $w, $h, $x, $y, $data) = @_;
450 439
451 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 440 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
452 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 441 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
453 442
454 $self->{magicmap} = [$x, $y, $w, $h, $data]; 443 $self->{magicmap} = [$x, $y, $w, $h, $data];
455 444
456 $self->update; 445 $self->update;
457} 446}
458 447
448sub refresh_hook {
449 my ($self) = @_;
450
451 if ($::MAP && $::CONN) {
452 if (delete $self->{need_update}) {
453 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
454
455 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
456 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
457
458 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
459 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
460
461 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
462 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
463
464 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
465 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
466
467 if ($::CFG->{fow_enable}) {
468 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
469
470 $self->{fow_texture} = new CFPlus::Texture
471 w => $w,
472 h => $h,
473 data => $data,
474 internalformat => GL_ALPHA,
475 format => GL_ALPHA;
476 } else {
477 delete $self->{fow_texture};
478 }
479
480 glNewList ($self->{list} ||= glGenList);
481
482 glPushMatrix;
483 glTranslate $sx0, $sy0;
484 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
485
486 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
487
488 glScale $self->{tilesize}, $self->{tilesize};
489
490 if (my $tex = $self->{fow_texture}) {
491 glPushMatrix;
492 glScale 1/3, 1/3;
493 glEnable GL_TEXTURE_2D;
494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
495
496 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
497 $self->{fow_texture}->draw_quad_alpha (0, 0);
498
499 glDisable GL_TEXTURE_2D;
500 glPopMatrix;
501 }
502
503 if ($self->{magicmap}) {
504 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
505
506 $x += $::MAP->ox + $self->{dx};
507 $y += $::MAP->oy + $self->{dy};
508
509 glTranslate - $x - 1, - $y - 1;
510 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
511 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
512 }
513
514 glPopMatrix;
515 glEndList;
516 }
517 } else {
518 glDeleteList delete $self->{list}
519 if $self->{list};
520 }
521}
522
459sub draw { 523sub draw {
460 my ($self) = @_; 524 my ($self) = @_;
461 525
462 return unless $::MAP; 526 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
527
528 return unless $self->{list};
463 529
464 my $focused = $CFPlus::UI::FOCUS == $self 530 my $focused = $CFPlus::UI::FOCUS == $self
465 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 531 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
466 532
467 return 533 return
468 unless $focused || !$::FAST; 534 unless $focused || !$::FAST;
469
470 if (delete $self->{need_update}) {
471 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
472
473 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
474 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
475
476 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
477 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
478
479 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
480 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
481
482 if ($::CFG->{fow_enable}) {
483 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
484
485 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
486 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
487 glConvolutionFilter2D (
488 GL_CONVOLUTION_2D,
489 GL_ALPHA,
490 3, 3,
491 GL_ALPHA, GL_FLOAT,
492 (pack "f*", @{ $self->{smooth_matrix} }),
493 );
494 glEnable GL_CONVOLUTION_2D;
495 }
496
497 $self->{fow_texture} = new CFPlus::Texture
498 w => $w,
499 h => $h,
500 data => $data,
501 internalformat => GL_ALPHA,
502 format => GL_ALPHA;
503
504 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
505 } else {
506 delete $self->{fow_texture};
507 }
508
509 glNewList $self->{list};
510
511 glPushMatrix;
512 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514
515 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
516
517 glScale 32, 32;
518
519 if (my $tex = $self->{fow_texture}) {
520 glEnable GL_TEXTURE_2D;
521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
522
523 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
524 $self->{fow_texture}->draw_quad_alpha (0, 0);
525
526 glDisable GL_TEXTURE_2D;
527 }
528
529 if ($self->{magicmap}) {
530 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
531
532 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
533 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
534
535 glTranslate - $x - 1, - $y - 1;
536 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
537 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
538 }
539
540 glPopMatrix;
541 glEndList;
542 }
543 535
544 glCallList $self->{list}; 536 glCallList $self->{list};
545 537
546 # TNT2 emulates logops in software (or worse :) 538 # TNT2 emulates logops in software (or worse :)
547 unless ($focused) { 539 unless ($focused) {
… …
566 $self->SUPER::DESTROY; 558 $self->SUPER::DESTROY;
567} 559}
568 560
569package CFPlus::MapWidget::MapMap; 561package CFPlus::MapWidget::MapMap;
570 562
563use strict;
564use utf8;
565
571our @ISA = CFPlus::UI::Base::; 566our @ISA = CFPlus::UI::Base::;
572 567
573use Time::HiRes qw(time); 568use Time::HiRes qw(time);
574use CFPlus::OpenGL; 569use CFPlus::OpenGL;
575 570
576sub size_request { 571sub size_request {
577 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 572 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
578} 573}
579 574
580sub invoke_size_allocate { 575sub refresh_hook {
581 my ($self, $w, $h) = @_; 576 my ($self) = @_;
582 577
583 $self->update; 578 if ($::MAP && $self->{texture_atime} < time) {
584
585 1
586}
587
588sub update {
589 my ($self) = @_;
590
591 delete $self->{texture_atime};
592 $self->SUPER::update;
593}
594
595sub _draw {
596 my ($self) = @_;
597
598 $::MAP or return;
599
600 my ($w, $h) = @$self{qw(w h)}; 579 my ($w, $h) = @$self{qw(w h)};
601 580
602 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 581 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
603 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 582 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
604 583
605 my $sx = int $::CFG->{map_shift_x} / 32;
606 my $sy = int $::CFG->{map_shift_y} / 32;
607
608 my $ox = 0.5 * ($w - $sw); 584 my $ox = 0.5 * ($w - $sw);
609 my $oy = 0.5 * ($h - $sh); 585 my $oy = 0.5 * ($h - $sh);
610 586
611 glEnable GL_BLEND; 587 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
612 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 588 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
613 glEnable GL_TEXTURE_2D;
614 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
615 589
616 if ($self->{texture_atime} < time) { 590 #TODO: map scale is completely borked
591
592 my $x0 = int $ox - $sx + 0.5;
593 my $y0 = int $oy - $sy + 0.5;
594
595 $self->{sw} = $sw;
596 $self->{sh} = $sh;
597
598 $self->{x0} = $x0;
599 $self->{y0} = $y0;
600
617 $self->{texture_atime} = time + 1/3; 601 $self->{texture_atime} = time + 1/3;
618 602
619 $self->{texture} = 603 $self->{texture} =
620 new CFPlus::Texture 604 new CFPlus::Texture
621 w => $w, 605 w => $w,
622 h => $h, 606 h => $h,
623 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 607 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
624 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 608 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
625 } 609 }
610}
611
612sub invoke_visibility_change {
613 my ($self) = @_;
614
615 $self->refresh_hook;
616
617 0
618}
619
620sub invoke_size_allocate {
621 my ($self, $w, $h) = @_;
622
623 $self->update;
624
625 1
626}
627
628sub update {
629 my ($self) = @_;
630
631 delete $self->{texture_atime};
632 $self->SUPER::update;
633}
634
635sub _draw {
636 my ($self) = @_;
637
638 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
639
640 $self->{texture} or return;
641
642 glEnable GL_BLEND;
643 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
644 glEnable GL_TEXTURE_2D;
645 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
626 646
627 $self->{texture}->draw_quad (0, 0); 647 $self->{texture}->draw_quad (0, 0);
628 648
629 glDisable GL_TEXTURE_2D; 649 glDisable GL_TEXTURE_2D;
630 650
631 glTranslate 0.375, 0.375; 651 glTranslate 0.375, 0.375;
632
633 #TODO: map scale is completely borked
634
635 my $x0 = int $ox - $sx + 0.5;
636 my $y0 = int $oy - $sy + 0.5;
637 652
638 glColor 1, 1, 0, 1; 653 glColor 1, 1, 0, 1;
639 glBegin GL_LINE_LOOP; 654 glBegin GL_LINE_LOOP;
640 glVertex $x0 , $y0 ; 655 glVertex $self->{x0} , $self->{y0} ;
641 glVertex $x0 , $y0 + $sh; 656 glVertex $self->{x0} , $self->{y0} + $self->{sh};
642 glVertex $x0 + $sw, $y0 + $sh; 657 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
643 glVertex $x0 + $sw, $y0 ; 658 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
644 glEnd; 659 glEnd;
645 660
646 glDisable GL_BLEND; 661 glDisable GL_BLEND;
647} 662}
648 663
… …
684 699
685 if ($ev->{button} == 3) { 700 if ($ev->{button} == 3) {
686 (new CFPlus::UI::Menu 701 (new CFPlus::UI::Menu
687 items => [ 702 items => [
688 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 703 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
689 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 704 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
690 ], 705 ],
691 )->popup ($ev); 706 )->popup ($ev);
692 return 1; 707 return 1;
693 } 708 }
694 0 709 0

Diff Legend

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