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.122 by root, Wed Dec 5 10:49:17 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
… …
27 ); 27 );
28 28
29 $self 29 $self
30} 30}
31 31
32sub set_tilesize {
33 my ($self, $tilesize) = @_;
34
35 $self->{tilesize} = $tilesize;
36}
37
38sub add_command { 32sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 33 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 34
41 (my $data = $command) =~ s/\\//g; 35 (my $data = $command) =~ s/\\//g;
42 36
… …
66 60
67sub editor_invoke { 61sub editor_invoke {
68 my $editsup = $::CONN && $::CONN->{editor_support} 62 my $editsup = $::CONN && $::CONN->{editor_support}
69 or return; 63 or return;
70 64
71 CFPlus::background { 65 DC::background {
72 print "preparing editor startup...\n"; 66 print "preparing editor startup...\n";
73 67
74 my $server = $editsup->{gameserver} || "default"; 68 my $server = $editsup->{gameserver} || "default";
75 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 69 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
76 70
77 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 71 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
78 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 72 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
79 73
80 print "map directory is $mapdir\n"; 74 print "map directory is $mapdir\n";
81 print "lib directory is $libdir\n"; 75 print "lib directory is $libdir\n";
82 76
83 my $ua = CFPlus::lwp_useragent; 77 my $ua = DC::lwp_useragent;
84 78
85 for my $file (qw(archetypes crossfire.0)) { 79 for my $file (qw(archetypes crossfire.0)) {
86 my $url = "$editsup->{lib_root}$file"; 80 my $url = "$editsup->{lib_root}$file";
87 print "mirroring $url...\n"; 81 print "mirroring $url...\n";
88 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); 82 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
89 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 83 printf "%s size %d octets\n", $file, -s "$libdir/$file";
90 } 84 }
91 85
92 if (1) { # upload a map 86 if (1) { # upload a map
93 my $mapname = $::CONN->{map_info}[0]; 87 my $mapname = $::CONN->{map_info}[0];
… …
98 92
99 print "getting map revision for $mapname...\n"; 93 print "getting map revision for $mapname...\n";
100 94
101 # try to get the most recent head revision, what a hack, 95 # try to get the most recent head revision, what a hack,
102 # this should have been returned while downloading *sigh* 96 # this should have been returned while downloading *sigh*
103 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 97 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
104 98
105 if ($log =~ /\?rev=(\d+\.\d+)"/) { 99 if ($log =~ /\?rev=(\d+\.\d+)"/) {
106 my $rev = $1; 100 my $rev = $1;
107 101
108 print "downloading revision $rev...\n"; 102 print "downloading revision $rev...\n";
109 103
110 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 104 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
111 105
112 my $meta = { 106 my $meta = {
113 %$editsup, 107 %$editsup,
114 path => $mapname, 108 path => $mapname,
115 revision => $rev, 109 revision => $rev,
… …
120 require File::Path; 114 require File::Path;
121 115
122 File::Path::mkpath (File::Basename::dirname ($mappath)); 116 File::Path::mkpath (File::Basename::dirname ($mappath));
123 open my $fh, ">:raw:perlio", "$mappath.meta" 117 open my $fh, ">:raw:perlio", "$mappath.meta"
124 or die "$mappath.meta: $!\n"; 118 or die "$mappath.meta: $!\n";
125 print $fh CFPlus::encode_json $meta; 119 print $fh DC::encode_json $meta;
126 close $fh; 120 close $fh;
127 open my $fh, ">:raw:perlio:utf8", $mappath 121 open my $fh, ">:raw:perlio:utf8", $mappath
128 or die "$mappath: $!\n"; 122 or die "$mappath: $!\n";
129 print $fh $map; 123 print $fh $map;
130 close $fh; 124 close $fh;
… …
171 165
172 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
173 $self->grab_focus; 167 $self->grab_focus;
174 return unless $::CONN; 168 return unless $::CONN;
175 169
176 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
177 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
178 172
179 $x -= CFPlus::floor $::MAP->w * 0.5; 173 $x -= DC::floor $::MAP->w * 0.5;
180 $y -= CFPlus::floor $::MAP->h * 0.5; 174 $y -= DC::floor $::MAP->h * 0.5;
181 175
182 if ($::CONN) { 176 if ($::CONN) {
183 $::CONN->lookat ($x, $y) 177 $::CONN->lookat ($x, $y)
184 } 178 }
185 179
… …
206 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
212 [ 206 [
213 $::PICKUP_ENABLE->{state} 207 $::PICKUP_ENABLE->{state}
214 ? "Disable automatic pickup" 208 ? "Disable automatic pickup"
215 : "Enable automatic pickup", 209 : "Enable automatic pickup",
216 sub { $::PICKUP_ENABLE->toggle } 210 sub { $::PICKUP_ENABLE->toggle }
217 ], 211 ],
218 ); 212 );
219 213
220 if ($::CONN && $::CONN->{editor_support}) { 214 if ($::CONN && $::CONN->{editor_support}) {
221 push @items, [ 215# push @items, [
222 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
223 \&editor_invoke, 217# \&editor_invoke,
224 ]; 218# ];
225 219
226 for my $type (qw(test name)) { 220 for my $type (qw(test name)) {
227 $::CONN->{editor_support}{type} ne $type 221 $::CONN->{editor_support}{type} ne $type
228 or next; 222 or next;
229 my $server = $::CONN->{editor_support}{"${type}server"} 223 my $server = $::CONN->{editor_support}{"${type}server"}
230 or next; 224 or next;
231 225
232 push @items, [ 226 push @items, [
233 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", 227 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
234 sub { server_login $server }, 228 sub { server_login $server },
235 ]; 229 ];
236 } 230 }
237 } 231 }
238 232
… …
246 } 240 }
247 } 241 }
248 ], 242 ],
249 ; 243 ;
250 244
251 (new CFPlus::UI::Menu 245 (new DC::UI::Menu
252 items => \@items, 246 items => \@items,
253 )->popup ($ev); 247 )->popup ($ev);
254 } 248 }
255 249
256 1 250 1
… …
278 272
279sub size_request { 273sub size_request {
280 my ($self) = @_; 274 my ($self) = @_;
281 275
282 ( 276 (
283 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, 277 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
284 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, 278 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
285 ) 279 )
286} 280}
287 281
288sub update { 282sub update {
289 my ($self) = @_; 283 my ($self) = @_;
… …
291 $self->{need_update} = 1; 285 $self->{need_update} = 1;
292 $self->SUPER::update; 286 $self->SUPER::update;
293} 287}
294 288
295my %DIR = ( 289my %DIR = (
296 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], 290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
297 ( "," . CFPlus::SDLK_KP8 ), [1, "north"], 291 ( "," . DC::SDLK_KP8 ), [1, "north"],
298 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], 292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
299 ( "," . CFPlus::SDLK_KP6 ), [3, "east"], 293 ( "," . DC::SDLK_KP6 ), [3, "east"],
300 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], 294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
301 ( "," . CFPlus::SDLK_KP2 ), [5, "south"], 295 ( "," . DC::SDLK_KP2 ), [5, "south"],
302 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], 296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
303 ( "," . CFPlus::SDLK_KP4 ), [7, "west"], 297 ( "," . DC::SDLK_KP4 ), [7, "west"],
304 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], 298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
305 299
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
306 ( "," . CFPlus::SDLK_UP ), [1, "north"], 305 ( "," . DC::SDLK_UP ), [1, "north"],
307 ("1," . CFPlus::SDLK_UP ), [2, "northeast"], 306 ("1," . DC::SDLK_UP ), [2, "northeast"],
308 ( "," . CFPlus::SDLK_RIGHT), [3, "east"], 307 ( "," . DC::SDLK_RIGHT ), [3, "east"],
309 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], 308 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
310 ( "," . CFPlus::SDLK_DOWN ), [5, "south"], 309 ( "," . DC::SDLK_DOWN ), [5, "south"],
311 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], 310 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
312 ( "," . CFPlus::SDLK_LEFT ), [7, "west"], 311 ( "," . DC::SDLK_LEFT ), [7, "west"],
313 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], 312 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
314); 313);
315 314
316sub invoke_key_down { 315sub invoke_key_down {
317 my ($self, $ev) = @_; 316 my ($self, $ev) = @_;
318 317
319 my $mod = $ev->{mod}; 318 my $mod = $ev->{mod};
320 my $sym = $ev->{sym}; 319 my $sym = $ev->{sym};
321 my $uni = $ev->{unicode}; 320 my $uni = $ev->{unicode};
322 321
323 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 322 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
324 323
325 if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) { 324 # ignore repeated keypresses
325 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
326 $self->{last_mod} = $mod;
327 $self->{last_sym} = $sym;
328
329 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
330
331 if ($::CONN && $dir) {
326 if ($mod & CFPlus::KMOD_SHIFT) { 332 if ($mod & DC::KMOD_SHIFT) {
327 $self->{shft}++; 333 $self->{shft}++;
328 if ($dir->[0] != $self->{fire_dir}) { 334 if ($dir->[0] != $self->{fire_dir}) {
329 $::CONN->user_send ("fire $dir->[0]"); 335 $::CONN->user_send ("fire $dir->[0]");
330 } 336 }
331 $self->{fire_dir} = $DIR{$sym}[0]; 337 $self->{fire_dir} = $dir->[0];
332 } elsif ($mod & CFPlus::KMOD_CTRL) { 338 } elsif ($mod & DC::KMOD_CTRL) {
333 $self->{ctrl}++; 339 $self->{ctrl}++;
334 $::CONN->user_send ("run $dir->[0]"); 340 $::CONN->user_send ("run $dir->[0]");
335 } else { 341 } else {
336 $::CONN->user_send ("$dir->[1]"); 342 $::CONN->user_send ("$dir->[1]");
337 } 343 }
… …
347 353
348 my $res = 0; 354 my $res = 0;
349 my $mod = $ev->{mod}; 355 my $mod = $ev->{mod};
350 my $sym = $ev->{sym}; 356 my $sym = $ev->{sym};
351 357
358 delete $self->{last_mod};
359 delete $self->{last_sym};
360
352 if ($::CFG->{shift_fire_stop}) { 361 if ($::CFG->{shift_fire_stop}) {
353 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 362 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
354 $::CONN->user_send ("fire_stop"); 363 $::CONN->user_send ("fire_stop");
355 delete $self->{fire_dir}; 364 delete $self->{fire_dir};
356 $res = 1; 365 $res = 1;
357 } 366 }
358 } else { 367 } else {
368 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
369
359 if (exists $DIR{$sym} && delete $self->{shft}) { 370 if ($dir && delete $self->{shft}) {
360 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
361 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
362 $res = 1; 373 $res = 1;
363 } 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?
364 $::CONN->user_send ("fire_stop"); 376 $::CONN->user_send ("fire_stop");
365 delete $self->{fire_dir}; 377 delete $self->{fire_dir};
366 $res = 1; 378 $res = 1;
367 } 379 }
368 } 380 }
369 381
370 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 382 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
371 $::CONN->user_send ("run_stop"); 383 $::CONN->user_send ("run_stop");
372 $res = 1; 384 $res = 1;
373 } 385 }
374 386
375 $res 387 $res
… …
381 $self->refresh_hook; 393 $self->refresh_hook;
382 394
383 0 395 0
384} 396}
385 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
386sub set_magicmap { 415sub set_magicmap {
387 my ($self, $w, $h, $x, $y, $data) = @_; 416 my ($self, $w, $h, $x, $y, $data) = @_;
388 417
389 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 418 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
390 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 419 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
392 $self->{magicmap} = [$x, $y, $w, $h, $data]; 421 $self->{magicmap} = [$x, $y, $w, $h, $data];
393 422
394 $self->update; 423 $self->update;
395} 424}
396 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
397sub refresh_hook { 463sub refresh_hook {
398 my ($self) = @_; 464 my ($self) = @_;
399 465
400 if ($::MAP && $::CONN) { 466 if ($::MAP && $::CONN) {
401 if (delete $self->{need_update}) { 467 if (delete $self->{need_update}) {
468 $self->movement_update;
469
402 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 470 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
403 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
404 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 476 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
405 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 477 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
406 478
479 # the map displacement, in tiles
407 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 480 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
408 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 481 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
409 482
483 # the upper left "visible" corner, in pixels
410 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
411 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
412 486
413 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;
414 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;
415 489
416 if ($::CFG->{fow_enable}) { 490 if ($::CFG->{fow_enable}) {
491 $sdx_t = $sdy_t = 0;#d#
417 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 );
418 498
419 $self->{fow_texture} = new CFPlus::Texture 499 $self->{fow_texture} = new DC::Texture
420 w => $w, 500 w => $w,
421 h => $h, 501 h => $h,
422 data => $data, 502 data => $data,
423 internalformat => GL_ALPHA, 503 internalformat => GL_ALPHA,
424 format => GL_ALPHA; 504 format => GL_ALPHA;
… …
429 glNewList ($self->{list} ||= glGenList); 509 glNewList ($self->{list} ||= glGenList);
430 510
431 glPushMatrix; 511 glPushMatrix;
432 glTranslate $sx0, $sy0; 512 glTranslate $sx0, $sy0;
433 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 513 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 glTranslate $self->{sdx}, $self->{sdy};
434 515
435 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 516 $::MAP->draw ($dx, $dy, $sw, $sh,
517 $self->{tilesize},
518 $::CONN->{player}{tag},
519 -$self->{sdx}, -$self->{sdy});
436 520
521 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
437 glScale $self->{tilesize}, $self->{tilesize}; 522 glScale $self->{tilesize}, $self->{tilesize};
438 523
439 if (my $tex = $self->{fow_texture}) { 524 if (my $tex = $self->{fow_texture}) {
440 glPushMatrix; 525 glPushMatrix;
526 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
441 glScale 1/3, 1/3; 527 glScale 1/3, 1/3;
442 glEnable GL_TEXTURE_2D; 528 glEnable GL_TEXTURE_2D;
443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
444 530
445 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 531 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
… …
474 560
475 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); 561 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
476 562
477 return unless $self->{list}; 563 return unless $self->{list};
478 564
479 my $focused = $CFPlus::UI::FOCUS == $self 565 my $focused = $DC::UI::FOCUS == $self
480 || $CFPlus::UI::FOCUS == $::COMPLETER->{entry}; 566 || $DC::UI::FOCUS == $::COMPLETER->{entry};
481 567
482 return 568 return
483 unless $focused || !$::FAST; 569 unless $focused || !$::FAST;
484 570
485 glCallList $self->{list}; 571 glCallList $self->{list};
… …
505 glDeleteList $self->{list}; 591 glDeleteList $self->{list};
506 592
507 $self->SUPER::DESTROY; 593 $self->SUPER::DESTROY;
508} 594}
509 595
510package CFPlus::MapWidget::MapMap; 596package DC::MapWidget::MapMap;
511 597
512use strict; 598use strict;
513use utf8; 599use utf8;
514 600
515our @ISA = CFPlus::UI::Base::; 601our @ISA = DC::UI::Base::;
516 602
517use Time::HiRes qw(time); 603use Time::HiRes qw(time);
518use CFPlus::OpenGL; 604use DC::OpenGL;
519 605
520sub size_request { 606sub size_request {
521 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 607 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
522} 608}
523 609
… …
525 my ($self) = @_; 611 my ($self) = @_;
526 612
527 if ($::MAP && $self->{texture_atime} < time) { 613 if ($::MAP && $self->{texture_atime} < time) {
528 my ($w, $h) = @$self{qw(w h)}; 614 my ($w, $h) = @$self{qw(w h)};
529 615
616 return unless $w && $h;
617
530 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 618 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
531 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 619 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
532 620
533 my $ox = 0.5 * ($w - $sw); 621 my $ox = 0.5 * ($w - $sw);
534 my $oy = 0.5 * ($h - $sh); 622 my $oy = 0.5 * ($h - $sh);
… …
548 $self->{y0} = $y0; 636 $self->{y0} = $y0;
549 637
550 $self->{texture_atime} = time + 1/3; 638 $self->{texture_atime} = time + 1/3;
551 639
552 $self->{texture} = 640 $self->{texture} =
553 new CFPlus::Texture 641 new DC::Texture
554 w => $w, 642 w => $w,
555 h => $h, 643 h => $h,
556 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 644 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
557 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;
558 } 646 }
559} 647}
560 648
561sub invoke_visibility_change { 649sub invoke_visibility_change {
562 my ($self) = @_; 650 my ($self) = @_;
… …
608 glEnd; 696 glEnd;
609 697
610 glDisable GL_BLEND; 698 glDisable GL_BLEND;
611} 699}
612 700
613package CFPlus::MapWidget::Command; 701package DC::MapWidget::Command;
614 702
615use strict; 703use strict;
616 704
617use CFPlus::OpenGL; 705use DC::OpenGL;
618 706
619our @ISA = CFPlus::UI::Frame::; 707our @ISA = DC::UI::Frame::;
620 708
621sub new { 709sub new {
622 my $class = shift; 710 my $class = shift;
623 711
624 my $self = $class->SUPER::new ( 712 my $self = $class->SUPER::new (
625 bg => [0, 0, 0, 0.8], 713 bg => [0, 0, 0, 0.8],
626 @_, 714 @_,
627 ); 715 );
628 716
629 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 717 $self->add ($self->{vbox} = new DC::UI::VBox);
630 718
631 $self->{label} = [ 719 $self->{label} = [
632 map 720 map
633 CFPlus::UI::Label->new ( 721 DC::UI::Label->new (
722 align => 0,
634 can_hover => 1, 723 can_hover => 1,
635 can_events => 1, 724 can_events => 1,
636 tooltip_width => 0.33, 725 tooltip_width => 0.33,
637 fontsize => $_, 726 fontsize => $_,
638 ), (0.8) x 16 727 ), (0.8) x 16
639 ]; 728 ];
640 729
641 $self->{entry} = new CFPlus::UI::Entry 730 $self->{entry} = new DC::UI::Entry
642 on_changed => sub { 731 on_changed => sub {
643 $self->update_labels; 732 $self->update_labels;
644 0 733 0
645 }, 734 },
646 on_button_down => sub { 735 on_button_down => sub {
647 my ($entry, $ev, $x, $y) = @_; 736 my ($entry, $ev, $x, $y) = @_;
648 737
649 if ($ev->{button} == 3) { 738 if ($ev->{button} == 3) {
650 (new CFPlus::UI::Menu 739 (new DC::UI::Menu
651 items => [ 740 items => [
652 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 741 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
653 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] 742 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
654 ], 743 ],
655 )->popup ($ev); 744 )->popup ($ev);
656 return 1; 745 return 1;
657 } 746 }
658 0 747 0
… …
673 $self->hide; 762 $self->hide;
674 } 763 }
675 } elsif ($ev->{sym} == 27) { 764 } elsif ($ev->{sym} == 27) {
676 $self->{hist_ptr} = 0; 765 $self->{hist_ptr} = 0;
677 $self->hide; 766 $self->hide;
678 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 767 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
679 if ($self->{hist_ptr} > 1) { 768 if ($self->{hist_ptr} > 1) {
680 $self->{hist_ptr}--; 769 $self->{hist_ptr}--;
681 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 770 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
682 } elsif ($self->{hist_ptr} > 0) { 771 } elsif ($self->{hist_ptr} > 0) {
683 $self->{hist_ptr}--; 772 $self->{hist_ptr}--;
… …
685 } else { 774 } else {
686 ++$self->{select_offset} 775 ++$self->{select_offset}
687 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 776 if $self->{select_offset} < $#{ $self->{last_match} || [] };
688 } 777 }
689 $self->update_labels; 778 $self->update_labels;
690 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 779 } elsif ($ev->{sym} == DC::SDLK_UP) {
691 if ($self->{select_offset}) { 780 if ($self->{select_offset}) {
692 --$self->{select_offset} 781 --$self->{select_offset}
693 } else { 782 } else {
694 unless ($self->{hist_ptr}) { 783 unless ($self->{hist_ptr}) {
695 $self->{hist_saveback} = $self->{entry}->get_text; 784 $self->{hist_saveback} = $self->{entry}->get_text;
… …
853 942
854sub _draw { 943sub _draw {
855 my ($self) = @_; 944 my ($self) = @_;
856 945
857 # hack 946 # hack
858 local $CFPlus::UI::FOCUS = $self->{entry}; 947 local $DC::UI::FOCUS = $self->{entry};
859 948
860 $self->SUPER::_draw; 949 $self->SUPER::_draw;
861} 950}
862 951
8631 9521

Diff Legend

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