--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/10 11:56:28 1.53 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/11 12:21:29 1.58 @@ -36,7 +36,7 @@ $BUTTON_STATE |= 1 << ($ev->button - 1); - $GRAB->button_down ($ev) if $GRAB; + $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; } sub feed_sdl_button_up_event { @@ -47,6 +47,8 @@ $BUTTON_STATE &= ~(1 << ($ev->button - 1)); + $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; + if (!$BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; $grab->update if $grab; @@ -67,7 +69,7 @@ $HOVER->update if $HOVER; } - $HOVER->mouse_motion ($ev) if $HOVER; + $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; } sub new { @@ -99,6 +101,13 @@ $self->{h} = $h; } +# translate global koordinates to local coordinate system +sub translate { + my ($self, $x, $y) = @_; + + $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); +} + sub focus_in { my ($self) = @_; @@ -334,14 +343,8 @@ glEnable GL_BLEND; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - glBindTexture GL_TEXTURE_2D, $tex->{name}; - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex 0, 0; - glTexCoord 0, 1; glVertex 0, $h; - glTexCoord 1, 1; glVertex $w, $h; - glTexCoord 1, 0; glVertex $w, 0; - glEnd; + $tex->draw_quad (0, 0, $w, $h); glDisable GL_BLEND; glDisable GL_TEXTURE_2D; @@ -384,10 +387,10 @@ glBegin GL_QUADS; glColor 0, 0, 0; - glTexCoord 0, 0; glVertex 0 , 0; - glTexCoord 0, 1; glVertex 0 , $h + 4; - glTexCoord 1, 1; glVertex $w + 4 , $h + 4; - glTexCoord 1, 0; glVertex $w + 4 , 0; + glVertex 0 , 0; + glVertex 0 , $h + 4; + glVertex $w + 4 , $h + 4; + glVertex $w + 4 , 0; glEnd; $chld->draw; @@ -447,44 +450,16 @@ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; my $top = $tex[1]; - glBindTexture GL_TEXTURE_2D, $top->{name}; - - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex 0 , 0; - glTexCoord 0, 1; glVertex 0 , $top->{height}; - glTexCoord 1, 1; glVertex $w , $top->{height}; - glTexCoord 1, 0; glVertex $w , 0; - glEnd; + $top->draw_quad (0, 0, $w, $top->{height}); my $left = $tex[3]; - glBindTexture GL_TEXTURE_2D, $left->{name}; - - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex 0 , $top->{height}; - glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; - glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; - glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; - glEnd; + $left->draw_quad (0, $top->{height}, $left->{width}, $ch); my $right = $tex[2]; - glBindTexture GL_TEXTURE_2D, $right->{name}; - - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; - glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; - glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; - glTexCoord 1, 0; glVertex $w , $top->{height}; - glEnd; + $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); my $bottom = $tex[4]; - glBindTexture GL_TEXTURE_2D, $bottom->{name}; - - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; - glTexCoord 0, 1; glVertex 0 , $h; - glTexCoord 1, 1; glVertex $w , $h; - glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; - glEnd; + $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); my $bg = $tex[0]; glBindTexture GL_TEXTURE_2D, $bg->{name}; @@ -495,12 +470,7 @@ my $rep_x = $cw / $bg->{width}; my $rep_y = $ch / $bg->{height}; - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; - glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; - glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; - glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; - glEnd; + $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); glDisable GL_BLEND; glDisable GL_TEXTURE_2D; @@ -717,16 +687,10 @@ glEnable GL_TEXTURE_2D; glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glBindTexture GL_TEXTURE_2D, $tex->{name}; glColor 1, 0, 0, 1; # TODO color - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex 0 , 0; - glTexCoord 0, 1; glVertex 0 , $tex->{height}; - glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; - glTexCoord 1, 0; glVertex $tex->{width}, 0; - glEnd; + $tex->draw_quad (0, 0); glDisable GL_BLEND; glDisable GL_TEXTURE_2D; @@ -755,7 +719,6 @@ substr $text, -1, 1, ''; } elsif ($uni) { $text .= chr $uni; - print "$uni <$text>\n";#d# } $self->set_text ($text); @@ -767,6 +730,11 @@ $self->focus_in; } +sub mouse_motion { + my ($self, $ev, $x, $y) = @_; + printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# +} + sub _draw { my ($self) = @_; @@ -844,37 +812,29 @@ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; my $sw4 = ($sw + 3) & ~3; - my $lighting = "\x00" x ($sw4 * $sh); + my $darkness = "\x00" x ($sw4 * $sh); for my $x (0 .. $sw - 1) { + my $row = $map->[$x + $xofs]; for my $y (0 .. $sh - 1) { - my $cell = $map->[$x + $xofs][$y + $yofs] + my $cell = $row->[$y + $yofs] or next; - my $darkness = $cell->[0] * (1 / 255); - if ($darkness < 0) { - $darkness = $cell->[1] ? 0.2 : 0; + my $dark = $cell->[0]; + if ($dark < 0) { + substr $darkness, $y * $sw4 + $x, 1, chr 224; + } else { + substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; } - substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255; for my $num (grep $_, @$cell[1,2,3]) { my $tex = $::CONN->{face}[$num]{texture} || next; - - glBindTexture GL_TEXTURE_2D, $tex->{name}; - + my $w = $tex->{width}; my $h = $tex->{height}; - my $px = ($x + 1) * 32 - $w; - my $py = ($y + 1) * 32 - $h; - - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex $px , $py; - glTexCoord 0, 1; glVertex $px , $py + $h; - glTexCoord 1, 1; glVertex $px + $w, $py + $h; - glTexCoord 1, 0; glVertex $px + $w, $py; - glEnd; + $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); } } } @@ -889,24 +849,18 @@ # $lighting =~ s/(.)../$1/gs; # } - $lighting = new Crossfire::Client::Texture + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + + $darkness = new Crossfire::Client::Texture width => $sw4, height => $sh, - data => $lighting, + data => $darkness, internalformat => GL_ALPHA, format => GL_ALPHA; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor 0.5, 0.5, 0.5, 1; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glBindTexture GL_TEXTURE_2D, $lighting->{name}; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex 0 , 0; - glTexCoord 0, 1; glVertex 0 , $sh * 32; - glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32; - glTexCoord 1, 0; glVertex $sw4 * 32, 0; - glEnd; + glColor 0.45, 0.45, 0.45, 1; + $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); glDisable GL_TEXTURE_2D; glDisable GL_BLEND; @@ -975,7 +929,7 @@ my ($self, $x, $y) = @_; $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; - $self->{speed} = 2; + $self->{speed} = 0.001; $self->{time} = 1; ::animation_start $self; @@ -1024,6 +978,12 @@ for @{$self->{children}}; } +sub translate { + my ($self, $x, $y) = @_; + + ($x, $y) +} + sub update { my ($self) = @_;