ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.24 by root, Sat Apr 8 20:25:26 2006 UTC vs.
Revision 1.25 by root, Sat Apr 8 22:08:24 2006 UTC

404 404
405package Crossfire::Client::Widget::MapWidget; 405package Crossfire::Client::Widget::MapWidget;
406 406
407use strict; 407use strict;
408 408
409our @ISA = qw/Crossfire::Client::Widget/; 409use List::Util qw(min max);
410 410
411use SDL; 411use SDL;
412use SDL::OpenGL; 412use SDL::OpenGL;
413use SDL::OpenGL::Constants; 413use SDL::OpenGL::Constants;
414
415our @ISA = Crossfire::Client::Widget::;
414 416
415sub key_down { 417sub key_down {
416 print "MAPKEYDOWN\n"; 418 print "MAPKEYDOWN\n";
417} 419}
418 420
419sub key_up { 421sub key_up {
420} 422}
421 423
422sub _draw { 424sub _draw {
423 my ($self) = @_; 425 my ($self) = @_;
426
427 my $mx = $::CONN->{mapx};
428 my $my = $::CONN->{mapy};
429
430 my $map = $::CONN->{map};
431
432 my ($xofs, $yofs);
433
434 my $sw = 1 + int $::WIDTH / 32;
435 my $sh = 1 + int $::HEIGHT / 32;
436
437 if ($::CONN->{mapw} > $sw) {
438 $xofs = ($sw - $::CONN->{mapw}) * 0.5;
439 } else {
440 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
441 }
442
443 if ($::CONN->{maph} > $sh) {
444 $yofs = ($sh - $::CONN->{maph}) * 0.5;
445 } else {
446 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
447 }
424 448
425 glEnable GL_TEXTURE_2D; 449 glEnable GL_TEXTURE_2D;
426 glEnable GL_BLEND; 450 glEnable GL_BLEND;
427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
428 452
429 my $map = $::CONN->{map}; 453 warn "<$mx,$my> <$xofs,$yofs>\n";#d#
430 454
431 for my $x (0 .. int $::WIDTH / 32) { 455 for my $x (0 .. $sw - 1) {
432 for my $y (0 .. int $::HEIGHT / 32) { 456 for my $y (0 .. $sh - 1) {
433 457
434 my $cell = $map->[$x + $::CONN->{mapx}] 458 my $cell = $map->[$x + $xofs][$y + $yofs]
435 [$y + $::CONN->{mapy}]
436 or next; 459 or next;
437 460
438 my $darkness = $cell->[0] * (1 / 255); 461 my $darkness = $cell->[0] * (1 / 255);
439 if ($darkness < 0) { 462 if ($darkness < 0) {
440 glColor 0.3, 0.3, 0.3; 463 glColor 0.3, 0.3, 0.3;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines