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

Diff Legend

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