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.135 by root, Sun Jul 20 02:51:40 2008 UTC vs.
Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC

… …
11use DC::Macro; 11use DC::Macro;
12 12
13our @ISA = DC::UI::Base::; 13our @ISA = DC::UI::Base::;
14 14
15my $magicmap_tex = 15my $magicmap_tex =
16 new_from_file DC::Texture DC::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
… …
285 $self->{need_update} = 1; 285 $self->{need_update} = 1;
286 $self->SUPER::update; 286 $self->SUPER::update;
287} 287}
288 288
289my %DIR = ( 289my %DIR = (
290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"], 290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291 ( "," . DC::SDLK_KP8 ), [1, "north"], 291 ( "," . DC::SDLK_KP8 ), [1, "north"],
292 ( "," . DC::SDLK_KP9 ), [2, "northeast"], 292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
293 ( "," . DC::SDLK_KP6 ), [3, "east"], 293 ( "," . DC::SDLK_KP6 ), [3, "east"],
294 ( "," . DC::SDLK_KP3 ), [4, "southeast"], 294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
295 ( "," . DC::SDLK_KP2 ), [5, "south"], 295 ( "," . DC::SDLK_KP2 ), [5, "south"],
296 ( "," . DC::SDLK_KP1 ), [6, "southwest"], 296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
297 ( "," . DC::SDLK_KP4 ), [7, "west"], 297 ( "," . DC::SDLK_KP4 ), [7, "west"],
298 ( "," . DC::SDLK_KP7 ), [8, "northwest"], 298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
299 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
300 ( "," . DC::SDLK_UP ), [1, "north"], 305 ( "," . DC::SDLK_UP ), [1, "north"],
301 ("1," . DC::SDLK_UP ), [2, "northeast"], 306 ("1," . DC::SDLK_UP ), [2, "northeast"],
302 ( "," . DC::SDLK_RIGHT), [3, "east"], 307 ( "," . DC::SDLK_RIGHT ), [3, "east"],
303 ("1," . DC::SDLK_RIGHT), [4, "southeast"], 308 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
304 ( "," . DC::SDLK_DOWN ), [5, "south"], 309 ( "," . DC::SDLK_DOWN ), [5, "south"],
305 ("1," . DC::SDLK_DOWN ), [6, "southwest"], 310 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
306 ( "," . DC::SDLK_LEFT ), [7, "west"], 311 ( "," . DC::SDLK_LEFT ), [7, "west"],
307 ("1," . DC::SDLK_LEFT ), [8, "northwest"], 312 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
308); 313);
309 314
310sub invoke_key_down { 315sub invoke_key_down {
311 my ($self, $ev) = @_; 316 my ($self, $ev) = @_;
312 317
313 my $mod = $ev->{mod}; 318 my $mod = $ev->{mod};
314 my $sym = $ev->{sym}; 319 my $sym = $ev->{sym};
315 my $uni = $ev->{unicode}; 320 my $uni = $ev->{unicode};
316 321
317 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; 322 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
318 323
319 # ignore repeated keypresses 324 # ignore repeated keypresses
320 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; 325 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
321 $self->{last_mod} = $mod; 326 $self->{last_mod} = $mod;
322 $self->{last_sym} = $sym; 327 $self->{last_sym} = $sym;
323 328
324 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { 329 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
330
331 if ($::CONN && $dir) {
325 if ($mod & DC::KMOD_SHIFT) { 332 if ($mod & DC::KMOD_SHIFT) {
326 $self->{shft}++; 333 $self->{shft}++;
327 if ($dir->[0] != $self->{fire_dir}) { 334 if ($dir->[0] != $self->{fire_dir}) {
328 $::CONN->user_send ("fire $dir->[0]"); 335 $::CONN->user_send ("fire $dir->[0]");
329 } 336 }
… …
356 $::CONN->user_send ("fire_stop"); 363 $::CONN->user_send ("fire_stop");
357 delete $self->{fire_dir}; 364 delete $self->{fire_dir};
358 $res = 1; 365 $res = 1;
359 } 366 }
360 } else { 367 } else {
361 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { 368 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
369
370 if ($dir && delete $self->{shft}) {
362 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
363 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
364 $res = 1; 373 $res = 1;
365 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) 374 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
366 && delete $self->{shft}) { # XXX: is RSHIFT ok? 375 && delete $self->{shft}) { # XXX: is RSHIFT ok?
… …
368 delete $self->{fire_dir}; 377 delete $self->{fire_dir};
369 $res = 1; 378 $res = 1;
370 } 379 }
371 } 380 }
372 381
373 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { 382 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
374 $::CONN->user_send ("run_stop"); 383 $::CONN->user_send ("run_stop");
375 $res = 1; 384 $res = 1;
376 } 385 }
377 386
378 $res 387 $res
… …
421 if ($self->{sdx} || $self->{sdy}) { 430 if ($self->{sdx} || $self->{sdy}) {
422 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); 431 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
423 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 432 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
424 433
425 # the minimum time for a single tile movement 434 # the minimum time for a single tile movement
426 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK); 435 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
427 436
428 # jump if "impossibly high" speed 437 # jump if "impossibly high" speed
429 if ( 438 if (
430 (max abs $self->{sdx}, abs $self->{sdy}) 439 (max abs $self->{sdx}, abs $self->{sdy})
431 > $spd * $self->{tilesize} * $mintime * 1.1 440 > $spd * $self->{tilesize} * $mintime * 1.1
… …
458 if (delete $self->{need_update}) { 467 if (delete $self->{need_update}) {
459 $self->movement_update; 468 $self->movement_update;
460 469
461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 470 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
462 471
472 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
473 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
474
463 # width/height of map, in tiles 475 # width/height of map, in tiles
464 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 476 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
465 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 477 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
466 478
467 # the map displacement, in tiles 479 # the map displacement, in tiles
468 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize}; 480 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
469 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize}; 481 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
470 482
471 # the upper left "visible" corner, in pixels 483 # the upper left "visible" corner, in pixels
472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
474 486
475 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
476 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
477 489
478 if ($::CFG->{fow_enable}) { 490 if ($::CFG->{fow_enable}) {
491 $sdx_t = $sdy_t = 0;#d#
479 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 );
480 498
481 $self->{fow_texture} = new DC::Texture 499 $self->{fow_texture} = new DC::Texture
482 w => $w, 500 w => $w,
483 h => $h, 501 h => $h,
484 data => $data, 502 data => $data,
… …
493 glPushMatrix; 511 glPushMatrix;
494 glTranslate $sx0, $sy0; 512 glTranslate $sx0, $sy0;
495 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 513 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
496 glTranslate $self->{sdx}, $self->{sdy}; 514 glTranslate $self->{sdx}, $self->{sdy};
497 515
498 warn "mapdraw -$self->{sdx}\n";#d#
499 $::MAP->draw ($dx, $dy, $sw, $sh, 516 $::MAP->draw ($dx, $dy, $sw, $sh,
500 $self->{tilesize}, 517 $self->{tilesize},
501 $::CONN->{player}{tag}, 518 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy}); 519 -$self->{sdx}, -$self->{sdy});
503 520
504 glTranslate -$self->{sdx}, -$self->{sdy}; 521 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
505 glScale $self->{tilesize}, $self->{tilesize}; 522 glScale $self->{tilesize}, $self->{tilesize};
506 523
507 if (my $tex = $self->{fow_texture}) { 524 if (my $tex = $self->{fow_texture}) {
508 glPushMatrix; 525 glPushMatrix;
526 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
509 glScale 1/3, 1/3; 527 glScale 1/3, 1/3;
510 glEnable GL_TEXTURE_2D; 528 glEnable GL_TEXTURE_2D;
511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
512 530
513 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 531 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
… …
592sub refresh_hook { 610sub refresh_hook {
593 my ($self) = @_; 611 my ($self) = @_;
594 612
595 if ($::MAP && $self->{texture_atime} < time) { 613 if ($::MAP && $self->{texture_atime} < time) {
596 my ($w, $h) = @$self{qw(w h)}; 614 my ($w, $h) = @$self{qw(w h)};
615
616 return unless $w && $h;
597 617
598 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 618 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
599 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 619 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
600 620
601 my $ox = 0.5 * ($w - $sw); 621 my $ox = 0.5 * ($w - $sw);

Diff Legend

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