--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/12/10 01:30:54 1.98 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2007/07/21 20:30:41 1.113 @@ -23,13 +23,7 @@ z => -1, can_focus => 1, list => glGenList, - - smooth_matrix => [ - 0.05, 0.13, 0.05, - 0.13, 0.30, 0.13, - 0.05, 0.13, 0.05, - ], - + tilesize => 32, @_ ); @@ -41,6 +35,12 @@ $self } +sub set_tilesize { + my ($self, $tilesize) = @_; + + $self->{tilesize} = $tilesize; +} + sub add_command { my ($self, $command, $tooltip, $widget, $cb) = @_; @@ -179,8 +179,8 @@ $self->grab_focus; return unless $::CONN; - my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; - my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; + my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; + my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; $x -= CFPlus::floor $::MAP->w * 0.5; $y -= CFPlus::floor $::MAP->h * 0.5; @@ -287,9 +287,11 @@ } sub size_request { + my ($self) = @_; + ( - 32 * CFPlus::ceil $::WIDTH / 32, - 32 * CFPlus::ceil $::HEIGHT / 32, + $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, + $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, ) } @@ -301,19 +303,24 @@ } my %DIR = ( - CFPlus::SDLK_KP8, [1, "north"], - CFPlus::SDLK_KP9, [2, "northeast"], - CFPlus::SDLK_KP6, [3, "east"], - CFPlus::SDLK_KP3, [4, "southeast"], - CFPlus::SDLK_KP2, [5, "south"], - CFPlus::SDLK_KP1, [6, "southwest"], - CFPlus::SDLK_KP4, [7, "west"], - CFPlus::SDLK_KP7, [8, "northwest"], - - CFPlus::SDLK_UP, [1, "north"], - CFPlus::SDLK_RIGHT, [3, "east"], - CFPlus::SDLK_DOWN, [5, "south"], - CFPlus::SDLK_LEFT, [7, "west"], + ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], + ( "," . CFPlus::SDLK_KP8 ), [1, "north"], + ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], + ( "," . CFPlus::SDLK_KP6 ), [3, "east"], + ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], + ( "," . CFPlus::SDLK_KP2 ), [5, "south"], + ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], + ( "," . CFPlus::SDLK_KP4 ), [7, "west"], + ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], + + ( "," . CFPlus::SDLK_UP ), [1, "north"], + ("1," . CFPlus::SDLK_UP ), [2, "northeast"], + ( "," . CFPlus::SDLK_RIGHT), [3, "east"], + ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], + ( "," . CFPlus::SDLK_DOWN ), [5, "south"], + ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], + ( "," . CFPlus::SDLK_LEFT ), [7, "west"], + ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], ); sub invoke_key_down { @@ -325,8 +332,8 @@ $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; - if ($uni == ord "\t") { - $::PL_WINDOW->toggle_visibility; + if ($sym == 9) { + ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility; } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { $::HELP_WINDOW->toggle_visibility; } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { @@ -342,8 +349,6 @@ } elsif (!$::CONN) { return 0; # bindings further down need a valid connection - } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { - $::CONN->user_send ("stay fire"); } elsif ($uni == ord ",") { $::CONN->user_send ("take"); } elsif ($uni == ord " ") { @@ -359,24 +364,27 @@ $::CONN->user_send ("rotateshoottype +"); } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { $::CONN->user_send ("rotateshoottype -"); + } elsif ($uni == ord '!') { + $self->{completer}->set_prefix ("shout "); + $self->{completer}->show; } elsif ($uni == ord '"') { $self->{completer}->set_prefix ("$::CFG->{say_command} "); $self->{completer}->show; } elsif ($uni == ord "'") { $self->{completer}->set_prefix (""); $self->{completer}->show; - } elsif (exists $DIR{$sym}) { + } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) { if ($mod & CFPlus::KMOD_SHIFT) { $self->{shft}++; - if ($DIR{$sym}[0] != $self->{fire_dir}) { - $::CONN->user_send ("fire $DIR{$sym}[0]"); + if ($dir->[0] != $self->{fire_dir}) { + $::CONN->user_send ("fire $dir->[0]"); } $self->{fire_dir} = $DIR{$sym}[0]; } elsif ($mod & CFPlus::KMOD_CTRL) { $self->{ctrl}++; - $::CONN->user_send ("run $DIR{$sym}[0]"); + $::CONN->user_send ("run $dir->[0]"); } else { - $::CONN->user_send ("$DIR{$sym}[1]"); + $::CONN->user_send ("$dir->[1]"); } } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { $self->{completer}->inject_key_down ($ev); @@ -421,6 +429,14 @@ $res } +sub invoke_visibility_change { + my ($self) = @_; + + $self->refresh_hook; + + 0 +} + sub set_magicmap { my ($self, $w, $h, $x, $y, $data) = @_; @@ -432,19 +448,13 @@ $self->update; } -sub draw { +sub refresh_hook { my ($self) = @_; return unless $::MAP; - my $focused = $CFPlus::UI::FOCUS == $self - || $CFPlus::UI::FOCUS == $self->{completer}{entry}; - - return - unless $focused || !$::FAST; - if (delete $self->{need_update}) { - my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; + my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; @@ -461,26 +471,12 @@ if ($::CFG->{fow_enable}) { my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); - if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war - glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); - glConvolutionFilter2D ( - GL_CONVOLUTION_2D, - GL_ALPHA, - 3, 3, - GL_ALPHA, GL_FLOAT, - (pack "f*", @{ $self->{smooth_matrix} }), - ); - glEnable GL_CONVOLUTION_2D; - } - $self->{fow_texture} = new CFPlus::Texture w => $w, h => $h, data => $data, internalformat => GL_ALPHA, format => GL_ALPHA; - - glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; } else { delete $self->{fow_texture}; } @@ -491,11 +487,13 @@ glTranslate $sx0, $sy0; glScale $::CFG->{map_scale}, $::CFG->{map_scale}; - $::MAP->draw ($dx, $dy, $sw, $sh); + $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); - glScale 32, 32; + glScale $self->{tilesize}, $self->{tilesize}; if (my $tex = $self->{fow_texture}) { + glPushMatrix; + glScale 1/3, 1/3; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; @@ -503,6 +501,7 @@ $self->{fow_texture}->draw_quad_alpha (0, 0); glDisable GL_TEXTURE_2D; + glPopMatrix; } if ($self->{magicmap}) { @@ -520,6 +519,21 @@ glEndList; } +} + +sub draw { + my ($self) = @_; + + $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); + + return unless $self->{list}; + + my $focused = $CFPlus::UI::FOCUS == $self + || $CFPlus::UI::FOCUS == $self->{completer}{entry}; + + return + unless $focused || !$::FAST; + glCallList $self->{list}; # TNT2 emulates logops in software (or worse :) @@ -547,13 +561,61 @@ package CFPlus::MapWidget::MapMap; +use strict; +use utf8; + our @ISA = CFPlus::UI::Base::; use Time::HiRes qw(time); use CFPlus::OpenGL; sub size_request { - ($::HEIGHT * 0.25, $::HEIGHT * 0.25) + ($::HEIGHT * 0.2, $::HEIGHT * 0.2) +} + +sub refresh_hook { + my ($self) = @_; + + if ($::MAP && $self->{texture_atime} < time) { + my ($w, $h) = @$self{qw(w h)}; + + my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; + my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; + + my $ox = 0.5 * ($w - $sw); + my $oy = 0.5 * ($h - $sh); + + my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; + my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; + + #TODO: map scale is completely borked + + my $x0 = int $ox - $sx + 0.5; + my $y0 = int $oy - $sy + 0.5; + + $self->{sw} = $sw; + $self->{sh} = $sh; + + $self->{x0} = $x0; + $self->{y0} = $y0; + + $self->{texture_atime} = time + 1/3; + + $self->{texture} = + new CFPlus::Texture + w => $w, + h => $h, + data => $::MAP->mapmap (-$ox, -$oy, $w, $h), + type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; + } +} + +sub invoke_visibility_change { + my ($self) = @_; + + $self->refresh_hook; + + 0 } sub invoke_size_allocate { @@ -574,52 +636,27 @@ sub _draw { my ($self) = @_; - $::MAP or return; - - my ($w, $h) = @$self{qw(w h)}; + $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook }); - my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; - my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; - - my $sx = int $::CFG->{map_shift_x} / 32; - my $sy = int $::CFG->{map_shift_y} / 32; - - my $ox = 0.5 * ($w - $sw); - my $oy = 0.5 * ($h - $sh); + $self->{texture} or return; glEnable GL_BLEND; glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - if ($self->{texture_atime} < time) { - $self->{texture_atime} = time + 1/3; - - $self->{texture} = - new CFPlus::Texture - w => $w, - h => $h, - data => $::MAP->mapmap (-$ox, -$oy, $w, $h), - type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; - } - $self->{texture}->draw_quad (0, 0); glDisable GL_TEXTURE_2D; glTranslate 0.375, 0.375; - #TODO: map scale is completely borked - - my $x0 = int $ox - $sx + 0.5; - my $y0 = int $oy - $sy + 0.5; - glColor 1, 1, 0, 1; glBegin GL_LINE_LOOP; - glVertex $x0 , $y0 ; - glVertex $x0 , $y0 + $sh; - glVertex $x0 + $sw, $y0 + $sh; - glVertex $x0 + $sw, $y0 ; + glVertex $self->{x0} , $self->{y0} ; + glVertex $self->{x0} , $self->{y0} + $self->{sh}; + glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh}; + glVertex $self->{x0} + $self->{sw}, $self->{y0} ; glEnd; glDisable GL_BLEND;