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