1 | package CFPlus::MapWidget; |
1 | package DC::MapWidget; |
2 | |
2 | |
3 | use strict; |
3 | use strict; |
4 | use utf8; |
4 | use utf8; |
5 | |
5 | |
6 | use List::Util qw(min max); |
6 | use List::Util qw(min max); |
7 | |
7 | |
8 | use CFPlus; |
8 | use DC; |
9 | use CFPlus::OpenGL; |
9 | use DC::OpenGL; |
10 | use CFPlus::UI; |
10 | use DC::UI; |
|
|
11 | use DC::Macro; |
11 | |
12 | |
12 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = DC::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_resource DC::Texture "magicmap.png", |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | |
18 | |
18 | sub new { |
19 | sub new { |
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 | |
|
|
35 | $self->{completer} = new CFPlus::MapWidget::Command:: |
|
|
36 | command => $self->{command}, |
|
|
37 | tooltip => "#completer_help", |
|
|
38 | ; |
|
|
39 | |
28 | |
40 | $self |
29 | $self |
41 | } |
30 | } |
42 | |
31 | |
43 | sub add_command { |
32 | sub add_command { |
… | |
… | |
47 | |
36 | |
48 | $tooltip =~ s/^\s+//; |
37 | $tooltip =~ s/^\s+//; |
49 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
38 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
50 | $tooltip =~ s/\s+$//; |
39 | $tooltip =~ s/\s+$//; |
51 | |
40 | |
52 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
41 | $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
53 | } |
42 | } |
54 | |
43 | |
55 | sub clr_commands { |
44 | sub clr_commands { |
56 | my ($self) = @_; |
45 | my ($self) = @_; |
57 | |
46 | |
58 | %{$self->{completer}{command}} = (); |
47 | %{$::COMPLETER->{command}} = (); |
59 | |
48 | |
60 | $self->{completer}->hide |
49 | $::COMPLETER->hide |
61 | if $self->{completer}; |
50 | if $::COMPLETER; |
62 | } |
51 | } |
63 | |
52 | |
64 | sub server_login { |
53 | sub server_login { |
65 | my ($server) = @_; |
54 | my ($server) = @_; |
66 | |
55 | |
67 | ::stop_game (); |
56 | ::stop_game (); |
68 | local $::PROFILE->{host} = $server; |
57 | local $::PROFILE->{host} = $server; |
69 | ::start_game (); |
58 | ::start_game (); |
70 | } |
59 | } |
71 | |
60 | |
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 { |
61 | sub editor_invoke { |
82 | my $editsup = $::CONN && $::CONN->{editor_support} |
62 | my $editsup = $::CONN && $::CONN->{editor_support} |
83 | or return; |
63 | or return; |
84 | |
64 | |
85 | my ($pid, $fh); |
65 | DC::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"; |
66 | print "preparing editor startup...\n"; |
101 | CFPlus::set_proxy; |
|
|
102 | |
67 | |
103 | my $server = $editsup->{gameserver} || "default"; |
68 | my $server = $editsup->{gameserver} || "default"; |
104 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
69 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
105 | |
70 | |
106 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
71 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir; |
107 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
72 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir; |
108 | |
73 | |
109 | print "map directory is $mapdir\n"; |
74 | print "map directory is $mapdir\n"; |
110 | print "lib directory is $libdir\n"; |
75 | print "lib directory is $libdir\n"; |
111 | |
76 | |
112 | require LWP::UserAgent; |
77 | my $ua = DC::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 | |
78 | |
121 | for my $file (qw(archetypes crossfire.0)) { |
79 | for my $file (qw(archetypes crossfire.0)) { |
122 | my $url = "$editsup->{lib_root}$file"; |
80 | my $url = "$editsup->{lib_root}$file"; |
123 | print "mirroring $url...\n"; |
81 | print "mirroring $url...\n"; |
124 | check_lwp $ua->mirror ($url, "$libdir/$file"); |
82 | DC::lwp_check $ua->mirror ($url, "$libdir/$file"); |
125 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
83 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
126 | } |
84 | } |
127 | |
85 | |
128 | if (1) { # upload a map |
86 | if (1) { # upload a map |
129 | my $mapname = $::CONN->{map_info}[0]; |
87 | my $mapname = $::CONN->{map_info}[0]; |
… | |
… | |
134 | |
92 | |
135 | print "getting map revision for $mapname...\n"; |
93 | print "getting map revision for $mapname...\n"; |
136 | |
94 | |
137 | # try to get the most recent head revision, what a hack, |
95 | # try to get the most recent head revision, what a hack, |
138 | # this should have been returned while downloading *sigh* |
96 | # 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; |
97 | my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
140 | |
98 | |
141 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
99 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
142 | my $rev = $1; |
100 | my $rev = $1; |
143 | |
101 | |
144 | print "downloading revision $rev...\n"; |
102 | print "downloading revision $rev...\n"; |
145 | |
103 | |
146 | my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
104 | my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
147 | |
105 | |
148 | my $meta = { |
106 | my $meta = { |
149 | %$editsup, |
107 | %$editsup, |
150 | path => $mapname, |
108 | path => $mapname, |
151 | revision => $rev, |
109 | revision => $rev, |
… | |
… | |
156 | require File::Path; |
114 | require File::Path; |
157 | |
115 | |
158 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
116 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
159 | open my $fh, ">:raw:perlio", "$mappath.meta" |
117 | open my $fh, ">:raw:perlio", "$mappath.meta" |
160 | or die "$mappath.meta: $!\n"; |
118 | or die "$mappath.meta: $!\n"; |
161 | print $fh CFPlus::to_json $meta; |
119 | print $fh DC::encode_json $meta; |
162 | close $fh; |
120 | close $fh; |
163 | open my $fh, ">:raw:perlio:utf8", $mappath |
121 | open my $fh, ">:raw:perlio:utf8", $mappath |
164 | or die "$mappath: $!\n"; |
122 | or die "$mappath: $!\n"; |
165 | print $fh $map; |
123 | print $fh $map; |
166 | close $fh; |
124 | close $fh; |
… | |
… | |
197 | # } |
155 | # } |
198 | } else { |
156 | } else { |
199 | die "viewvc parse error, unable to detect revision\n"; |
157 | die "viewvc parse error, unable to detect revision\n"; |
200 | } |
158 | } |
201 | } |
159 | } |
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 | }); |
160 | } |
220 | } |
161 | } |
221 | |
162 | |
222 | sub invoke_button_down { |
163 | sub invoke_button_down { |
223 | my ($self, $ev, $x, $y) = @_; |
164 | my ($self, $ev, $x, $y) = @_; |
224 | |
165 | |
225 | if ($ev->{button} == 1) { |
166 | if ($ev->{button} == 1) { |
226 | $self->grab_focus; |
167 | $self->grab_focus; |
227 | return unless $::CONN; |
168 | return unless $::CONN; |
228 | |
169 | |
229 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
170 | my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
230 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
171 | my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
231 | |
172 | |
232 | $x -= int 0.5 * $self->{sw}; |
173 | $x -= DC::floor $::MAP->w * 0.5; |
233 | $y -= int 0.5 * $self->{sh}; |
174 | $y -= DC::floor $::MAP->h * 0.5; |
234 | |
175 | |
|
|
176 | if ($::CONN) { |
235 | $::CONN->lookat ($x, $y) |
177 | $::CONN->lookat ($x, $y) |
236 | if $::CONN; |
178 | } |
237 | |
179 | |
238 | } elsif ($ev->{button} == 2) { |
180 | } elsif ($ev->{button} == 2) { |
239 | $self->grab_focus; |
181 | $self->grab_focus; |
240 | return unless $::CONN; |
182 | return unless $::CONN; |
241 | |
183 | |
… | |
… | |
258 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
200 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
259 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
201 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
260 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
202 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
261 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
203 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
262 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
204 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
263 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
205 | # ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
264 | [ |
206 | [ |
265 | $::PICKUP_ENABLE->{state} |
207 | $::PICKUP_ENABLE->{state} |
266 | ? "Disable automatic pickup" |
208 | ? "Disable automatic pickup" |
267 | : "Enable automatic pickup", |
209 | : "Enable automatic pickup", |
268 | sub { $::PICKUP_ENABLE->toggle } |
210 | sub { $::PICKUP_ENABLE->toggle } |
269 | ], |
211 | ], |
270 | ); |
212 | ); |
271 | |
213 | |
272 | if ($::CONN && $::CONN->{editor_support}) { |
214 | if ($::CONN && $::CONN->{editor_support}) { |
273 | push @items, [ |
215 | # push @items, [ |
274 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
216 | # "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", |
275 | \&editor_invoke, |
217 | # \&editor_invoke, |
276 | ]; |
218 | # ]; |
277 | |
219 | |
278 | for my $type (qw(test name)) { |
220 | for my $type (qw(test name)) { |
279 | $::CONN->{editor_support}{type} ne $type |
221 | $::CONN->{editor_support}{type} ne $type |
280 | or next; |
222 | or next; |
281 | my $server = $::CONN->{editor_support}{"${type}server"} |
223 | my $server = $::CONN->{editor_support}{"${type}server"} |
282 | or next; |
224 | or next; |
283 | |
225 | |
284 | push @items, [ |
226 | push @items, [ |
285 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
227 | "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>", |
286 | sub { server_login $server }, |
228 | sub { server_login $server }, |
287 | ]; |
229 | ]; |
288 | } |
230 | } |
289 | } |
231 | } |
290 | |
232 | |
… | |
… | |
298 | } |
240 | } |
299 | } |
241 | } |
300 | ], |
242 | ], |
301 | ; |
243 | ; |
302 | |
244 | |
303 | (new CFPlus::UI::Menu |
245 | (new DC::UI::Menu |
304 | items => \@items, |
246 | items => \@items, |
305 | )->popup ($ev); |
247 | )->popup ($ev); |
306 | } |
248 | } |
307 | |
249 | |
308 | 1 |
250 | 1 |
… | |
… | |
327 | |
269 | |
328 | 1 |
270 | 1 |
329 | } |
271 | } |
330 | |
272 | |
331 | sub size_request { |
273 | sub size_request { |
|
|
274 | my ($self) = @_; |
|
|
275 | |
332 | ( |
276 | ( |
333 | 32 * CFPlus::ceil $::WIDTH / 32, |
277 | $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize}, |
334 | 32 * CFPlus::ceil $::HEIGHT / 32, |
278 | $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize}, |
335 | ) |
279 | ) |
336 | } |
280 | } |
337 | |
281 | |
338 | sub update { |
282 | sub update { |
339 | my ($self) = @_; |
283 | my ($self) = @_; |
… | |
… | |
341 | $self->{need_update} = 1; |
285 | $self->{need_update} = 1; |
342 | $self->SUPER::update; |
286 | $self->SUPER::update; |
343 | } |
287 | } |
344 | |
288 | |
345 | my %DIR = ( |
289 | my %DIR = ( |
346 | CFPlus::SDLK_KP8, [1, "north"], |
290 | ( "," . DC::SDLK_KP5 ), [0, "stay fire"], |
|
|
291 | ( "," . DC::SDLK_KP8 ), [1, "north"], |
347 | CFPlus::SDLK_KP9, [2, "northeast"], |
292 | ( "," . DC::SDLK_KP9 ), [2, "northeast"], |
348 | CFPlus::SDLK_KP6, [3, "east"], |
293 | ( "," . DC::SDLK_KP6 ), [3, "east"], |
349 | CFPlus::SDLK_KP3, [4, "southeast"], |
294 | ( "," . DC::SDLK_KP3 ), [4, "southeast"], |
350 | CFPlus::SDLK_KP2, [5, "south"], |
295 | ( "," . DC::SDLK_KP2 ), [5, "south"], |
351 | CFPlus::SDLK_KP1, [6, "southwest"], |
296 | ( "," . DC::SDLK_KP1 ), [6, "southwest"], |
352 | CFPlus::SDLK_KP4, [7, "west"], |
297 | ( "," . DC::SDLK_KP4 ), [7, "west"], |
353 | CFPlus::SDLK_KP7, [8, "northwest"], |
298 | ( "," . DC::SDLK_KP7 ), [8, "northwest"], |
354 | |
299 | |
355 | CFPlus::SDLK_UP, [1, "north"], |
300 | ( "," . DC::SDLK_PAGEUP ), [2, "northeast"], |
|
|
301 | ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"], |
|
|
302 | ( "," . DC::SDLK_END ), [6, "southwest"], |
|
|
303 | ( "," . DC::SDLK_HOME ), [8, "northwest"], |
|
|
304 | |
|
|
305 | ( "," . DC::SDLK_UP ), [1, "north"], |
|
|
306 | ("1," . DC::SDLK_UP ), [2, "northeast"], |
356 | CFPlus::SDLK_RIGHT, [3, "east"], |
307 | ( "," . DC::SDLK_RIGHT ), [3, "east"], |
357 | CFPlus::SDLK_DOWN, [5, "south"], |
308 | ("1," . DC::SDLK_RIGHT ), [4, "southeast"], |
358 | CFPlus::SDLK_LEFT, [7, "west"], |
309 | ( "," . DC::SDLK_DOWN ), [5, "south"], |
|
|
310 | ("1," . DC::SDLK_DOWN ), [6, "southwest"], |
|
|
311 | ( "," . DC::SDLK_LEFT ), [7, "west"], |
|
|
312 | ("1," . DC::SDLK_LEFT ), [8, "northwest"], |
359 | ); |
313 | ); |
360 | |
314 | |
361 | sub invoke_key_down { |
315 | sub invoke_key_down { |
362 | my ($self, $ev) = @_; |
316 | my ($self, $ev) = @_; |
363 | |
317 | |
364 | my $mod = $ev->{mod}; |
318 | my $mod = $ev->{mod}; |
365 | my $sym = $ev->{sym}; |
319 | my $sym = $ev->{sym}; |
366 | my $uni = $ev->{unicode}; |
320 | my $uni = $ev->{unicode}; |
367 | |
321 | |
368 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
322 | $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT; |
369 | |
323 | |
370 | if ($uni == ord "\t") { |
324 | # ignore repeated keypresses |
371 | $::PL_WINDOW->toggle_visibility; |
325 | return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; |
372 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
326 | $self->{last_mod} = $mod; |
373 | $::HELP_WINDOW->toggle_visibility; |
327 | $self->{last_sym} = $sym; |
374 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
|
|
375 | ::toggle_player_page ($::STATS_PAGE); |
|
|
376 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
|
|
377 | ::toggle_player_page ($::SKILL_PAGE); |
|
|
378 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
|
|
379 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
380 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
|
|
381 | ::toggle_player_page ($::INVENTORY_PAGE); |
|
|
382 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
|
|
383 | $::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) { |
|
|
398 | return 0; # bindings further down need a valid connection |
|
|
399 | |
328 | |
400 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
329 | my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; |
401 | $::CONN->user_send ("stay fire"); |
330 | |
402 | } elsif ($uni == ord ",") { |
331 | if ($::CONN && $dir) { |
403 | $::CONN->user_send ("take"); |
|
|
404 | } elsif ($uni == ord " ") { |
|
|
405 | $::CONN->user_send ("apply"); |
|
|
406 | } elsif ($uni == 13) { |
|
|
407 | $::CONN->user_send ("examine"); |
|
|
408 | } elsif ($uni == ord ".") { |
|
|
409 | $::CONN->user_send ($self->{completer}{last_command}) |
|
|
410 | if exists $self->{completer}{last_command}; |
|
|
411 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
|
|
412 | $::CONN->user_send ($_) for @$bind_cmd; |
|
|
413 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
|
|
414 | $::CONN->user_send ("rotateshoottype +"); |
|
|
415 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
|
|
416 | $::CONN->user_send ("rotateshoottype -"); |
|
|
417 | } elsif ($uni == ord '"') { |
|
|
418 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
|
|
419 | $self->{completer}->show; |
|
|
420 | } elsif ($uni == ord "'") { |
|
|
421 | $self->{completer}->set_prefix (""); |
|
|
422 | $self->{completer}->show; |
|
|
423 | } elsif (exists $DIR{$sym}) { |
|
|
424 | if ($mod & CFPlus::KMOD_SHIFT) { |
332 | if ($mod & DC::KMOD_SHIFT) { |
425 | $self->{shft}++; |
333 | $self->{shft}++; |
426 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
334 | if ($dir->[0] != $self->{fire_dir}) { |
427 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
335 | $::CONN->user_send ("fire $dir->[0]"); |
428 | } |
336 | } |
429 | $self->{fire_dir} = $DIR{$sym}[0]; |
337 | $self->{fire_dir} = $dir->[0]; |
430 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
338 | } elsif ($mod & DC::KMOD_CTRL) { |
431 | $self->{ctrl}++; |
339 | $self->{ctrl}++; |
432 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
340 | $::CONN->user_send ("run $dir->[0]"); |
433 | } else { |
341 | } else { |
434 | $::CONN->user_send ("$DIR{$sym}[1]"); |
342 | $::CONN->user_send ("$dir->[1]"); |
435 | } |
343 | } |
436 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
344 | |
437 | $self->{completer}->inject_key_down ($ev); |
|
|
438 | $self->{completer}->show; |
|
|
439 | } else { |
|
|
440 | return 0; |
345 | return 1; |
441 | } |
|
|
442 | |
|
|
443 | 1 |
346 | } |
|
|
347 | |
|
|
348 | 0 |
444 | } |
349 | } |
445 | |
350 | |
446 | sub invoke_key_up { |
351 | sub invoke_key_up { |
447 | my ($self, $ev) = @_; |
352 | my ($self, $ev) = @_; |
448 | |
353 | |
449 | my $res = 0; |
354 | my $res = 0; |
450 | my $mod = $ev->{mod}; |
355 | my $mod = $ev->{mod}; |
451 | my $sym = $ev->{sym}; |
356 | my $sym = $ev->{sym}; |
452 | |
357 | |
|
|
358 | delete $self->{last_mod}; |
|
|
359 | delete $self->{last_sym}; |
|
|
360 | |
453 | if ($::CFG->{shift_fire_stop}) { |
361 | if ($::CFG->{shift_fire_stop}) { |
454 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
362 | if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { |
455 | $::CONN->user_send ("fire_stop"); |
363 | $::CONN->user_send ("fire_stop"); |
456 | delete $self->{fire_dir}; |
364 | delete $self->{fire_dir}; |
457 | $res = 1; |
365 | $res = 1; |
458 | } |
366 | } |
459 | } else { |
367 | } else { |
|
|
368 | my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; |
|
|
369 | |
460 | if (exists $DIR{$sym} && delete $self->{shft}) { |
370 | if ($dir && delete $self->{shft}) { |
461 | $::CONN->user_send ("fire_stop"); |
371 | $::CONN->user_send ("fire_stop"); |
462 | delete $self->{fire_dir}; |
372 | delete $self->{fire_dir}; |
463 | $res = 1; |
373 | $res = 1; |
464 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
374 | } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) |
|
|
375 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
465 | $::CONN->user_send ("fire_stop"); |
376 | $::CONN->user_send ("fire_stop"); |
466 | delete $self->{fire_dir}; |
377 | delete $self->{fire_dir}; |
467 | $res = 1; |
378 | $res = 1; |
468 | } |
379 | } |
469 | } |
380 | } |
470 | |
381 | |
471 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
382 | if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) { |
472 | $::CONN->user_send ("run_stop"); |
383 | $::CONN->user_send ("run_stop"); |
473 | $res = 1; |
384 | $res = 1; |
474 | } |
385 | } |
475 | |
386 | |
476 | $res |
387 | $res |
477 | } |
388 | } |
478 | |
389 | |
|
|
390 | sub invoke_visibility_change { |
|
|
391 | my ($self) = @_; |
|
|
392 | |
|
|
393 | $self->refresh_hook; |
|
|
394 | |
|
|
395 | 0 |
|
|
396 | } |
|
|
397 | |
|
|
398 | sub set_tilesize { |
|
|
399 | my ($self, $tilesize) = @_; |
|
|
400 | |
|
|
401 | $self->{tilesize} = $tilesize; |
|
|
402 | } |
|
|
403 | |
|
|
404 | sub scroll { |
|
|
405 | my ($self, $dx, $dy) = @_; |
|
|
406 | |
|
|
407 | $::MAP->scroll ($dx, $dy); |
|
|
408 | |
|
|
409 | $self->movement_update; |
|
|
410 | |
|
|
411 | $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement |
|
|
412 | $self->{sdy} += $dy * $self->{tilesize}; |
|
|
413 | } |
|
|
414 | |
479 | sub set_magicmap { |
415 | sub set_magicmap { |
480 | my ($self, $w, $h, $x, $y, $data) = @_; |
416 | my ($self, $w, $h, $x, $y, $data) = @_; |
481 | |
417 | |
482 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
418 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
483 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
419 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
484 | |
420 | |
485 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
421 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
486 | |
422 | |
487 | $self->update; |
423 | $self->update; |
488 | } |
424 | } |
489 | |
425 | |
|
|
426 | sub movement_update { |
|
|
427 | my ($self) = @_; |
|
|
428 | |
|
|
429 | if ($::CFG->{smooth_movement}) { |
|
|
430 | if ($self->{sdx} || $self->{sdy}) { |
|
|
431 | my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); |
|
|
432 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
|
|
433 | |
|
|
434 | # the minimum time for a single tile movement |
|
|
435 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); |
|
|
436 | |
|
|
437 | # jump if "impossibly high" speed |
|
|
438 | if ( |
|
|
439 | (max abs $self->{sdx}, abs $self->{sdy}) |
|
|
440 | > $spd * $self->{tilesize} * $mintime * 1.1 |
|
|
441 | ) { |
|
|
442 | #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# |
|
|
443 | $self->{sdx} = $self->{sdy} = 0; |
|
|
444 | } else { |
|
|
445 | $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction |
|
|
446 | |
|
|
447 | my $dx = $self->{sdx} < 0 ? -$spd : $spd; |
|
|
448 | my $dy = $self->{sdy} < 0 ? -$spd : $spd; |
|
|
449 | |
|
|
450 | if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } |
|
|
451 | if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } |
|
|
452 | |
|
|
453 | $self->update; |
|
|
454 | } |
|
|
455 | } |
|
|
456 | } else { |
|
|
457 | $self->{sdx} = $self->{sdy} = 0; |
|
|
458 | } |
|
|
459 | |
|
|
460 | $self->{last_update} = EV::time; |
|
|
461 | } |
|
|
462 | |
|
|
463 | sub refresh_hook { |
|
|
464 | my ($self) = @_; |
|
|
465 | |
|
|
466 | if ($::MAP && $::CONN) { |
|
|
467 | if (delete $self->{need_update}) { |
|
|
468 | $self->movement_update; |
|
|
469 | |
|
|
470 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
|
|
471 | |
|
|
472 | my $sdx_t = DC::ceil $self->{sdx} / $tilesize; |
|
|
473 | my $sdy_t = DC::ceil $self->{sdy} / $tilesize; |
|
|
474 | |
|
|
475 | # width/height of map, in tiles |
|
|
476 | my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize; |
|
|
477 | my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize; |
|
|
478 | |
|
|
479 | # the map displacement, in tiles |
|
|
480 | my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t; |
|
|
481 | my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t; |
|
|
482 | |
|
|
483 | # the upper left "visible" corner, in pixels |
|
|
484 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
485 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
486 | |
|
|
487 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
|
|
488 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
|
|
489 | |
|
|
490 | if ($::CFG->{fow_enable}) { |
|
|
491 | $sdx_t = $sdy_t = 0;#d# |
|
|
492 | my ($w, $h, $data) = $::MAP->fow_texture ( |
|
|
493 | $dx + (min 0, $sdx_t), |
|
|
494 | $dy + (min 0, $sdy_t), |
|
|
495 | $sw + abs $sdx_t, |
|
|
496 | $sh + abs $sdy_t |
|
|
497 | ); |
|
|
498 | |
|
|
499 | $self->{fow_texture} = new DC::Texture |
|
|
500 | w => $w, |
|
|
501 | h => $h, |
|
|
502 | data => $data, |
|
|
503 | internalformat => GL_ALPHA, |
|
|
504 | format => GL_ALPHA; |
|
|
505 | } else { |
|
|
506 | delete $self->{fow_texture}; |
|
|
507 | } |
|
|
508 | |
|
|
509 | glNewList ($self->{list} ||= glGenList); |
|
|
510 | |
|
|
511 | glPushMatrix; |
|
|
512 | glTranslate $sx0, $sy0; |
|
|
513 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
514 | glTranslate $self->{sdx}, $self->{sdy}; |
|
|
515 | |
|
|
516 | $::MAP->draw ($dx, $dy, $sw, $sh, |
|
|
517 | $self->{tilesize}, |
|
|
518 | $::CONN->{player}{tag}, |
|
|
519 | -$self->{sdx}, -$self->{sdy}); |
|
|
520 | |
|
|
521 | #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player |
|
|
522 | glScale $self->{tilesize}, $self->{tilesize}; |
|
|
523 | |
|
|
524 | if (my $tex = $self->{fow_texture}) { |
|
|
525 | glPushMatrix; |
|
|
526 | glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); |
|
|
527 | glScale 1/3, 1/3; |
|
|
528 | glEnable GL_TEXTURE_2D; |
|
|
529 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
530 | |
|
|
531 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
|
|
532 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
|
|
533 | |
|
|
534 | glDisable GL_TEXTURE_2D; |
|
|
535 | glPopMatrix; |
|
|
536 | } |
|
|
537 | |
|
|
538 | if ($self->{magicmap}) { |
|
|
539 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
540 | |
|
|
541 | $x += $::MAP->ox + $self->{dx}; |
|
|
542 | $y += $::MAP->oy + $self->{dy}; |
|
|
543 | |
|
|
544 | glTranslate - $x - 1, - $y - 1; |
|
|
545 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
546 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
547 | } |
|
|
548 | |
|
|
549 | glPopMatrix; |
|
|
550 | glEndList; |
|
|
551 | } |
|
|
552 | } else { |
|
|
553 | glDeleteList delete $self->{list} |
|
|
554 | if $self->{list}; |
|
|
555 | } |
|
|
556 | } |
|
|
557 | |
490 | sub draw { |
558 | sub draw { |
491 | my ($self) = @_; |
559 | my ($self) = @_; |
492 | |
560 | |
493 | return unless $::MAP; |
561 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
494 | |
562 | |
|
|
563 | return unless $self->{list}; |
|
|
564 | |
495 | my $focused = $CFPlus::UI::FOCUS == $self |
565 | my $focused = $DC::UI::FOCUS == $self |
496 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
566 | || $DC::UI::FOCUS == $::COMPLETER->{entry}; |
497 | |
567 | |
498 | return |
568 | return |
499 | unless $focused || !$::FAST; |
569 | unless $focused || !$::FAST; |
500 | |
570 | |
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 | |
|
|
575 | glCallList $self->{list}; |
571 | glCallList $self->{list}; |
576 | |
572 | |
577 | # TNT2 emulates logops in software (or worse :) |
573 | # TNT2 emulates logops in software (or worse :) |
578 | unless ($focused) { |
574 | unless ($focused) { |
579 | glColor 0.4, 0.2, 0.2, 0.6; |
575 | glColor_premultiply 0, 0, 1, 0.25; |
580 | glEnable GL_BLEND; |
576 | glEnable GL_BLEND; |
581 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
577 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
582 | glBegin GL_QUADS; |
578 | glBegin GL_QUADS; |
583 | glVertex 0, 0; |
579 | glVertex 0, 0; |
584 | glVertex 0, $::HEIGHT; |
580 | glVertex 0, $::HEIGHT; |
585 | glVertex $::WIDTH, $::HEIGHT; |
581 | glVertex $::WIDTH, $::HEIGHT; |
586 | glVertex $::WIDTH, 0; |
582 | glVertex $::WIDTH, 0; |
… | |
… | |
595 | glDeleteList $self->{list}; |
591 | glDeleteList $self->{list}; |
596 | |
592 | |
597 | $self->SUPER::DESTROY; |
593 | $self->SUPER::DESTROY; |
598 | } |
594 | } |
599 | |
595 | |
600 | package CFPlus::MapWidget::MapMap; |
596 | package DC::MapWidget::MapMap; |
601 | |
597 | |
|
|
598 | use strict; |
|
|
599 | use utf8; |
|
|
600 | |
602 | our @ISA = CFPlus::UI::Base::; |
601 | our @ISA = DC::UI::Base::; |
603 | |
602 | |
604 | use Time::HiRes qw(time); |
603 | use Time::HiRes qw(time); |
605 | use CFPlus::OpenGL; |
604 | use DC::OpenGL; |
606 | |
605 | |
607 | sub size_request { |
606 | sub size_request { |
608 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
607 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
|
|
608 | } |
|
|
609 | |
|
|
610 | sub refresh_hook { |
|
|
611 | my ($self) = @_; |
|
|
612 | |
|
|
613 | if ($::MAP && $self->{texture_atime} < time) { |
|
|
614 | my ($w, $h) = @$self{qw(w h)}; |
|
|
615 | |
|
|
616 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
617 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
618 | |
|
|
619 | my $ox = 0.5 * ($w - $sw); |
|
|
620 | my $oy = 0.5 * ($h - $sh); |
|
|
621 | |
|
|
622 | my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; |
|
|
623 | my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; |
|
|
624 | |
|
|
625 | #TODO: map scale is completely borked |
|
|
626 | |
|
|
627 | my $x0 = int $ox - $sx + 0.5; |
|
|
628 | my $y0 = int $oy - $sy + 0.5; |
|
|
629 | |
|
|
630 | $self->{sw} = $sw; |
|
|
631 | $self->{sh} = $sh; |
|
|
632 | |
|
|
633 | $self->{x0} = $x0; |
|
|
634 | $self->{y0} = $y0; |
|
|
635 | |
|
|
636 | $self->{texture_atime} = time + 1/3; |
|
|
637 | |
|
|
638 | $self->{texture} = |
|
|
639 | new DC::Texture |
|
|
640 | w => $w, |
|
|
641 | h => $h, |
|
|
642 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
|
|
643 | type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
|
|
644 | } |
|
|
645 | } |
|
|
646 | |
|
|
647 | sub invoke_visibility_change { |
|
|
648 | my ($self) = @_; |
|
|
649 | |
|
|
650 | $self->refresh_hook; |
|
|
651 | |
|
|
652 | 0 |
609 | } |
653 | } |
610 | |
654 | |
611 | sub invoke_size_allocate { |
655 | sub invoke_size_allocate { |
612 | my ($self, $w, $h) = @_; |
656 | my ($self, $w, $h) = @_; |
613 | |
657 | |
… | |
… | |
624 | } |
668 | } |
625 | |
669 | |
626 | sub _draw { |
670 | sub _draw { |
627 | my ($self) = @_; |
671 | my ($self) = @_; |
628 | |
672 | |
629 | $::MAP or return; |
673 | $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook }); |
630 | |
674 | |
631 | my ($w, $h) = @$self{qw(w h)}; |
675 | $self->{texture} or return; |
632 | |
|
|
633 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
634 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
635 | |
|
|
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); |
|
|
640 | my $oy = 0.5 * ($h - $sh); |
|
|
641 | |
676 | |
642 | glEnable GL_BLEND; |
677 | glEnable GL_BLEND; |
643 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
678 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
644 | glEnable GL_TEXTURE_2D; |
679 | glEnable GL_TEXTURE_2D; |
645 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
680 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
646 | |
681 | |
647 | if ($self->{texture_atime} < time) { |
|
|
648 | $self->{texture_atime} = time + 1/3; |
|
|
649 | |
|
|
650 | $self->{texture} = |
|
|
651 | new CFPlus::Texture |
|
|
652 | w => $w, |
|
|
653 | h => $h, |
|
|
654 | 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; |
|
|
656 | } |
|
|
657 | |
|
|
658 | $self->{texture}->draw_quad (0, 0); |
682 | $self->{texture}->draw_quad (0, 0); |
659 | |
683 | |
660 | glDisable GL_TEXTURE_2D; |
684 | glDisable GL_TEXTURE_2D; |
661 | |
685 | |
662 | glTranslate 0.375, 0.375; |
686 | 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 | |
687 | |
669 | glColor 1, 1, 0, 1; |
688 | glColor 1, 1, 0, 1; |
670 | glBegin GL_LINE_LOOP; |
689 | glBegin GL_LINE_LOOP; |
671 | glVertex $x0 , $y0 ; |
690 | glVertex $self->{x0} , $self->{y0} ; |
672 | glVertex $x0 , $y0 + $sh; |
691 | glVertex $self->{x0} , $self->{y0} + $self->{sh}; |
673 | glVertex $x0 + $sw, $y0 + $sh; |
692 | glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh}; |
674 | glVertex $x0 + $sw, $y0 ; |
693 | glVertex $self->{x0} + $self->{sw}, $self->{y0} ; |
675 | glEnd; |
694 | glEnd; |
676 | |
695 | |
677 | glDisable GL_BLEND; |
696 | glDisable GL_BLEND; |
678 | } |
697 | } |
679 | |
698 | |
680 | package CFPlus::MapWidget::Command; |
699 | package DC::MapWidget::Command; |
681 | |
700 | |
682 | use strict; |
701 | use strict; |
683 | |
702 | |
684 | use CFPlus::OpenGL; |
703 | use DC::OpenGL; |
685 | |
704 | |
686 | our @ISA = CFPlus::UI::Frame::; |
705 | our @ISA = DC::UI::Frame::; |
687 | |
706 | |
688 | sub new { |
707 | sub new { |
689 | my $class = shift; |
708 | my $class = shift; |
690 | |
709 | |
691 | my $self = $class->SUPER::new ( |
710 | my $self = $class->SUPER::new ( |
692 | bg => [0, 0, 0, 0.8], |
711 | bg => [0, 0, 0, 0.8], |
693 | @_, |
712 | @_, |
694 | ); |
713 | ); |
695 | |
714 | |
696 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
715 | $self->add ($self->{vbox} = new DC::UI::VBox); |
697 | |
716 | |
698 | $self->{label} = [ |
717 | $self->{label} = [ |
699 | map |
718 | map |
700 | CFPlus::UI::Label->new ( |
719 | DC::UI::Label->new ( |
|
|
720 | align => 0, |
701 | can_hover => 1, |
721 | can_hover => 1, |
702 | can_events => 1, |
722 | can_events => 1, |
703 | tooltip_width => 0.33, |
723 | tooltip_width => 0.33, |
704 | fontsize => $_, |
724 | fontsize => $_, |
705 | ), (0.8) x 16 |
725 | ), (0.8) x 16 |
706 | ]; |
726 | ]; |
707 | |
727 | |
708 | $self->{entry} = new CFPlus::UI::Entry |
728 | $self->{entry} = new DC::UI::Entry |
709 | on_changed => sub { |
729 | on_changed => sub { |
710 | $self->update_labels; |
730 | $self->update_labels; |
711 | 0 |
731 | 0 |
712 | }, |
732 | }, |
713 | on_button_down => sub { |
733 | on_button_down => sub { |
714 | my ($entry, $ev, $x, $y) = @_; |
734 | my ($entry, $ev, $x, $y) = @_; |
715 | |
735 | |
716 | if ($ev->{button} == 3) { |
736 | if ($ev->{button} == 3) { |
717 | (new CFPlus::UI::Menu |
737 | (new DC::UI::Menu |
718 | items => [ |
738 | items => [ |
719 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
739 | ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key" |
720 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
740 | => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
721 | ], |
741 | ], |
722 | )->popup ($ev); |
742 | )->popup ($ev); |
723 | return 1; |
743 | return 1; |
724 | } |
744 | } |
725 | 0 |
745 | 0 |
… | |
… | |
740 | $self->hide; |
760 | $self->hide; |
741 | } |
761 | } |
742 | } elsif ($ev->{sym} == 27) { |
762 | } elsif ($ev->{sym} == 27) { |
743 | $self->{hist_ptr} = 0; |
763 | $self->{hist_ptr} = 0; |
744 | $self->hide; |
764 | $self->hide; |
745 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
765 | } elsif ($ev->{sym} == DC::SDLK_DOWN) { |
746 | if ($self->{hist_ptr} > 1) { |
766 | if ($self->{hist_ptr} > 1) { |
747 | $self->{hist_ptr}--; |
767 | $self->{hist_ptr}--; |
748 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
768 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
749 | } elsif ($self->{hist_ptr} > 0) { |
769 | } elsif ($self->{hist_ptr} > 0) { |
750 | $self->{hist_ptr}--; |
770 | $self->{hist_ptr}--; |
… | |
… | |
752 | } else { |
772 | } else { |
753 | ++$self->{select_offset} |
773 | ++$self->{select_offset} |
754 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
774 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
755 | } |
775 | } |
756 | $self->update_labels; |
776 | $self->update_labels; |
757 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
777 | } elsif ($ev->{sym} == DC::SDLK_UP) { |
758 | if ($self->{select_offset}) { |
778 | if ($self->{select_offset}) { |
759 | --$self->{select_offset} |
779 | --$self->{select_offset} |
760 | } else { |
780 | } else { |
761 | unless ($self->{hist_ptr}) { |
781 | unless ($self->{hist_ptr}) { |
762 | $self->{hist_saveback} = $self->{entry}->get_text; |
782 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
920 | |
940 | |
921 | sub _draw { |
941 | sub _draw { |
922 | my ($self) = @_; |
942 | my ($self) = @_; |
923 | |
943 | |
924 | # hack |
944 | # hack |
925 | local $CFPlus::UI::FOCUS = $self->{entry}; |
945 | local $DC::UI::FOCUS = $self->{entry}; |
926 | |
946 | |
927 | $self->SUPER::_draw; |
947 | $self->SUPER::_draw; |
928 | } |
948 | } |
929 | |
949 | |
930 | 1 |
950 | 1 |