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.117 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.148 by root, Sun Jan 11 22:11:23 2009 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;
… …
174sub invoke_button_down { 163sub invoke_button_down {
175 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
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 && $self->{ctilesize};
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 [
218 $::PICKUP_ENABLE->{state}
219 ? "Disable automatic pickup"
220 : "Enable automatic pickup",
221 sub { $::PICKUP_ENABLE->toggle }
222 ],
223 ); 206 );
224 207
225 if ($::CONN && $::CONN->{editor_support}) { 208 if ($::CONN && $::CONN->{editor_support}) {
226 push @items, [ 209# push @items, [
227 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 210# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
228 \&editor_invoke, 211# \&editor_invoke,
229 ]; 212# ];
230 213
231 for my $type (qw(test name)) { 214 for my $type (qw(test name)) {
232 $::CONN->{editor_support}{type} ne $type 215 $::CONN->{editor_support}{type} ne $type
233 or next; 216 or next;
234 my $server = $::CONN->{editor_support}{"${type}server"} 217 my $server = $::CONN->{editor_support}{"${type}server"}
235 or next; 218 or next;
236 219
237 push @items, [ 220 push @items, [
238 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", 221 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
239 sub { server_login $server }, 222 sub { server_login $server },
240 ]; 223 ];
241 } 224 }
242 } 225 }
243 226
… …
251 } 234 }
252 } 235 }
253 ], 236 ],
254 ; 237 ;
255 238
256 (new CFPlus::UI::Menu 239 (new DC::UI::Menu
257 items => \@items, 240 items => \@items,
258 )->popup ($ev); 241 )->popup ($ev);
259 } 242 }
260 243
261 1 244 1
… …
283 266
284sub size_request { 267sub size_request {
285 my ($self) = @_; 268 my ($self) = @_;
286 269
287 ( 270 (
288 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, 271 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
289 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, 272 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
290 ) 273 )
291} 274}
292 275
293sub update { 276sub update {
294 my ($self) = @_; 277 my ($self) = @_;
… …
296 $self->{need_update} = 1; 279 $self->{need_update} = 1;
297 $self->SUPER::update; 280 $self->SUPER::update;
298} 281}
299 282
300my %DIR = ( 283my %DIR = (
301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], 284 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"], 285 ( "," . DC::SDLK_KP8 ), [1, "north"],
303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], 286 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"], 287 ( "," . DC::SDLK_KP6 ), [3, "east"],
305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], 288 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"], 289 ( "," . DC::SDLK_KP2 ), [5, "south"],
307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], 290 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"], 291 ( "," . DC::SDLK_KP4 ), [7, "west"],
309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], 292 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
310 293
294 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
295 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
296 ( "," . DC::SDLK_END ), [6, "southwest"],
297 ( "," . DC::SDLK_HOME ), [8, "northwest"],
298
311 ( "," . CFPlus::SDLK_UP ), [1, "north"], 299 ( "," . DC::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"], 300 ("1," . DC::SDLK_UP ), [2, "northeast"],
313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"], 301 ( "," . DC::SDLK_RIGHT ), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], 302 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"], 303 ( "," . DC::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], 304 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"], 305 ( "," . DC::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], 306 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
319); 307);
320 308
321sub invoke_key_down { 309sub invoke_key_down {
322 my ($self, $ev) = @_; 310 my ($self, $ev) = @_;
323 311
324 my $mod = $ev->{mod}; 312 my $mod = $ev->{mod};
325 my $sym = $ev->{sym}; 313 my $sym = $ev->{sym};
326 my $uni = $ev->{unicode}; 314 my $uni = $ev->{unicode};
327 315
328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 316 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
329 317
330 if ($sym == 9) { 318 # ignore repeated keypresses
331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility; 319 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 320 $self->{last_mod} = $mod;
333 $::HELP_WINDOW->toggle_visibility; 321 $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 (!$::CONN) {
345 return 0; # bindings further down need a valid connection
346 322
347 } elsif ($uni == ord ",") { 323 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
348 $::CONN->user_send ("take"); 324
349 } elsif ($uni == ord " ") { 325 if ($::CONN && $dir) {
350 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine");
353 } elsif ($uni == ord ".") {
354 $::CONN->user_send ($self->{completer}{last_command})
355 if exists $self->{completer}{last_command};
356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
357 $::CONN->macro_send ($_) for @macros;
358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
359 $::CONN->user_send ("rotateshoottype +");
360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
361 $::CONN->user_send ("rotateshoottype -");
362 } elsif ($uni == ord '!') {
363 $self->{completer}->set_prefix ("shout ");
364 $self->{completer}->show;
365 } elsif ($uni == ord '"') {
366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
367 $self->{completer}->show;
368 } elsif ($uni == ord "'") {
369 $self->{completer}->set_prefix ("");
370 $self->{completer}->show;
371 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
372 if ($mod & CFPlus::KMOD_SHIFT) { 326 if ($mod & DC::KMOD_SHIFT) {
373 $self->{shft}++; 327 $self->{shft}++;
374 if ($dir->[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
375 $::CONN->user_send ("fire $dir->[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
376 } 330 }
377 $self->{fire_dir} = $DIR{$sym}[0]; 331 $self->{fire_dir} = $dir->[0];
378 } elsif ($mod & CFPlus::KMOD_CTRL) { 332 } elsif ($mod & DC::KMOD_CTRL) {
379 $self->{ctrl}++; 333 $self->{ctrl}++;
380 $::CONN->user_send ("run $dir->[0]"); 334 $::CONN->user_send ("run $dir->[0]");
381 } else { 335 } else {
382 $::CONN->user_send ("$dir->[1]"); 336 $::CONN->user_send ("$dir->[1]");
383 } 337 }
384 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 338
385 $self->{completer}->inject_key_down ($ev);
386 $self->{completer}->show;
387 } else {
388 return 0; 339 return 1;
389 }
390
391 1 340 }
341
342 0
392} 343}
393 344
394sub invoke_key_up { 345sub invoke_key_up {
395 my ($self, $ev) = @_; 346 my ($self, $ev) = @_;
396 347
397 my $res = 0; 348 my $res = 0;
398 my $mod = $ev->{mod}; 349 my $mod = $ev->{mod};
399 my $sym = $ev->{sym}; 350 my $sym = $ev->{sym};
400 351
352 delete $self->{last_mod};
353 delete $self->{last_sym};
354
401 if ($::CFG->{shift_fire_stop}) { 355 if ($::CFG->{shift_fire_stop}) {
402 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 356 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
403 $::CONN->user_send ("fire_stop"); 357 $::CONN->user_send ("fire_stop");
404 delete $self->{fire_dir}; 358 delete $self->{fire_dir};
405 $res = 1; 359 $res = 1;
406 } 360 }
407 } else { 361 } else {
362 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
363
408 if (exists $DIR{$sym} && delete $self->{shft}) { 364 if ($dir && delete $self->{shft}) {
409 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
410 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
411 $res = 1; 367 $res = 1;
412 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 368 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
369 && delete $self->{shft}) { # XXX: is RSHIFT ok?
413 $::CONN->user_send ("fire_stop"); 370 $::CONN->user_send ("fire_stop");
414 delete $self->{fire_dir}; 371 delete $self->{fire_dir};
415 $res = 1; 372 $res = 1;
416 } 373 }
417 } 374 }
418 375
419 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 376 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
420 $::CONN->user_send ("run_stop"); 377 $::CONN->user_send ("run_stop");
421 $res = 1; 378 $res = 1;
422 } 379 }
423 380
424 $res 381 $res
… …
430 $self->refresh_hook; 387 $self->refresh_hook;
431 388
432 0 389 0
433} 390}
434 391
392sub set_tilesize {
393 my ($self, $tilesize) = @_;
394
395 $self->{tilesize} = $tilesize;
396}
397
398sub scroll {
399 my ($self, $dx, $dy) = @_;
400
401 $::MAP->scroll ($dx, $dy);
402
403 $self->movement_update;
404
405 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
406 $self->{sdy} += $dy * $self->{tilesize};
407}
408
435sub set_magicmap { 409sub set_magicmap {
436 my ($self, $w, $h, $x, $y, $data) = @_; 410 my ($self, $w, $h, $x, $y, $data) = @_;
437 411
438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 412 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 413 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
441 $self->{magicmap} = [$x, $y, $w, $h, $data]; 415 $self->{magicmap} = [$x, $y, $w, $h, $data];
442 416
443 $self->update; 417 $self->update;
444} 418}
445 419
420sub movement_update {
421 my ($self) = @_;
422
423 if ($::CFG->{smooth_movement}) {
424 if ($self->{sdx} || $self->{sdy}) {
425 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
426 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
427
428 # the minimum time for a single tile movement
429 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
430
431 $spd *= $self->{tilesize};
432
433 # jump if "impossibly high" speed
434 if (
435 (max abs $self->{sdx}, abs $self->{sdy})
436 > $spd * $mintime * 2.1
437 ) {
438 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
439 $self->{sdx} = $self->{sdy} = 0;
440 } else {
441 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
442
443 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
444 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
445
446 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
447 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
448 }
449
450 $self->update;
451 }
452 } else {
453 $self->{sdx} = $self->{sdy} = 0;
454 }
455
456 $self->{last_update} = EV::time;
457}
458
446sub refresh_hook { 459sub refresh_hook {
447 my ($self) = @_; 460 my ($self) = @_;
448 461
449 if ($::MAP && $::CONN) { 462 if ($::MAP && $::CONN) {
450 if (delete $self->{need_update}) { 463 if (delete $self->{need_update}) {
464 $self->movement_update;
465
451 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 466 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
452 467
468 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
469 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
470
471 # width/height of map, in tiles
453 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 472 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
454 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 473 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
455 474
475 # the map displacement, in tiles
456 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 476 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
457 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 477 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
458 478
479 # the upper left "visible" corner, in pixels
459 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 480 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
460 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 481 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
461 482
462 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; 483 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
463 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; 484 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
464 485
465 if ($::CFG->{fow_enable}) { 486 if ($::CFG->{fow_enable}) {
487 $sdx_t = $sdy_t = 0;#d#
466 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 488 my ($w, $h, $data) = $::MAP->fow_texture (
489 $dx + (min 0, $sdx_t),
490 $dy + (min 0, $sdy_t),
491 $sw + abs $sdx_t,
492 $sh + abs $sdy_t
493 );
467 494
468 $self->{fow_texture} = new CFPlus::Texture 495 $self->{fow_texture} = new DC::Texture
469 w => $w, 496 w => $w,
470 h => $h, 497 h => $h,
471 data => $data, 498 data => $data,
472 internalformat => GL_ALPHA, 499 internalformat => GL_ALPHA,
473 format => GL_ALPHA; 500 format => GL_ALPHA;
… …
478 glNewList ($self->{list} ||= glGenList); 505 glNewList ($self->{list} ||= glGenList);
479 506
480 glPushMatrix; 507 glPushMatrix;
481 glTranslate $sx0, $sy0; 508 glTranslate $sx0, $sy0;
482 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 509 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
510 glTranslate $self->{sdx}, $self->{sdy};
483 511
484 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 512 $::MAP->draw ($dx, $dy, $sw, $sh,
513 $self->{tilesize},
514 $::CONN->{player}{tag},
515 -$self->{sdx}, -$self->{sdy});
485 516
517 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
486 glScale $self->{tilesize}, $self->{tilesize}; 518 glScale $self->{tilesize}, $self->{tilesize};
487 519
488 if (my $tex = $self->{fow_texture}) { 520 if (my $tex = $self->{fow_texture}) {
489 glPushMatrix; 521 glPushMatrix;
522 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
490 glScale 1/3, 1/3; 523 glScale 1/3, 1/3;
491 glEnable GL_TEXTURE_2D; 524 glEnable GL_TEXTURE_2D;
492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
493 526
494 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 527 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
… …
523 556
524 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); 557 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
525 558
526 return unless $self->{list}; 559 return unless $self->{list};
527 560
528 my $focused = $CFPlus::UI::FOCUS == $self 561 my $focused = $DC::UI::FOCUS == $self
529 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 562 || $DC::UI::FOCUS == $::COMPLETER->{entry};
530 563
531 return 564 return
532 unless $focused || !$::FAST; 565 unless $focused || !$::FAST;
533 566
534 glCallList $self->{list}; 567 glCallList $self->{list};
535 568
536 # TNT2 emulates logops in software (or worse :) 569 # TNT2 emulates logops in software (or worse :)
537 unless ($focused) { 570 unless ($focused) {
538 glColor 0.4, 0.2, 0.2, 0.6; 571 glColor_premultiply 0, 0, 1, 0.25;
539 glEnable GL_BLEND; 572 glEnable GL_BLEND;
540 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 573 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
541 glBegin GL_QUADS; 574 glBegin GL_QUADS;
542 glVertex 0, 0; 575 glVertex 0, 0;
543 glVertex 0, $::HEIGHT; 576 glVertex 0, $::HEIGHT;
544 glVertex $::WIDTH, $::HEIGHT; 577 glVertex $::WIDTH, $::HEIGHT;
545 glVertex $::WIDTH, 0; 578 glVertex $::WIDTH, 0;
… …
554 glDeleteList $self->{list}; 587 glDeleteList $self->{list};
555 588
556 $self->SUPER::DESTROY; 589 $self->SUPER::DESTROY;
557} 590}
558 591
559package CFPlus::MapWidget::MapMap; 592package DC::MapWidget::MapMap;
560 593
561use strict; 594use strict;
562use utf8; 595use utf8;
563 596
564our @ISA = CFPlus::UI::Base::; 597our @ISA = DC::UI::Base::;
565 598
566use Time::HiRes qw(time); 599use Time::HiRes qw(time);
567use CFPlus::OpenGL; 600use DC::OpenGL;
568 601
569sub size_request { 602sub size_request {
570 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 603 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
571} 604}
572 605
… …
574 my ($self) = @_; 607 my ($self) = @_;
575 608
576 if ($::MAP && $self->{texture_atime} < time) { 609 if ($::MAP && $self->{texture_atime} < time) {
577 my ($w, $h) = @$self{qw(w h)}; 610 my ($w, $h) = @$self{qw(w h)};
578 611
612 return unless $w && $h;
613
579 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 614 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
580 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 615 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
581 616
582 my $ox = 0.5 * ($w - $sw); 617 my $ox = 0.5 * ($w - $sw);
583 my $oy = 0.5 * ($h - $sh); 618 my $oy = 0.5 * ($h - $sh);
… …
597 $self->{y0} = $y0; 632 $self->{y0} = $y0;
598 633
599 $self->{texture_atime} = time + 1/3; 634 $self->{texture_atime} = time + 1/3;
600 635
601 $self->{texture} = 636 $self->{texture} =
602 new CFPlus::Texture 637 new DC::Texture
603 w => $w, 638 w => $w,
604 h => $h, 639 h => $h,
605 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 640 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
606 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 641 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
607 } 642 }
608} 643}
609 644
610sub invoke_visibility_change { 645sub invoke_visibility_change {
611 my ($self) = @_; 646 my ($self) = @_;
… …
657 glEnd; 692 glEnd;
658 693
659 glDisable GL_BLEND; 694 glDisable GL_BLEND;
660} 695}
661 696
662package CFPlus::MapWidget::Command; 697package DC::MapWidget::Command;
663 698
664use strict; 699use strict;
665 700
666use CFPlus::OpenGL; 701use DC::OpenGL;
667 702
668our @ISA = CFPlus::UI::Frame::; 703our @ISA = DC::UI::Frame::;
669 704
670sub new { 705sub new {
671 my $class = shift; 706 my $class = shift;
672 707
673 my $self = $class->SUPER::new ( 708 my $self = $class->SUPER::new (
674 bg => [0, 0, 0, 0.8], 709 bg => [0, 0, 0, 0.8],
675 @_, 710 @_,
676 ); 711 );
677 712
678 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 713 $self->add ($self->{vbox} = new DC::UI::VBox);
679 714
680 $self->{label} = [ 715 $self->{label} = [
681 map 716 map
682 CFPlus::UI::Label->new ( 717 DC::UI::Label->new (
718 align => 0,
683 can_hover => 1, 719 can_hover => 1,
684 can_events => 1, 720 can_events => 1,
685 tooltip_width => 0.33, 721 tooltip_width => 0.33,
686 fontsize => $_, 722 fontsize => $_,
687 ), (0.8) x 16 723 ), (0.8) x 16
688 ]; 724 ];
689 725
690 $self->{entry} = new CFPlus::UI::Entry 726 $self->{entry} = new DC::UI::Entry
691 on_changed => sub { 727 on_changed => sub {
692 $self->update_labels; 728 $self->update_labels;
693 0 729 0
694 }, 730 },
695 on_button_down => sub { 731 on_button_down => sub {
696 my ($entry, $ev, $x, $y) = @_; 732 my ($entry, $ev, $x, $y) = @_;
697 733
698 if ($ev->{button} == 3) { 734 if ($ev->{button} == 3) {
699 (new CFPlus::UI::Menu 735 (new DC::UI::Menu
700 items => [ 736 items => [
701 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 737 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
702 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] 738 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
703 ], 739 ],
704 )->popup ($ev); 740 )->popup ($ev);
705 return 1; 741 return 1;
706 } 742 }
707 0 743 0
… …
722 $self->hide; 758 $self->hide;
723 } 759 }
724 } elsif ($ev->{sym} == 27) { 760 } elsif ($ev->{sym} == 27) {
725 $self->{hist_ptr} = 0; 761 $self->{hist_ptr} = 0;
726 $self->hide; 762 $self->hide;
727 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 763 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
728 if ($self->{hist_ptr} > 1) { 764 if ($self->{hist_ptr} > 1) {
729 $self->{hist_ptr}--; 765 $self->{hist_ptr}--;
730 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 766 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
731 } elsif ($self->{hist_ptr} > 0) { 767 } elsif ($self->{hist_ptr} > 0) {
732 $self->{hist_ptr}--; 768 $self->{hist_ptr}--;
… …
734 } else { 770 } else {
735 ++$self->{select_offset} 771 ++$self->{select_offset}
736 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 772 if $self->{select_offset} < $#{ $self->{last_match} || [] };
737 } 773 }
738 $self->update_labels; 774 $self->update_labels;
739 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 775 } elsif ($ev->{sym} == DC::SDLK_UP) {
740 if ($self->{select_offset}) { 776 if ($self->{select_offset}) {
741 --$self->{select_offset} 777 --$self->{select_offset}
742 } else { 778 } else {
743 unless ($self->{hist_ptr}) { 779 unless ($self->{hist_ptr}) {
744 $self->{hist_saveback} = $self->{entry}->get_text; 780 $self->{hist_saveback} = $self->{entry}->get_text;
… …
902 938
903sub _draw { 939sub _draw {
904 my ($self) = @_; 940 my ($self) = @_;
905 941
906 # hack 942 # hack
907 local $CFPlus::UI::FOCUS = $self->{entry}; 943 local $DC::UI::FOCUS = $self->{entry};
908 944
909 $self->SUPER::_draw; 945 $self->SUPER::_draw;
910} 946}
911 947
9121 9481

Diff Legend

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