ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.118 by elmex, Tue Aug 14 13:25:25 2007 UTC vs.
Revision 1.146 by root, Fri Dec 19 22:16:18 2008 UTC

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

Diff Legend

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