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 CFPlus::Macro; |
11 | use DC::Macro; |
12 | |
12 | |
13 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = DC::UI::Base::; |
14 | |
14 | |
15 | my $magicmap_tex = |
15 | my $magicmap_tex = |
16 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | new_from_file DC::Texture DC::find_rcfile "magicmap.png", |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
18 | |
18 | |
19 | sub new { |
19 | sub new { |
20 | my $class = shift; |
20 | my $class = shift; |
21 | |
21 | |
… | |
… | |
27 | ); |
27 | ); |
28 | |
28 | |
29 | $self |
29 | $self |
30 | } |
30 | } |
31 | |
31 | |
32 | sub set_tilesize { |
|
|
33 | my ($self, $tilesize) = @_; |
|
|
34 | |
|
|
35 | $self->{tilesize} = $tilesize; |
|
|
36 | } |
|
|
37 | |
|
|
38 | sub add_command { |
32 | sub add_command { |
39 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
33 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
40 | |
34 | |
41 | (my $data = $command) =~ s/\\//g; |
35 | (my $data = $command) =~ s/\\//g; |
42 | |
36 | |
… | |
… | |
66 | |
60 | |
67 | sub editor_invoke { |
61 | sub editor_invoke { |
68 | my $editsup = $::CONN && $::CONN->{editor_support} |
62 | my $editsup = $::CONN && $::CONN->{editor_support} |
69 | or return; |
63 | or return; |
70 | |
64 | |
71 | CFPlus::background { |
65 | DC::background { |
72 | print "preparing editor startup...\n"; |
66 | print "preparing editor startup...\n"; |
73 | |
67 | |
74 | my $server = $editsup->{gameserver} || "default"; |
68 | my $server = $editsup->{gameserver} || "default"; |
75 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
69 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
76 | |
70 | |
77 | 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; |
78 | 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; |
79 | |
73 | |
80 | print "map directory is $mapdir\n"; |
74 | print "map directory is $mapdir\n"; |
81 | print "lib directory is $libdir\n"; |
75 | print "lib directory is $libdir\n"; |
82 | |
76 | |
83 | my $ua = CFPlus::lwp_useragent; |
77 | my $ua = DC::lwp_useragent; |
84 | |
78 | |
85 | for my $file (qw(archetypes crossfire.0)) { |
79 | for my $file (qw(archetypes crossfire.0)) { |
86 | my $url = "$editsup->{lib_root}$file"; |
80 | my $url = "$editsup->{lib_root}$file"; |
87 | print "mirroring $url...\n"; |
81 | print "mirroring $url...\n"; |
88 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
82 | DC::lwp_check $ua->mirror ($url, "$libdir/$file"); |
89 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
83 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
90 | } |
84 | } |
91 | |
85 | |
92 | if (1) { # upload a map |
86 | if (1) { # upload a map |
93 | my $mapname = $::CONN->{map_info}[0]; |
87 | my $mapname = $::CONN->{map_info}[0]; |
… | |
… | |
98 | |
92 | |
99 | print "getting map revision for $mapname...\n"; |
93 | print "getting map revision for $mapname...\n"; |
100 | |
94 | |
101 | # try to get the most recent head revision, what a hack, |
95 | # try to get the most recent head revision, what a hack, |
102 | # this should have been returned while downloading *sigh* |
96 | # this should have been returned while downloading *sigh* |
103 | my $log = (CFPlus::lwp_check $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; |
104 | |
98 | |
105 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
99 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
106 | my $rev = $1; |
100 | my $rev = $1; |
107 | |
101 | |
108 | print "downloading revision $rev...\n"; |
102 | print "downloading revision $rev...\n"; |
109 | |
103 | |
110 | my $map = (CFPlus::lwp_check $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; |
111 | |
105 | |
112 | my $meta = { |
106 | my $meta = { |
113 | %$editsup, |
107 | %$editsup, |
114 | path => $mapname, |
108 | path => $mapname, |
115 | revision => $rev, |
109 | revision => $rev, |
… | |
… | |
120 | require File::Path; |
114 | require File::Path; |
121 | |
115 | |
122 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
116 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
123 | open my $fh, ">:raw:perlio", "$mappath.meta" |
117 | open my $fh, ">:raw:perlio", "$mappath.meta" |
124 | or die "$mappath.meta: $!\n"; |
118 | or die "$mappath.meta: $!\n"; |
125 | print $fh CFPlus::encode_json $meta; |
119 | print $fh DC::encode_json $meta; |
126 | close $fh; |
120 | close $fh; |
127 | open my $fh, ">:raw:perlio:utf8", $mappath |
121 | open my $fh, ">:raw:perlio:utf8", $mappath |
128 | or die "$mappath: $!\n"; |
122 | or die "$mappath: $!\n"; |
129 | print $fh $map; |
123 | print $fh $map; |
130 | close $fh; |
124 | close $fh; |
… | |
… | |
171 | |
165 | |
172 | if ($ev->{button} == 1) { |
166 | if ($ev->{button} == 1) { |
173 | $self->grab_focus; |
167 | $self->grab_focus; |
174 | return unless $::CONN; |
168 | return unless $::CONN; |
175 | |
169 | |
176 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
170 | my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
177 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
171 | my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
178 | |
172 | |
179 | $x -= CFPlus::floor $::MAP->w * 0.5; |
173 | $x -= DC::floor $::MAP->w * 0.5; |
180 | $y -= CFPlus::floor $::MAP->h * 0.5; |
174 | $y -= DC::floor $::MAP->h * 0.5; |
181 | |
175 | |
182 | if ($::CONN) { |
176 | if ($::CONN) { |
183 | $::CONN->lookat ($x, $y) |
177 | $::CONN->lookat ($x, $y) |
184 | } |
178 | } |
185 | |
179 | |
… | |
… | |
206 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
200 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
207 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
201 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
208 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
202 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
209 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
203 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
210 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
204 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
211 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
205 | # ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
212 | [ |
206 | [ |
213 | $::PICKUP_ENABLE->{state} |
207 | $::PICKUP_ENABLE->{state} |
214 | ? "Disable automatic pickup" |
208 | ? "Disable automatic pickup" |
215 | : "Enable automatic pickup", |
209 | : "Enable automatic pickup", |
216 | sub { $::PICKUP_ENABLE->toggle } |
210 | sub { $::PICKUP_ENABLE->toggle } |
217 | ], |
211 | ], |
218 | ); |
212 | ); |
219 | |
213 | |
220 | if ($::CONN && $::CONN->{editor_support}) { |
214 | if ($::CONN && $::CONN->{editor_support}) { |
221 | push @items, [ |
215 | # push @items, [ |
222 | "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>", |
223 | \&editor_invoke, |
217 | # \&editor_invoke, |
224 | ]; |
218 | # ]; |
225 | |
219 | |
226 | for my $type (qw(test name)) { |
220 | for my $type (qw(test name)) { |
227 | $::CONN->{editor_support}{type} ne $type |
221 | $::CONN->{editor_support}{type} ne $type |
228 | or next; |
222 | or next; |
229 | my $server = $::CONN->{editor_support}{"${type}server"} |
223 | my $server = $::CONN->{editor_support}{"${type}server"} |
230 | or next; |
224 | or next; |
231 | |
225 | |
232 | push @items, [ |
226 | push @items, [ |
233 | "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>", |
234 | sub { server_login $server }, |
228 | sub { server_login $server }, |
235 | ]; |
229 | ]; |
236 | } |
230 | } |
237 | } |
231 | } |
238 | |
232 | |
… | |
… | |
246 | } |
240 | } |
247 | } |
241 | } |
248 | ], |
242 | ], |
249 | ; |
243 | ; |
250 | |
244 | |
251 | (new CFPlus::UI::Menu |
245 | (new DC::UI::Menu |
252 | items => \@items, |
246 | items => \@items, |
253 | )->popup ($ev); |
247 | )->popup ($ev); |
254 | } |
248 | } |
255 | |
249 | |
256 | 1 |
250 | 1 |
… | |
… | |
278 | |
272 | |
279 | sub size_request { |
273 | sub size_request { |
280 | my ($self) = @_; |
274 | my ($self) = @_; |
281 | |
275 | |
282 | ( |
276 | ( |
283 | $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, |
277 | $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize}, |
284 | $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, |
278 | $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize}, |
285 | ) |
279 | ) |
286 | } |
280 | } |
287 | |
281 | |
288 | sub update { |
282 | sub update { |
289 | my ($self) = @_; |
283 | my ($self) = @_; |
… | |
… | |
291 | $self->{need_update} = 1; |
285 | $self->{need_update} = 1; |
292 | $self->SUPER::update; |
286 | $self->SUPER::update; |
293 | } |
287 | } |
294 | |
288 | |
295 | my %DIR = ( |
289 | my %DIR = ( |
296 | ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], |
290 | ( "," . DC::SDLK_KP5 ), [0, "stay fire"], |
297 | ( "," . CFPlus::SDLK_KP8 ), [1, "north"], |
291 | ( "," . DC::SDLK_KP8 ), [1, "north"], |
298 | ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], |
292 | ( "," . DC::SDLK_KP9 ), [2, "northeast"], |
299 | ( "," . CFPlus::SDLK_KP6 ), [3, "east"], |
293 | ( "," . DC::SDLK_KP6 ), [3, "east"], |
300 | ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], |
294 | ( "," . DC::SDLK_KP3 ), [4, "southeast"], |
301 | ( "," . CFPlus::SDLK_KP2 ), [5, "south"], |
295 | ( "," . DC::SDLK_KP2 ), [5, "south"], |
302 | ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], |
296 | ( "," . DC::SDLK_KP1 ), [6, "southwest"], |
303 | ( "," . CFPlus::SDLK_KP4 ), [7, "west"], |
297 | ( "," . DC::SDLK_KP4 ), [7, "west"], |
304 | ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], |
298 | ( "," . DC::SDLK_KP7 ), [8, "northwest"], |
305 | |
299 | |
306 | ( "," . CFPlus::SDLK_UP ), [1, "north"], |
300 | ( "," . DC::SDLK_UP ), [1, "north"], |
307 | ("1," . CFPlus::SDLK_UP ), [2, "northeast"], |
301 | ("1," . DC::SDLK_UP ), [2, "northeast"], |
308 | ( "," . CFPlus::SDLK_RIGHT), [3, "east"], |
302 | ( "," . DC::SDLK_RIGHT), [3, "east"], |
309 | ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], |
303 | ("1," . DC::SDLK_RIGHT), [4, "southeast"], |
310 | ( "," . CFPlus::SDLK_DOWN ), [5, "south"], |
304 | ( "," . DC::SDLK_DOWN ), [5, "south"], |
311 | ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], |
305 | ("1," . DC::SDLK_DOWN ), [6, "southwest"], |
312 | ( "," . CFPlus::SDLK_LEFT ), [7, "west"], |
306 | ( "," . DC::SDLK_LEFT ), [7, "west"], |
313 | ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], |
307 | ("1," . DC::SDLK_LEFT ), [8, "northwest"], |
314 | ); |
308 | ); |
315 | |
309 | |
316 | sub invoke_key_down { |
310 | sub invoke_key_down { |
317 | my ($self, $ev) = @_; |
311 | my ($self, $ev) = @_; |
318 | |
312 | |
319 | my $mod = $ev->{mod}; |
313 | my $mod = $ev->{mod}; |
320 | my $sym = $ev->{sym}; |
314 | my $sym = $ev->{sym}; |
321 | my $uni = $ev->{unicode}; |
315 | my $uni = $ev->{unicode}; |
322 | |
316 | |
323 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
317 | $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; |
324 | |
318 | |
|
|
319 | # ignore repeated keypresses |
|
|
320 | return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; |
|
|
321 | $self->{last_mod} = $mod; |
|
|
322 | $self->{last_sym} = $sym; |
|
|
323 | |
325 | if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) { |
324 | if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { |
326 | if ($mod & CFPlus::KMOD_SHIFT) { |
325 | if ($mod & DC::KMOD_SHIFT) { |
327 | $self->{shft}++; |
326 | $self->{shft}++; |
328 | if ($dir->[0] != $self->{fire_dir}) { |
327 | if ($dir->[0] != $self->{fire_dir}) { |
329 | $::CONN->user_send ("fire $dir->[0]"); |
328 | $::CONN->user_send ("fire $dir->[0]"); |
330 | } |
329 | } |
331 | $self->{fire_dir} = $dir->[0]; |
330 | $self->{fire_dir} = $dir->[0]; |
332 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
331 | } elsif ($mod & DC::KMOD_CTRL) { |
333 | $self->{ctrl}++; |
332 | $self->{ctrl}++; |
334 | $::CONN->user_send ("run $dir->[0]"); |
333 | $::CONN->user_send ("run $dir->[0]"); |
335 | } else { |
334 | } else { |
336 | $::CONN->user_send ("$dir->[1]"); |
335 | $::CONN->user_send ("$dir->[1]"); |
337 | } |
336 | } |
… | |
… | |
347 | |
346 | |
348 | my $res = 0; |
347 | my $res = 0; |
349 | my $mod = $ev->{mod}; |
348 | my $mod = $ev->{mod}; |
350 | my $sym = $ev->{sym}; |
349 | my $sym = $ev->{sym}; |
351 | |
350 | |
|
|
351 | delete $self->{last_mod}; |
|
|
352 | delete $self->{last_sym}; |
|
|
353 | |
352 | if ($::CFG->{shift_fire_stop}) { |
354 | if ($::CFG->{shift_fire_stop}) { |
353 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
355 | if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { |
354 | $::CONN->user_send ("fire_stop"); |
356 | $::CONN->user_send ("fire_stop"); |
355 | delete $self->{fire_dir}; |
357 | delete $self->{fire_dir}; |
356 | $res = 1; |
358 | $res = 1; |
357 | } |
359 | } |
358 | } else { |
360 | } else { |
359 | if (exists $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { |
361 | if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { |
360 | $::CONN->user_send ("fire_stop"); |
362 | $::CONN->user_send ("fire_stop"); |
361 | delete $self->{fire_dir}; |
363 | delete $self->{fire_dir}; |
362 | $res = 1; |
364 | $res = 1; |
363 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) |
365 | } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) |
364 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
366 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
365 | $::CONN->user_send ("fire_stop"); |
367 | $::CONN->user_send ("fire_stop"); |
366 | delete $self->{fire_dir}; |
368 | delete $self->{fire_dir}; |
367 | $res = 1; |
369 | $res = 1; |
368 | } |
370 | } |
369 | } |
371 | } |
370 | |
372 | |
371 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
373 | if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { |
372 | $::CONN->user_send ("run_stop"); |
374 | $::CONN->user_send ("run_stop"); |
373 | $res = 1; |
375 | $res = 1; |
374 | } |
376 | } |
375 | |
377 | |
376 | $res |
378 | $res |
… | |
… | |
382 | $self->refresh_hook; |
384 | $self->refresh_hook; |
383 | |
385 | |
384 | 0 |
386 | 0 |
385 | } |
387 | } |
386 | |
388 | |
|
|
389 | sub set_tilesize { |
|
|
390 | my ($self, $tilesize) = @_; |
|
|
391 | |
|
|
392 | $self->{tilesize} = $tilesize; |
|
|
393 | } |
|
|
394 | |
|
|
395 | sub scroll { |
|
|
396 | my ($self, $dx, $dy) = @_; |
|
|
397 | |
|
|
398 | $::MAP->scroll ($dx, $dy); |
|
|
399 | |
|
|
400 | $self->movement_update; |
|
|
401 | |
|
|
402 | $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement |
|
|
403 | $self->{sdy} += $dy * $self->{tilesize}; |
|
|
404 | } |
|
|
405 | |
387 | sub set_magicmap { |
406 | sub set_magicmap { |
388 | my ($self, $w, $h, $x, $y, $data) = @_; |
407 | my ($self, $w, $h, $x, $y, $data) = @_; |
389 | |
408 | |
390 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
409 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
391 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
410 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
… | |
… | |
393 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
412 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
394 | |
413 | |
395 | $self->update; |
414 | $self->update; |
396 | } |
415 | } |
397 | |
416 | |
|
|
417 | sub movement_update { |
|
|
418 | my ($self) = @_; |
|
|
419 | |
|
|
420 | if ($::CFG->{smooth_movement}) { |
|
|
421 | if ($self->{sdx} || $self->{sdy}) { |
|
|
422 | my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); |
|
|
423 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
|
|
424 | |
|
|
425 | # the minimum time for a single tile movement |
|
|
426 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK); |
|
|
427 | |
|
|
428 | # jump if "impossibly high" speed |
|
|
429 | if ( |
|
|
430 | (max abs $self->{sdx}, abs $self->{sdy}) |
|
|
431 | > $spd * $self->{tilesize} * $mintime * 1.1 |
|
|
432 | ) { |
|
|
433 | #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# |
|
|
434 | $self->{sdx} = $self->{sdy} = 0; |
|
|
435 | } else { |
|
|
436 | $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction |
|
|
437 | |
|
|
438 | my $dx = $self->{sdx} < 0 ? -$spd : $spd; |
|
|
439 | my $dy = $self->{sdy} < 0 ? -$spd : $spd; |
|
|
440 | |
|
|
441 | if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } |
|
|
442 | if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } |
|
|
443 | |
|
|
444 | $self->update; |
|
|
445 | } |
|
|
446 | } |
|
|
447 | } else { |
|
|
448 | $self->{sdx} = $self->{sdy} = 0; |
|
|
449 | } |
|
|
450 | |
|
|
451 | $self->{last_update} = EV::time; |
|
|
452 | } |
|
|
453 | |
398 | sub refresh_hook { |
454 | sub refresh_hook { |
399 | my ($self) = @_; |
455 | my ($self) = @_; |
400 | |
456 | |
401 | if ($::MAP && $::CONN) { |
457 | if ($::MAP && $::CONN) { |
402 | if (delete $self->{need_update}) { |
458 | if (delete $self->{need_update}) { |
|
|
459 | $self->movement_update; |
|
|
460 | |
403 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
461 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
404 | |
462 | |
|
|
463 | my $sdx_t = DC::ceil $self->{sdx} / $tilesize; |
|
|
464 | my $sdy_t = DC::ceil $self->{sdy} / $tilesize; |
|
|
465 | |
|
|
466 | # width/height of map, in tiles |
405 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
467 | my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize; |
406 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
468 | my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize; |
407 | |
469 | |
|
|
470 | # the map displacement, in tiles |
408 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
471 | my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t; |
409 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
472 | my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t; |
410 | |
473 | |
|
|
474 | # the upper left "visible" corner, in pixels |
411 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
475 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
412 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
476 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
413 | |
477 | |
414 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
478 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
415 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
479 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
416 | |
480 | |
417 | if ($::CFG->{fow_enable}) { |
481 | if ($::CFG->{fow_enable}) { |
|
|
482 | $sdx_t = $sdy_t = 0;#d# |
418 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
483 | my ($w, $h, $data) = $::MAP->fow_texture ( |
|
|
484 | $dx + (min 0, $sdx_t), |
|
|
485 | $dy + (min 0, $sdy_t), |
|
|
486 | $sw + abs $sdx_t, |
|
|
487 | $sh + abs $sdy_t |
|
|
488 | ); |
419 | |
489 | |
420 | $self->{fow_texture} = new CFPlus::Texture |
490 | $self->{fow_texture} = new DC::Texture |
421 | w => $w, |
491 | w => $w, |
422 | h => $h, |
492 | h => $h, |
423 | data => $data, |
493 | data => $data, |
424 | internalformat => GL_ALPHA, |
494 | internalformat => GL_ALPHA, |
425 | format => GL_ALPHA; |
495 | format => GL_ALPHA; |
… | |
… | |
430 | glNewList ($self->{list} ||= glGenList); |
500 | glNewList ($self->{list} ||= glGenList); |
431 | |
501 | |
432 | glPushMatrix; |
502 | glPushMatrix; |
433 | glTranslate $sx0, $sy0; |
503 | glTranslate $sx0, $sy0; |
434 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
504 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
505 | glTranslate $self->{sdx}, $self->{sdy}; |
435 | |
506 | |
436 | $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); |
507 | $::MAP->draw ($dx, $dy, $sw, $sh, |
|
|
508 | $self->{tilesize}, |
|
|
509 | $::CONN->{player}{tag}, |
|
|
510 | -$self->{sdx}, -$self->{sdy}); |
437 | |
511 | |
|
|
512 | #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player |
438 | glScale $self->{tilesize}, $self->{tilesize}; |
513 | glScale $self->{tilesize}, $self->{tilesize}; |
439 | |
514 | |
440 | if (my $tex = $self->{fow_texture}) { |
515 | if (my $tex = $self->{fow_texture}) { |
441 | glPushMatrix; |
516 | glPushMatrix; |
|
|
517 | glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); |
442 | glScale 1/3, 1/3; |
518 | glScale 1/3, 1/3; |
443 | glEnable GL_TEXTURE_2D; |
519 | glEnable GL_TEXTURE_2D; |
444 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
520 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
445 | |
521 | |
446 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
522 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
… | |
… | |
475 | |
551 | |
476 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
552 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
477 | |
553 | |
478 | return unless $self->{list}; |
554 | return unless $self->{list}; |
479 | |
555 | |
480 | my $focused = $CFPlus::UI::FOCUS == $self |
556 | my $focused = $DC::UI::FOCUS == $self |
481 | || $CFPlus::UI::FOCUS == $::COMPLETER->{entry}; |
557 | || $DC::UI::FOCUS == $::COMPLETER->{entry}; |
482 | |
558 | |
483 | return |
559 | return |
484 | unless $focused || !$::FAST; |
560 | unless $focused || !$::FAST; |
485 | |
561 | |
486 | glCallList $self->{list}; |
562 | glCallList $self->{list}; |
… | |
… | |
506 | glDeleteList $self->{list}; |
582 | glDeleteList $self->{list}; |
507 | |
583 | |
508 | $self->SUPER::DESTROY; |
584 | $self->SUPER::DESTROY; |
509 | } |
585 | } |
510 | |
586 | |
511 | package CFPlus::MapWidget::MapMap; |
587 | package DC::MapWidget::MapMap; |
512 | |
588 | |
513 | use strict; |
589 | use strict; |
514 | use utf8; |
590 | use utf8; |
515 | |
591 | |
516 | our @ISA = CFPlus::UI::Base::; |
592 | our @ISA = DC::UI::Base::; |
517 | |
593 | |
518 | use Time::HiRes qw(time); |
594 | use Time::HiRes qw(time); |
519 | use CFPlus::OpenGL; |
595 | use DC::OpenGL; |
520 | |
596 | |
521 | sub size_request { |
597 | sub size_request { |
522 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
598 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
523 | } |
599 | } |
524 | |
600 | |
… | |
… | |
549 | $self->{y0} = $y0; |
625 | $self->{y0} = $y0; |
550 | |
626 | |
551 | $self->{texture_atime} = time + 1/3; |
627 | $self->{texture_atime} = time + 1/3; |
552 | |
628 | |
553 | $self->{texture} = |
629 | $self->{texture} = |
554 | new CFPlus::Texture |
630 | new DC::Texture |
555 | w => $w, |
631 | w => $w, |
556 | h => $h, |
632 | h => $h, |
557 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
633 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
558 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
634 | type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
559 | } |
635 | } |
560 | } |
636 | } |
561 | |
637 | |
562 | sub invoke_visibility_change { |
638 | sub invoke_visibility_change { |
563 | my ($self) = @_; |
639 | my ($self) = @_; |
… | |
… | |
609 | glEnd; |
685 | glEnd; |
610 | |
686 | |
611 | glDisable GL_BLEND; |
687 | glDisable GL_BLEND; |
612 | } |
688 | } |
613 | |
689 | |
614 | package CFPlus::MapWidget::Command; |
690 | package DC::MapWidget::Command; |
615 | |
691 | |
616 | use strict; |
692 | use strict; |
617 | |
693 | |
618 | use CFPlus::OpenGL; |
694 | use DC::OpenGL; |
619 | |
695 | |
620 | our @ISA = CFPlus::UI::Frame::; |
696 | our @ISA = DC::UI::Frame::; |
621 | |
697 | |
622 | sub new { |
698 | sub new { |
623 | my $class = shift; |
699 | my $class = shift; |
624 | |
700 | |
625 | my $self = $class->SUPER::new ( |
701 | my $self = $class->SUPER::new ( |
626 | bg => [0, 0, 0, 0.8], |
702 | bg => [0, 0, 0, 0.8], |
627 | @_, |
703 | @_, |
628 | ); |
704 | ); |
629 | |
705 | |
630 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
706 | $self->add ($self->{vbox} = new DC::UI::VBox); |
631 | |
707 | |
632 | $self->{label} = [ |
708 | $self->{label} = [ |
633 | map |
709 | map |
634 | CFPlus::UI::Label->new ( |
710 | DC::UI::Label->new ( |
|
|
711 | align => 0, |
635 | can_hover => 1, |
712 | can_hover => 1, |
636 | can_events => 1, |
713 | can_events => 1, |
637 | tooltip_width => 0.33, |
714 | tooltip_width => 0.33, |
638 | fontsize => $_, |
715 | fontsize => $_, |
639 | ), (0.8) x 16 |
716 | ), (0.8) x 16 |
640 | ]; |
717 | ]; |
641 | |
718 | |
642 | $self->{entry} = new CFPlus::UI::Entry |
719 | $self->{entry} = new DC::UI::Entry |
643 | on_changed => sub { |
720 | on_changed => sub { |
644 | $self->update_labels; |
721 | $self->update_labels; |
645 | 0 |
722 | 0 |
646 | }, |
723 | }, |
647 | on_button_down => sub { |
724 | on_button_down => sub { |
648 | my ($entry, $ev, $x, $y) = @_; |
725 | my ($entry, $ev, $x, $y) = @_; |
649 | |
726 | |
650 | if ($ev->{button} == 3) { |
727 | if ($ev->{button} == 3) { |
651 | (new CFPlus::UI::Menu |
728 | (new DC::UI::Menu |
652 | items => [ |
729 | items => [ |
653 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
730 | ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key" |
654 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
731 | => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
655 | ], |
732 | ], |
656 | )->popup ($ev); |
733 | )->popup ($ev); |
657 | return 1; |
734 | return 1; |
658 | } |
735 | } |
659 | 0 |
736 | 0 |
… | |
… | |
674 | $self->hide; |
751 | $self->hide; |
675 | } |
752 | } |
676 | } elsif ($ev->{sym} == 27) { |
753 | } elsif ($ev->{sym} == 27) { |
677 | $self->{hist_ptr} = 0; |
754 | $self->{hist_ptr} = 0; |
678 | $self->hide; |
755 | $self->hide; |
679 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
756 | } elsif ($ev->{sym} == DC::SDLK_DOWN) { |
680 | if ($self->{hist_ptr} > 1) { |
757 | if ($self->{hist_ptr} > 1) { |
681 | $self->{hist_ptr}--; |
758 | $self->{hist_ptr}--; |
682 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
759 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
683 | } elsif ($self->{hist_ptr} > 0) { |
760 | } elsif ($self->{hist_ptr} > 0) { |
684 | $self->{hist_ptr}--; |
761 | $self->{hist_ptr}--; |
… | |
… | |
686 | } else { |
763 | } else { |
687 | ++$self->{select_offset} |
764 | ++$self->{select_offset} |
688 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
765 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
689 | } |
766 | } |
690 | $self->update_labels; |
767 | $self->update_labels; |
691 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
768 | } elsif ($ev->{sym} == DC::SDLK_UP) { |
692 | if ($self->{select_offset}) { |
769 | if ($self->{select_offset}) { |
693 | --$self->{select_offset} |
770 | --$self->{select_offset} |
694 | } else { |
771 | } else { |
695 | unless ($self->{hist_ptr}) { |
772 | unless ($self->{hist_ptr}) { |
696 | $self->{hist_saveback} = $self->{entry}->get_text; |
773 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
854 | |
931 | |
855 | sub _draw { |
932 | sub _draw { |
856 | my ($self) = @_; |
933 | my ($self) = @_; |
857 | |
934 | |
858 | # hack |
935 | # hack |
859 | local $CFPlus::UI::FOCUS = $self->{entry}; |
936 | local $DC::UI::FOCUS = $self->{entry}; |
860 | |
937 | |
861 | $self->SUPER::_draw; |
938 | $self->SUPER::_draw; |
862 | } |
939 | } |
863 | |
940 | |
864 | 1 |
941 | 1 |