… | |
… | |
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", |
… | |
… | |
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 | |
|
|
37 | sub set_tilesize { |
|
|
38 | my ($self, $tilesize) = @_; |
|
|
39 | |
|
|
40 | $self->{tilesize} = $tilesize; |
|
|
41 | } |
|
|
42 | |
43 | sub add_command { |
43 | sub 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 | |
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 { |
72 | sub 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 | |
222 | sub invoke_button_down { |
174 | sub 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 | |
331 | sub size_request { |
284 | sub 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 | |
338 | sub update { |
293 | sub 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 | |
345 | my %DIR = ( |
300 | my %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 | |
361 | sub invoke_key_down { |
321 | sub 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) { |
|
|
385 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
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) { |
344 | } elsif (!$::CONN) { |
398 | return 0; # bindings further down need a valid connection |
345 | return 0; # bindings further down need a valid connection |
399 | |
346 | |
400 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
|
|
401 | $::CONN->user_send ("stay fire"); |
|
|
402 | } elsif ($uni == ord ",") { |
347 | } elsif ($uni == ord ",") { |
403 | $::CONN->user_send ("take"); |
348 | $::CONN->user_send ("take"); |
404 | } elsif ($uni == ord " ") { |
349 | } elsif ($uni == ord " ") { |
405 | $::CONN->user_send ("apply"); |
350 | $::CONN->user_send ("apply"); |
406 | } elsif ($uni == 13) { |
351 | } elsif ($uni == 13) { |
407 | $::CONN->user_send ("examine"); |
352 | $::CONN->user_send ("examine"); |
408 | } elsif ($uni == ord ".") { |
353 | } elsif ($uni == ord ".") { |
409 | $::CONN->user_send ($self->{completer}{last_command}) |
354 | $::CONN->user_send ($self->{completer}{last_command}) |
410 | if exists $self->{completer}{last_command}; |
355 | if exists $self->{completer}{last_command}; |
411 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
356 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
412 | $::CONN->user_send ($_) for @$bind_cmd; |
357 | $::CONN->macro_send ($_) for @macros; |
413 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
358 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
414 | $::CONN->user_send ("rotateshoottype +"); |
359 | $::CONN->user_send ("rotateshoottype +"); |
415 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
360 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
416 | $::CONN->user_send ("rotateshoottype -"); |
361 | $::CONN->user_send ("rotateshoottype -"); |
|
|
362 | } elsif ($uni == ord '!') { |
|
|
363 | $self->{completer}->set_prefix ("shout "); |
|
|
364 | $self->{completer}->show; |
417 | } elsif ($uni == ord '"') { |
365 | } elsif ($uni == ord '"') { |
418 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
366 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
419 | $self->{completer}->show; |
367 | $self->{completer}->show; |
420 | } elsif ($uni == ord "'") { |
368 | } elsif ($uni == ord "'") { |
421 | $self->{completer}->set_prefix (""); |
369 | $self->{completer}->set_prefix (""); |
422 | $self->{completer}->show; |
370 | $self->{completer}->show; |
423 | } elsif (exists $DIR{$sym}) { |
371 | } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) { |
424 | if ($mod & CFPlus::KMOD_SHIFT) { |
372 | if ($mod & CFPlus::KMOD_SHIFT) { |
425 | $self->{shft}++; |
373 | $self->{shft}++; |
426 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
374 | if ($dir->[0] != $self->{fire_dir}) { |
427 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
375 | $::CONN->user_send ("fire $dir->[0]"); |
428 | } |
376 | } |
429 | $self->{fire_dir} = $DIR{$sym}[0]; |
377 | $self->{fire_dir} = $DIR{$sym}[0]; |
430 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
378 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
431 | $self->{ctrl}++; |
379 | $self->{ctrl}++; |
432 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
380 | $::CONN->user_send ("run $dir->[0]"); |
433 | } else { |
381 | } else { |
434 | $::CONN->user_send ("$DIR{$sym}[1]"); |
382 | $::CONN->user_send ("$dir->[1]"); |
435 | } |
383 | } |
436 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
384 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
437 | $self->{completer}->inject_key_down ($ev); |
385 | $self->{completer}->inject_key_down ($ev); |
438 | $self->{completer}->show; |
386 | $self->{completer}->show; |
439 | } else { |
387 | } else { |
… | |
… | |
474 | } |
422 | } |
475 | |
423 | |
476 | $res |
424 | $res |
477 | } |
425 | } |
478 | |
426 | |
|
|
427 | sub invoke_visibility_change { |
|
|
428 | my ($self) = @_; |
|
|
429 | |
|
|
430 | $self->refresh_hook; |
|
|
431 | |
|
|
432 | 0 |
|
|
433 | } |
|
|
434 | |
479 | sub set_magicmap { |
435 | sub set_magicmap { |
480 | my ($self, $w, $h, $x, $y, $data) = @_; |
436 | my ($self, $w, $h, $x, $y, $data) = @_; |
481 | |
437 | |
482 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
438 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
483 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
439 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
484 | |
440 | |
485 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
441 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
486 | |
442 | |
487 | $self->update; |
443 | $self->update; |
488 | } |
444 | } |
489 | |
445 | |
|
|
446 | sub refresh_hook { |
|
|
447 | my ($self) = @_; |
|
|
448 | |
|
|
449 | if ($::MAP) { |
|
|
450 | if (delete $self->{need_update}) { |
|
|
451 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
|
|
452 | |
|
|
453 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
454 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
455 | |
|
|
456 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
|
|
457 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
|
|
458 | |
|
|
459 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
460 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
461 | |
|
|
462 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
|
|
463 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
|
|
464 | |
|
|
465 | if ($::CFG->{fow_enable}) { |
|
|
466 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
|
|
467 | |
|
|
468 | $self->{fow_texture} = new CFPlus::Texture |
|
|
469 | w => $w, |
|
|
470 | h => $h, |
|
|
471 | data => $data, |
|
|
472 | internalformat => GL_ALPHA, |
|
|
473 | format => GL_ALPHA; |
|
|
474 | } else { |
|
|
475 | delete $self->{fow_texture}; |
|
|
476 | } |
|
|
477 | |
|
|
478 | glNewList ($self->{list} ||= glGenList); |
|
|
479 | |
|
|
480 | glPushMatrix; |
|
|
481 | glTranslate $sx0, $sy0; |
|
|
482 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
483 | |
|
|
484 | $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); |
|
|
485 | |
|
|
486 | glScale $self->{tilesize}, $self->{tilesize}; |
|
|
487 | |
|
|
488 | if (my $tex = $self->{fow_texture}) { |
|
|
489 | glPushMatrix; |
|
|
490 | glScale 1/3, 1/3; |
|
|
491 | glEnable GL_TEXTURE_2D; |
|
|
492 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
493 | |
|
|
494 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
|
|
495 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
|
|
496 | |
|
|
497 | glDisable GL_TEXTURE_2D; |
|
|
498 | glPopMatrix; |
|
|
499 | } |
|
|
500 | |
|
|
501 | if ($self->{magicmap}) { |
|
|
502 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
503 | |
|
|
504 | $x += $::MAP->ox + $self->{dx}; |
|
|
505 | $y += $::MAP->oy + $self->{dy}; |
|
|
506 | |
|
|
507 | glTranslate - $x - 1, - $y - 1; |
|
|
508 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
509 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
510 | } |
|
|
511 | |
|
|
512 | glPopMatrix; |
|
|
513 | glEndList; |
|
|
514 | } |
|
|
515 | } else { |
|
|
516 | glDeleteList delete $self->{list} |
|
|
517 | if $self->{list}; |
|
|
518 | } |
|
|
519 | } |
|
|
520 | |
490 | sub draw { |
521 | sub draw { |
491 | my ($self) = @_; |
522 | my ($self) = @_; |
492 | |
523 | |
493 | return unless $::MAP; |
524 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
|
|
525 | |
|
|
526 | return unless $self->{list}; |
494 | |
527 | |
495 | my $focused = $CFPlus::UI::FOCUS == $self |
528 | my $focused = $CFPlus::UI::FOCUS == $self |
496 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
529 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
497 | |
530 | |
498 | return |
531 | return |
499 | unless $focused || !$::FAST; |
532 | 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 | |
533 | |
575 | glCallList $self->{list}; |
534 | glCallList $self->{list}; |
576 | |
535 | |
577 | # TNT2 emulates logops in software (or worse :) |
536 | # TNT2 emulates logops in software (or worse :) |
578 | unless ($focused) { |
537 | unless ($focused) { |
… | |
… | |
597 | $self->SUPER::DESTROY; |
556 | $self->SUPER::DESTROY; |
598 | } |
557 | } |
599 | |
558 | |
600 | package CFPlus::MapWidget::MapMap; |
559 | package CFPlus::MapWidget::MapMap; |
601 | |
560 | |
|
|
561 | use strict; |
|
|
562 | use utf8; |
|
|
563 | |
602 | our @ISA = CFPlus::UI::Base::; |
564 | our @ISA = CFPlus::UI::Base::; |
603 | |
565 | |
604 | use Time::HiRes qw(time); |
566 | use Time::HiRes qw(time); |
605 | use CFPlus::OpenGL; |
567 | use CFPlus::OpenGL; |
606 | |
568 | |
607 | sub size_request { |
569 | sub size_request { |
608 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
570 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
609 | } |
571 | } |
610 | |
572 | |
611 | sub invoke_size_allocate { |
573 | sub refresh_hook { |
612 | my ($self, $w, $h) = @_; |
574 | my ($self) = @_; |
613 | |
575 | |
614 | $self->update; |
576 | if ($::MAP && $self->{texture_atime} < time) { |
615 | |
|
|
616 | 1 |
|
|
617 | } |
|
|
618 | |
|
|
619 | sub update { |
|
|
620 | my ($self) = @_; |
|
|
621 | |
|
|
622 | delete $self->{texture_atime}; |
|
|
623 | $self->SUPER::update; |
|
|
624 | } |
|
|
625 | |
|
|
626 | sub _draw { |
|
|
627 | my ($self) = @_; |
|
|
628 | |
|
|
629 | $::MAP or return; |
|
|
630 | |
|
|
631 | my ($w, $h) = @$self{qw(w h)}; |
577 | my ($w, $h) = @$self{qw(w h)}; |
632 | |
578 | |
633 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
579 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
634 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
580 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
635 | |
581 | |
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); |
582 | my $ox = 0.5 * ($w - $sw); |
640 | my $oy = 0.5 * ($h - $sh); |
583 | my $oy = 0.5 * ($h - $sh); |
641 | |
584 | |
642 | glEnable GL_BLEND; |
585 | my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; |
643 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
586 | 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 | |
587 | |
647 | if ($self->{texture_atime} < time) { |
588 | #TODO: map scale is completely borked |
|
|
589 | |
|
|
590 | my $x0 = int $ox - $sx + 0.5; |
|
|
591 | my $y0 = int $oy - $sy + 0.5; |
|
|
592 | |
|
|
593 | $self->{sw} = $sw; |
|
|
594 | $self->{sh} = $sh; |
|
|
595 | |
|
|
596 | $self->{x0} = $x0; |
|
|
597 | $self->{y0} = $y0; |
|
|
598 | |
648 | $self->{texture_atime} = time + 1/3; |
599 | $self->{texture_atime} = time + 1/3; |
649 | |
600 | |
650 | $self->{texture} = |
601 | $self->{texture} = |
651 | new CFPlus::Texture |
602 | new CFPlus::Texture |
652 | w => $w, |
603 | w => $w, |
653 | h => $h, |
604 | h => $h, |
654 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
605 | 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; |
606 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
656 | } |
607 | } |
|
|
608 | } |
|
|
609 | |
|
|
610 | sub invoke_visibility_change { |
|
|
611 | my ($self) = @_; |
|
|
612 | |
|
|
613 | $self->refresh_hook; |
|
|
614 | |
|
|
615 | 0 |
|
|
616 | } |
|
|
617 | |
|
|
618 | sub invoke_size_allocate { |
|
|
619 | my ($self, $w, $h) = @_; |
|
|
620 | |
|
|
621 | $self->update; |
|
|
622 | |
|
|
623 | 1 |
|
|
624 | } |
|
|
625 | |
|
|
626 | sub update { |
|
|
627 | my ($self) = @_; |
|
|
628 | |
|
|
629 | delete $self->{texture_atime}; |
|
|
630 | $self->SUPER::update; |
|
|
631 | } |
|
|
632 | |
|
|
633 | sub _draw { |
|
|
634 | my ($self) = @_; |
|
|
635 | |
|
|
636 | $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook }); |
|
|
637 | |
|
|
638 | $self->{texture} or return; |
|
|
639 | |
|
|
640 | glEnable GL_BLEND; |
|
|
641 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
|
|
642 | glEnable GL_TEXTURE_2D; |
|
|
643 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
657 | |
644 | |
658 | $self->{texture}->draw_quad (0, 0); |
645 | $self->{texture}->draw_quad (0, 0); |
659 | |
646 | |
660 | glDisable GL_TEXTURE_2D; |
647 | glDisable GL_TEXTURE_2D; |
661 | |
648 | |
662 | glTranslate 0.375, 0.375; |
649 | 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 | |
650 | |
669 | glColor 1, 1, 0, 1; |
651 | glColor 1, 1, 0, 1; |
670 | glBegin GL_LINE_LOOP; |
652 | glBegin GL_LINE_LOOP; |
671 | glVertex $x0 , $y0 ; |
653 | glVertex $self->{x0} , $self->{y0} ; |
672 | glVertex $x0 , $y0 + $sh; |
654 | glVertex $self->{x0} , $self->{y0} + $self->{sh}; |
673 | glVertex $x0 + $sw, $y0 + $sh; |
655 | glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh}; |
674 | glVertex $x0 + $sw, $y0 ; |
656 | glVertex $self->{x0} + $self->{sw}, $self->{y0} ; |
675 | glEnd; |
657 | glEnd; |
676 | |
658 | |
677 | glDisable GL_BLEND; |
659 | glDisable GL_BLEND; |
678 | } |
660 | } |
679 | |
661 | |
… | |
… | |
715 | |
697 | |
716 | if ($ev->{button} == 3) { |
698 | if ($ev->{button} == 3) { |
717 | (new CFPlus::UI::Menu |
699 | (new CFPlus::UI::Menu |
718 | items => [ |
700 | items => [ |
719 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
701 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
720 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
702 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
721 | ], |
703 | ], |
722 | )->popup ($ev); |
704 | )->popup ($ev); |
723 | return 1; |
705 | return 1; |
724 | } |
706 | } |
725 | 0 |
707 | 0 |