--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/10 19:34:04	1.55
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/10 22:16:34	1.56
@@ -334,14 +334,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 +378,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 +441,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 +461,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 +678,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;
@@ -860,21 +815,14 @@
 
          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 ($px, $py, $w, $h);
          }
       }
    }
@@ -901,12 +849,8 @@
    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;
+
+   $lighting->draw_quad (0, 0, $sw4 * 32, $sh * 32);
 
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
@@ -975,7 +919,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;
@@ -984,6 +928,8 @@
 sub animate {
    my ($self, $interval) = @_;
 
+   printf "%5.2f\n", 1 / $interval;#d#
+
    $self->{time} -= $interval * $self->{speed};
    if ($self->{time} <= 0) {
       $self->{time} = 0;