[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/pclient

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.231 by root, Sun May 21 00:02:02 2006 UTC vs.
Revision 1.233 by root, Mon May 22 01:28:41 2006 UTC

    $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
    debug sprintf "%3.2f", $fps;
    $CFClient::UI::ROOT->draw;
+   $WANT_REFRESH = 0;
+   $CAN_REFRESH = 0;
+   $LAST_REFRESH = $NOW;
 0 && do {
    # some weird model-drawing code, just a joke right now
    use CFClient::OpenGL;
    $demo{t}{eye_auv}  ||= new_from_file CFClient::Texture "eye2.png" or die;
    glDepthMask 1;
    glClear GL_DEPTH_BUFFER_BIT;
    glEnable GL_TEXTURE_2D;
    glEnable GL_DEPTH_TEST;
-   glDisable GL_CULL_FACE;
+   glEnable GL_CULL_FACE;
-   glShadeModel GL_SMOOTH;
+   glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
    glMatrixMode GL_PROJECTION;
    glLoadIdentity;
+   glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
-   glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
+   #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
    glMatrixMode GL_MODELVIEW;
    glLoadIdentity;
    glPushMatrix;
-   glTranslate $::WIDTH * 0.5, $::HEIGHT * 0.5;
+   glTranslate 0, 0, -800;
+   glScale 1, -1, 1;
-   glRotate $NOW * 1000 % 36000 / 20, 0, 1, 0;
+   glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
+   glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
+   glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
    glScale 50, 50, 50;
    glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
    while (my ($k, $v) = each %{$r->{g}}) {
       glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
       glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
    }
    glPopMatrix;
    glShadeModel GL_FLAT;
    glDisable GL_DEPTH_TEST;
    glDisable GL_TEXTURE_2D;
    $WANT_REFRESH++;
 };
    CFClient::SDL_GL_SwapBuffers;
-   $WANT_REFRESH = 0;
-   $CAN_REFRESH = 0;
-   $LAST_REFRESH = $NOW;
 }
 my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
    $NOW = time;
          $self->set_texture ($id => $data);
       }
    }
 }
+# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
+# (server resource,s latency, bandwidth), so this hack is warranted.
+# the right fix is to make real tiled maps with an overview file
+sub conn::send_mapinfo {
+   my ($self, $data, $cb) = @_;
+   if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
+      my ($wx, $wy) = ($1, $2);
+      if ($data =~ /^spatial ([1-4]+)$/) {
+         my @dx = (0, 0, 1, 0, -1);
+         my @dy = (0, -1, 0, 1, 0);
+         my ($dx, $dy);
+         for (split //, $1) {
+            $dx += $dx[$_];
+            $dy += $dy[$_];
+         }
+         $cb->(spatial => 15,
+            $self->{map_info}[1] - $MAP->ox + $dx * 50,
+            $self->{map_info}[2] - $MAP->oy + $dy * 50,
+            50, 50,
+            sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
+         );
+         return;
+      }
+   }
+   $self->SUPER::send_mapinfo ($data, $cb);
+}
 # this method does a "flood fill" into every tile direction
 # it assumes that tiles are arranged in a rectangular grid,
 # i.e. a map is the same as the left of the right map etc.
 # failure to comply are harmless and result in display errors
 # at worst.
 sub conn::flood_fill {
-   my ($self, $gx, $gy, $path, $hash, $flags) = @_;
+   my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
    # the server does not allow map paths > 6
    return if 7 <= length $path;
    my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
    for (
-      [1,  0, -1],
+      [1, 3,  0, -1],
-      [2,  1,  0],
+      [2, 4,  1,  0],
-      [3,  0,  1],
+      [3, 1,  0,  1],
-      [4, -1,  0],
+      [4, 2, -1,  0],
    ) {
-      my ($tile, $dx, $dy) = @$_;
+      my ($tile, $tile2, $dx, $dy) = @$_;
+      next if $block & (1 << $tile);
+      my $block = $block | (1 << $tile2);
       my $gx = $gx + $dx;
       my $gy = $gy + $dy;
       next unless $flags & (1 << ($tile - 1));
       my $neigh = $self->{neigh_map}{$hash} ||= [];
       if (my $info = $neigh->[$tile]) {
          my ($flags, $x, $y, $w, $h, $hash) = @$info;
-         $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
+         $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
             if $x >= $x0 && $x + $w < $x1 && $y >= $y0  && $y + $h < $y1;
       } else {
          $self->send_mapinfo ("spatial $path$tile", sub {
             my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
             return if $mode ne "spatial";
             $x += $MAP->ox;
             $y += $MAP->oy;
             $self->load_map ($hash, $x, $y)
                unless $self->{neigh_map}{$hash}[5]++;#d#
             $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
-            $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
+            $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
                if $x >= $x0 && $x + $w < $x1 && $y >= $y0  && $y + $h < $y1;
          });
       }
    }
 }
       $ox - $mapmapw * 0.5,      $oy - $mapmapw * 0.5,
       $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
    ];
    delete $self->{neigh_grid};
-   $self->flood_fill (0, 0, "", $hash, $flags);
    $x += $ox;
    $y += $oy;
    $self->{map_info} = [$hash, $x, $y, $w, $h];
-   my $map = $self->{map_info}[0];
-   $map =~ s/^.*?\/([^\/]+)$/\1/;
+   (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
    $STATWIDS->{map}->set_text ("Map: " . $map);
    $self->load_map ($hash, $x, $y);
+   $self->flood_fill (0, 0, 0, "", $hash, $flags);
 }
 sub conn::face_find {
    my ($self, $facenum, $face) = @_;

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.231 by root, Sun May 21 00:02:02 2006 UTC vs. Revision 1.233 by root, Mon May 22 01:28:41 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.231 by root, Sun May 21 00:02:02 2006 UTC vs.
Revision 1.233 by root, Mon May 22 01:28:41 2006 UTC