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

Diff Legend

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