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.87 by root, Sun Oct 8 21:57:54 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 my ($pid, $fh); 76 CFPlus::background {
86 unless ($pid = open $fh, "-|:utf8", "-") {
87 $SIG{__DIE__} = sub {
88 my $msg = $_[0];
89 $msg =~ s/\n+/\n/;
90 warn "FATAL: $msg";
91 CFPlus::_exit 99;
92 };
93
94 open STDERR, ">&STDOUT";
95 binmode STDOUT, ":utf8";
96 binmode STDERR, ":utf8";
97 close $fh;
98
99 $| = 1;
100 print "preparing editor startup...\n"; 77 print "preparing editor startup...\n";
101 CFPlus::set_proxy;
102 78
103 my $server = $editsup->{gameserver} || "default"; 79 my $server = $editsup->{gameserver} || "default";
104 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 80 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
105 81
106 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;
107 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;
108 84
109 print "map directory is $mapdir\n"; 85 print "map directory is $mapdir\n";
110 print "lib directory is $libdir\n"; 86 print "lib directory is $libdir\n";
111 87
112 require LWP::UserAgent; 88 my $ua = CFPlus::lwp_useragent;
113
114 my $ua = LWP::UserAgent->new (
115 agent => "cfplus $CFPlus::VERSION",
116 keep_alive => 1,
117 env_proxy => 1,
118 timeout => 30,
119 );
120 89
121 for my $file (qw(archetypes crossfire.0)) { 90 for my $file (qw(archetypes crossfire.0)) {
122 my $url = "$editsup->{lib_root}$file"; 91 my $url = "$editsup->{lib_root}$file";
123 print "mirroring $url...\n"; 92 print "mirroring $url...\n";
124 check_lwp $ua->mirror ($url, "$libdir/$file"); 93 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
125 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 94 printf "%s size %d octets\n", $file, -s "$libdir/$file";
126 } 95 }
127 96
128 if (1) { # upload a map 97 if (1) { # upload a map
129 my $mapname = $::CONN->{map_info}[0]; 98 my $mapname = $::CONN->{map_info}[0];
… …
134 103
135 print "getting map revision for $mapname...\n"; 104 print "getting map revision for $mapname...\n";
136 105
137 # try to get the most recent head revision, what a hack, 106 # try to get the most recent head revision, what a hack,
138 # this should have been returned while downloading *sigh* 107 # this should have been returned while downloading *sigh*
139 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;
140 109
141 if ($log =~ /\?rev=(\d+\.\d+)"/) { 110 if ($log =~ /\?rev=(\d+\.\d+)"/) {
142 my $rev = $1; 111 my $rev = $1;
143 112
144 print "downloading revision $rev...\n"; 113 print "downloading revision $rev...\n";
145 114
146 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;
147 116
148 my $meta = { 117 my $meta = {
149 %$editsup, 118 %$editsup,
150 path => $mapname, 119 path => $mapname,
151 revision => $rev, 120 revision => $rev,
… …
197# } 166# }
198 } else { 167 } else {
199 die "viewvc parse error, unable to detect revision\n"; 168 die "viewvc parse error, unable to detect revision\n";
200 } 169 }
201 } 170 }
202
203 CFPlus::_exit;
204 }
205
206 my $buffer;
207
208 Event->io (fd => $fh, poll => 'r', cb => sub {
209 unless (sysread $fh, $buffer, 4096, length $buffer) {
210 $_[0]->w->cancel;
211 $buffer .= "done\n";
212 }
213
214 while ($buffer =~ s/^(.*)\n//) {
215 ::message ({
216 markup => "editor($pid): " . CFPlus::asxml $1,
217 });
218 }
219 }); 171 }
220} 172}
221 173
222sub invoke_button_down { 174sub invoke_button_down {
223 my ($self, $ev, $x, $y) = @_; 175 my ($self, $ev, $x, $y) = @_;
224 176
225 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
226 $self->grab_focus; 178 $self->grab_focus;
227 return unless $::CONN; 179 return unless $::CONN;
228 180
229 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};
230 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};
231 183
232 $x -= int 0.5 * $self->{sw}; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
233 $y -= int 0.5 * $self->{sh}; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
234 186
187 if ($::CONN) {
235 $::CONN->lookat ($x, $y) 188 $::CONN->lookat ($x, $y)
236 if $::CONN; 189 }
237 190
238 } elsif ($ev->{button} == 2) { 191 } elsif ($ev->{button} == 2) {
239 $self->grab_focus; 192 $self->grab_focus;
240 return unless $::CONN; 193 return unless $::CONN;
241 194
… …
327 280
328 1 281 1
329} 282}
330 283
331sub size_request { 284sub size_request {
285 my ($self) = @_;
286
332 ( 287 (
333 32 * CFPlus::ceil $::WIDTH / 32, 288 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
334 32 * CFPlus::ceil $::HEIGHT / 32, 289 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
335 ) 290 )
336} 291}
337 292
338sub update { 293sub update {
339 my ($self) = @_; 294 my ($self) = @_;
… …
341 $self->{need_update} = 1; 296 $self->{need_update} = 1;
342 $self->SUPER::update; 297 $self->SUPER::update;
343} 298}
344 299
345my %DIR = ( 300my %DIR = (
301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
346 CFPlus::SDLK_KP8, [1, "north"], 302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
347 CFPlus::SDLK_KP9, [2, "northeast"], 303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
348 CFPlus::SDLK_KP6, [3, "east"], 304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
349 CFPlus::SDLK_KP3, [4, "southeast"], 305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
350 CFPlus::SDLK_KP2, [5, "south"], 306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
351 CFPlus::SDLK_KP1, [6, "southwest"], 307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
352 CFPlus::SDLK_KP4, [7, "west"], 308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
353 CFPlus::SDLK_KP7, [8, "northwest"], 309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
354 310
355 CFPlus::SDLK_UP, [1, "north"], 311 ( "," . CFPlus::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
356 CFPlus::SDLK_RIGHT, [3, "east"], 313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
357 CFPlus::SDLK_DOWN, [5, "south"], 315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
358 CFPlus::SDLK_LEFT, [7, "west"], 317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
359); 319);
360 320
361sub invoke_key_down { 321sub invoke_key_down {
362 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
363 323
… …
365 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
366 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
367 327
368 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
369 329
370 if ($uni == ord "\t") { 330 if ($sym == 9) {
371 $::PL_WINDOW->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
372 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
373 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
374 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
375 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
376 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
379 ::toggle_player_page ($::SPELL_PAGE); 339 ::toggle_player_page ($::SPELL_PAGE);
380 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
381 ::toggle_player_page ($::INVENTORY_PAGE); 341 ::toggle_player_page ($::INVENTORY_PAGE);
382 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
383 $::SETUP_DIALOG->toggle_visibility; 343 $::SETUP_DIALOG->toggle_visibility;
384 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { 344 } elsif ($uni >= ord "0" && $uni <= ord "9" && $mod & CFPlus::KMOD_ALT) {
385 $::BIND_EDITOR->set_binding (undef, undef, [], 345 $::MESSAGE_WINDOW->user_switch_to_page (chr $uni);
386 sub {
387 my ($mod, $sym, $cmds) = @_;
388 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
389 });
390 $::BIND_EDITOR->start;
391 $::BIND_EDITOR->show;
392#TODO: elmex, what was this supposed to do? it currently crashes the client.
393# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
394# $::BIND_EDITOR->stop;
395# $::BIND_EDITOR->ask_for_bind_and_commit;
396# $::BIND_EDITOR->hide;
397 } elsif (!$::CONN) { 346 } elsif (!$::CONN) {
398 return 0; # bindings further down need a valid connection 347 return 0; # bindings further down need a valid connection
399 348
400 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
401 $::CONN->user_send ("stay fire");
402 } elsif ($uni == ord ",") { 349 } elsif ($uni == ord ",") {
403 $::CONN->user_send ("take"); 350 $::CONN->user_send ("take");
404 } elsif ($uni == ord " ") { 351 } elsif ($uni == ord " ") {
405 $::CONN->user_send ("apply"); 352 $::CONN->user_send ("apply");
406 } elsif ($uni == 13) { 353 } elsif ($uni == 13) {
407 $::CONN->user_send ("examine"); 354 $::MESSAGE_WINDOW->activate_current;
408 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
409 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
410 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
411 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
412 $::CONN->user_send ($_) for @$bind_cmd; 359 $::CONN->macro_send ($_) for @macros;
413 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
414 $::CONN->user_send ("rotateshoottype +"); 361 $::CONN->user_send ("rotateshoottype +");
415 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
416 $::CONN->user_send ("rotateshoottype -"); 363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
417 } elsif ($uni == ord '"') { 367 } elsif ($uni == ord '"') {
418 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
419 $self->{completer}->show; 369 $self->{completer}->show;
420 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
421 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
422 $self->{completer}->show; 372 $self->{completer}->show;
423 } elsif (exists $DIR{$sym}) { 373 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
424 if ($mod & CFPlus::KMOD_SHIFT) { 374 if ($mod & CFPlus::KMOD_SHIFT) {
425 $self->{shft}++; 375 $self->{shft}++;
426 if ($DIR{$sym}[0] != $self->{fire_dir}) { 376 if ($dir->[0] != $self->{fire_dir}) {
427 $::CONN->user_send ("fire $DIR{$sym}[0]"); 377 $::CONN->user_send ("fire $dir->[0]");
428 } 378 }
429 $self->{fire_dir} = $DIR{$sym}[0]; 379 $self->{fire_dir} = $DIR{$sym}[0];
430 } elsif ($mod & CFPlus::KMOD_CTRL) { 380 } elsif ($mod & CFPlus::KMOD_CTRL) {
431 $self->{ctrl}++; 381 $self->{ctrl}++;
432 $::CONN->user_send ("run $DIR{$sym}[0]"); 382 $::CONN->user_send ("run $dir->[0]");
433 } else { 383 } else {
434 $::CONN->user_send ("$DIR{$sym}[1]"); 384 $::CONN->user_send ("$dir->[1]");
435 } 385 }
436 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
437 $self->{completer}->inject_key_down ($ev); 387 $self->{completer}->inject_key_down ($ev);
438 $self->{completer}->show; 388 $self->{completer}->show;
439 } else { 389 } else {
… …
474 } 424 }
475 425
476 $res 426 $res
477} 427}
478 428
429sub invoke_visibility_change {
430 my ($self) = @_;
431
432 $self->refresh_hook;
433
434 0
435}
436
479sub set_magicmap { 437sub set_magicmap {
480 my ($self, $w, $h, $x, $y, $data) = @_; 438 my ($self, $w, $h, $x, $y, $data) = @_;
481 439
482 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 440 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
483 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 441 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
484 442
485 $self->{magicmap} = [$x, $y, $w, $h, $data]; 443 $self->{magicmap} = [$x, $y, $w, $h, $data];
486 444
487 $self->update; 445 $self->update;
488} 446}
489 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
490sub draw { 523sub draw {
491 my ($self) = @_; 524 my ($self) = @_;
492 525
493 return unless $::MAP; 526 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
527
528 return unless $self->{list};
494 529
495 my $focused = $CFPlus::UI::FOCUS == $self 530 my $focused = $CFPlus::UI::FOCUS == $self
496 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 531 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
497 532
498 return 533 return
499 unless $focused || !$::FAST; 534 unless $focused || !$::FAST;
500
501 if (delete $self->{need_update}) {
502 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
503
504 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
505 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
506
507 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
508 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
509
510 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
511 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
512
513 if ($::CFG->{fow_enable}) {
514 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
515
516 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
517 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
518 glConvolutionFilter2D (
519 GL_CONVOLUTION_2D,
520 GL_ALPHA,
521 3, 3,
522 GL_ALPHA, GL_FLOAT,
523 (pack "f*", @{ $self->{smooth_matrix} }),
524 );
525 glEnable GL_CONVOLUTION_2D;
526 }
527
528 $self->{fow_texture} = new CFPlus::Texture
529 w => $w,
530 h => $h,
531 data => $data,
532 internalformat => GL_ALPHA,
533 format => GL_ALPHA;
534
535 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
536 } else {
537 delete $self->{fow_texture};
538 }
539
540 glNewList $self->{list};
541
542 glPushMatrix;
543 glTranslate $sx0, $sy0;
544 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
545
546 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
547
548 glScale 32, 32;
549
550 if (my $tex = $self->{fow_texture}) {
551 glEnable GL_TEXTURE_2D;
552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
553
554 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
555 $self->{fow_texture}->draw_quad_alpha (0, 0);
556
557 glDisable GL_TEXTURE_2D;
558 }
559
560 if ($self->{magicmap}) {
561 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
562
563 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
564 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
565
566 glTranslate - $x - 1, - $y - 1;
567 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
568 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
569 }
570
571 glPopMatrix;
572 glEndList;
573 }
574 535
575 glCallList $self->{list}; 536 glCallList $self->{list};
576 537
577 # TNT2 emulates logops in software (or worse :) 538 # TNT2 emulates logops in software (or worse :)
578 unless ($focused) { 539 unless ($focused) {
… …
597 $self->SUPER::DESTROY; 558 $self->SUPER::DESTROY;
598} 559}
599 560
600package CFPlus::MapWidget::MapMap; 561package CFPlus::MapWidget::MapMap;
601 562
563use strict;
564use utf8;
565
602our @ISA = CFPlus::UI::Base::; 566our @ISA = CFPlus::UI::Base::;
603 567
604use Time::HiRes qw(time); 568use Time::HiRes qw(time);
605use CFPlus::OpenGL; 569use CFPlus::OpenGL;
606 570
607sub size_request { 571sub size_request {
608 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 572 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
609} 573}
610 574
611sub invoke_size_allocate { 575sub refresh_hook {
612 my ($self, $w, $h) = @_; 576 my ($self) = @_;
613 577
614 $self->update; 578 if ($::MAP && $self->{texture_atime} < time) {
615
616 1
617}
618
619sub update {
620 my ($self) = @_;
621
622 delete $self->{texture_atime};
623 $self->SUPER::update;
624}
625
626sub _draw {
627 my ($self) = @_;
628
629 $::MAP or return;
630
631 my ($w, $h) = @$self{qw(w h)}; 579 my ($w, $h) = @$self{qw(w h)};
632 580
633 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 581 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
634 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 582 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
635 583
636 my $sx = int $::CFG->{map_shift_x} / 32;
637 my $sy = int $::CFG->{map_shift_y} / 32;
638
639 my $ox = 0.5 * ($w - $sw); 584 my $ox = 0.5 * ($w - $sw);
640 my $oy = 0.5 * ($h - $sh); 585 my $oy = 0.5 * ($h - $sh);
641 586
642 glEnable GL_BLEND; 587 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
643 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 588 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
644 glEnable GL_TEXTURE_2D;
645 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
646 589
647 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
648 $self->{texture_atime} = time + 1/3; 601 $self->{texture_atime} = time + 1/3;
649 602
650 $self->{texture} = 603 $self->{texture} =
651 new CFPlus::Texture 604 new CFPlus::Texture
652 w => $w, 605 w => $w,
653 h => $h, 606 h => $h,
654 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 607 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
655 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;
656 } 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;
657 646
658 $self->{texture}->draw_quad (0, 0); 647 $self->{texture}->draw_quad (0, 0);
659 648
660 glDisable GL_TEXTURE_2D; 649 glDisable GL_TEXTURE_2D;
661 650
662 glTranslate 0.375, 0.375; 651 glTranslate 0.375, 0.375;
663
664 #TODO: map scale is completely borked
665
666 my $x0 = int $ox - $sx + 0.5;
667 my $y0 = int $oy - $sy + 0.5;
668 652
669 glColor 1, 1, 0, 1; 653 glColor 1, 1, 0, 1;
670 glBegin GL_LINE_LOOP; 654 glBegin GL_LINE_LOOP;
671 glVertex $x0 , $y0 ; 655 glVertex $self->{x0} , $self->{y0} ;
672 glVertex $x0 , $y0 + $sh; 656 glVertex $self->{x0} , $self->{y0} + $self->{sh};
673 glVertex $x0 + $sw, $y0 + $sh; 657 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
674 glVertex $x0 + $sw, $y0 ; 658 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
675 glEnd; 659 glEnd;
676 660
677 glDisable GL_BLEND; 661 glDisable GL_BLEND;
678} 662}
679 663
… …
715 699
716 if ($ev->{button} == 3) { 700 if ($ev->{button} == 3) {
717 (new CFPlus::UI::Menu 701 (new CFPlus::UI::Menu
718 items => [ 702 items => [
719 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 703 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
720 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 704 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
721 ], 705 ],
722 )->popup ($ev); 706 )->popup ($ev);
723 return 1; 707 return 1;
724 } 708 }
725 0 709 0

Diff Legend

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