[ViewVC] Diff of: cvs/deliantra/server/common/los.C

Comparing deliantra/server/common/los.C (file contents):
Revision 1.48 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.52 by root, Fri Dec 26 10:36:42 2008 UTC

  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
-/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
 #include <global.h>
 #include <cmath>
-static void expand_lighted_sight (object *op);
+#define SEE_IN_DARK_RADIUS 3
+// los flags
 enum {
-  LOS_XI = 0x01,
+  FLG_XI      = 0x01, // we have an x-parent
-  LOS_YI = 0x02,
+  FLG_YI      = 0x02, // we have an y-parent
+  FLG_BLOCKED = 0x04, // this space blocks the view
+  FLG_QUEUED  = 0x80  // already queued in queue, or border
 };
 struct los_info
 {
+  uint8 flags;   // FLG_xxx
+  uint8 culled;  // culled from "tree"
+  uint8 visible;
+  uint8 pad0;
   sint8 xo, yo;  // obscure angle
   sint8 xe, ye;  // angle deviation
-  uint8 culled;  // culled from "tree"
-  uint8 queued;  // already queued
-  uint8 visible;
-  uint8 flags;   // LOS_XI/YI
 };
 // temporary storage for the los algorithm,
 // one los_info for each lightable map space
 static los_info los[MAP_CLIENT_X][MAP_CLIENT_Y];
 enqueue (sint8 dx, sint8 dy, uint8 flags = 0)
 {
   sint8 x = LOS_X0 + dx;
   sint8 y = LOS_Y0 + dy;
-  if (x < 0 || x >= MAP_CLIENT_X) return;
-  if (y < 0 || y >= MAP_CLIENT_Y) return;
   los_info &l = los[x][y];
   l.flags |= flags;
-  if (l.queued)
+  if (l.flags & FLG_QUEUED)
     return;
-  l.queued = 1;
+  l.flags |= FLG_QUEUED;
   queue[q1].x = dx;
   queue[q1].y = dy;
   q1 = (q1 + 1) & (QUEUE_LENGTH - 1);
 // which has been simplified and changed considerably, but
 // still is basically the same algorithm.
 static void
 calculate_los (player *pl)
 {
-  int max_radius = max (pl->ns->mapx, pl->ns->mapy) / 2;
+  {
-  memset (los, 0, sizeof (los));
+    memset (los, 0, sizeof (los));
+    // we keep one line for ourselves, for the border flag
+    // so the client area is actually MAP_CLIENT_(X|Y) - 2
+    int half_x = min (LOS_X0 - 1, pl->ns->mapx / 2);
+    int half_y = min (LOS_Y0 - 1, pl->ns->mapy / 2);
+    // create borders, the corners are not touched
+    for (int dx = -half_x; dx <= half_x; ++dx)
+      los [dx + LOS_X0][LOS_Y0 - (half_y + 1)].flags =
+      los [dx + LOS_X0][LOS_Y0 + (half_y + 1)].flags = FLG_QUEUED;
+    for (int dy = -half_y; dy <= half_y; ++dy)
+      los [LOS_X0 - (half_x + 1)][dy + LOS_Y0].flags =
+      los [LOS_X0 + (half_x + 1)][dy + LOS_Y0].flags = FLG_QUEUED;
+    // now reset the los area and also add blocked flags
+    // which supposedly is faster than doing it inside the
+    // spiral path algorithm below, except when very little
+    // area is visible, in which case it is slower, evening
+    // out los calculation times between large and small los maps.
+    // apply_lights also iterates over this area, maybe these
+    // two passes could be combined somehow.
+    unordered_mapwalk (pl->observe, -half_x, -half_y, half_x, half_y)
+      {
+        los_info &l = los [LOS_X0 + dx][LOS_Y0 + dy];
+        l.flags = m->at (nx, ny).flags () & P_BLOCKSVIEW ? FLG_BLOCKED : 0;
+      }
+  }
   q1 = 0; q2 = 0; // initialise queue, not strictly required
   enqueue (0, 0); // enqueue center
   // treat the origin specially
       q2 = (q2 + 1) & (QUEUE_LENGTH - 1);
       sint8 x = LOS_X0 + dx;
       sint8 y = LOS_Y0 + dy;
-      //int distance = idistance (dx, dy); if (distance > max_radius) continue;//D
-      int distance = 0;//D
       los_info &l = los[x][y];
-      if (expect_true (l.flags & (LOS_XI | LOS_YI)))
+      if (expect_true (l.flags & (FLG_XI | FLG_YI)))
         {
           l.culled = 1;
+          l.xo = l.yo = l.xe = l.ye = 0;
           // check contributing spaces, first horizontal
-          if (expect_true (l.flags & LOS_XI))
+          if (expect_true (l.flags & FLG_XI))
             {
               los_info *xi = &los[x - sign (dx)][y];
 	      // don't cull unless obscured
               l.culled &= !xi->visible;
 		    }
                 }
             }
           // check contributing spaces, last vertical, identical structure
-          if (expect_true (l.flags & LOS_YI))
+          if (expect_true (l.flags & FLG_YI))
             {
               los_info *yi = &los[x][y - sign (dy)];
 	      // don't cull unless obscured
               l.culled &= !yi->visible;
                       l.xo = yi->xo;
 		    }
                 }
             }
-          // check whether this space blocks the view
+          if (l.flags & FLG_BLOCKED)
-          maptile *m = pl->observe->map;
-          sint16 nx = pl->observe->x + dx;
-          sint16 ny = pl->observe->y + dy;
-          if (expect_true (!xy_normalise (m, nx, ny))
-              || expect_false (m->at (nx, ny).flags () & P_BLOCKSVIEW))
             {
               l.xo = l.xe = abs (dx);
               l.yo = l.ye = abs (dy);
               // we obscure dependents, but might be visible
               // copy the los from the square towards the player,
               // so outward diagonal corners are lit.
               pl->los[x][y] = los[x - sign0 (dx)][y - sign0 (dy)].visible ? 0 : LOS_BLOCKED;
               l.visible = false;
             }
           else
             {
               // we are not blocked, so calculate visibility, by checking
               // whether we are inside or outside the shadow
               l.visible = (l.xe <= 0 || l.xe > l.xo)
                        && (l.ye <= 0 || l.ye > l.yo);
               pl->los[x][y] = l.culled  ? LOS_BLOCKED
-                            : l.visible ? max (0, 2 - max_radius + distance)
+                            : l.visible ? 0
                                         : 3;
             }
         }
       // Expands by the unit length in each component's current direction.
       // If a component has no direction, then it is expanded in both of its
       // positive and negative directions.
       if (!l.culled)
         {
-          if (dx >= 0) enqueue (dx + 1, dy, LOS_XI);
+          if (dx >= 0) enqueue (dx + 1, dy, FLG_XI);
-          if (dx <= 0) enqueue (dx - 1, dy, LOS_XI);
+          if (dx <= 0) enqueue (dx - 1, dy, FLG_XI);
-          if (dy >= 0) enqueue (dx, dy + 1, LOS_YI);
+          if (dy >= 0) enqueue (dx, dy + 1, FLG_YI);
-          if (dy <= 0) enqueue (dx, dy - 1, LOS_YI);
+          if (dy <= 0) enqueue (dx, dy - 1, FLG_YI);
 	}
     }
 }
 /* returns true if op carries one or more lights
   return 0;
 }
 /* radius, distance => lightness adjust */
 static sint8 light_atten[MAX_LIGHT_RADIUS * 2 + 1][MAX_LIGHT_RADIUS * 3 / 2 + 1];
-static sint8 vision_atten[MAX_DARKNESS + 1][MAX_DARKNESS * 3 / 2 + 1];
+static sint8 vision_atten[MAX_DARKNESS + SEE_IN_DARK_RADIUS + 1][(MAX_DARKNESS + SEE_IN_DARK_RADIUS) * 3 / 2 + 1];
 static struct los_init
 {
   los_init ()
   {
+    assert (("QUEUE_LENGTH, MAP_CLIENT_X and MAP_CLIENT_Y *must* be powers of two",
+             !(QUEUE_LENGTH & (QUEUE_LENGTH - 1))));
     /* for lights */
     for (int radius = -MAX_LIGHT_RADIUS; radius <= MAX_LIGHT_RADIUS; ++radius)
       for (int distance = 0; distance <= MAX_LIGHT_RADIUS * 3 / 2; ++distance)
         {
           // max intensity
             ? min (3, intensity)
             : LOS_MAX - intensity;
         }
     /* for general vision */
-    for (int radius = 0; radius <= MAX_DARKNESS; ++radius)
+    for (int radius = 0; radius <= MAX_DARKNESS + SEE_IN_DARK_RADIUS; ++radius)
-      for (int distance = 0; distance <= MAX_DARKNESS * 3 / 2; ++distance)
+      for (int distance = 0; distance <= (MAX_DARKNESS + SEE_IN_DARK_RADIUS) * 3 / 2; ++distance)
-        {
-          vision_atten [radius][distance] = distance <= radius ? 3 : 4;
+        vision_atten [radius][distance] = distance <= radius ? 3 : 4;
-        }
   }
 } los_init;
 sint8
 los_brighten (sint8 b, sint8 l)
 apply_lights (player *pl)
 {
   object *op = pl->observe;
   int darklevel = op->map->darklevel ();
-  /* If the player can see in the dark, lower the darklevel for him */
-  if (op->flag [FLAG_SEE_IN_DARK])
-    darklevel = max (0, darklevel - 2);
   int half_x = pl->ns->mapx / 2;
   int half_y = pl->ns->mapy / 2;
-  int min_x = op->x - half_x - MAX_LIGHT_RADIUS;
-  int min_y = op->y - half_y - MAX_LIGHT_RADIUS;
-  int max_x = op->x + half_x + MAX_LIGHT_RADIUS;
-  int max_y = op->y + half_y + MAX_LIGHT_RADIUS;
   int pass2 = 0; // negative lights have an extra pass
+  maprect *rects = pl->observe->map->split_to_tiles (
+    pl->observe->x - half_x - MAX_LIGHT_RADIUS,
+    pl->observe->y - half_y - MAX_LIGHT_RADIUS,
+    pl->observe->x + half_x + MAX_LIGHT_RADIUS + 1,
+    pl->observe->y + half_y + MAX_LIGHT_RADIUS + 1
+  );
   if (!darklevel)
     pass2 = 1;
   else
     {
       /* first, make everything totally dark */
       for (int dx = -half_x; dx <= half_x; dx++)
         for (int dy = -half_x; dy <= half_y; dy++)
-          if (pl->los[dx + LOS_X0][dy + LOS_Y0] != LOS_BLOCKED)
-            pl->los[dx + LOS_X0][dy + LOS_Y0] = LOS_MAX;
+          max_it (pl->los[dx + LOS_X0][dy + LOS_Y0], LOS_MAX);
       /*
        * Only process the area of interest.
        * the basex, basey values represent the position in the op->contr->los
        * array. Its easier to just increment them here (and start with the right
        * value) than to recalculate them down below.
        */
-      for (int x = min_x; x <= max_x; x++)
+      for (maprect *r = rects; r->m; ++r)
-        for (int y = min_y; y <= max_y; y++)
+        rect_mapwalk (r, 0, 0)
           {
-            maptile *m = pl->observe->map;
-            sint16 nx = x;
-            sint16 ny = y;
-            if (!xy_normalise (m, nx, ny))
-              continue;
             mapspace &ms = m->at (nx, ny);
             ms.update ();
             sint8 light = ms.light;
             if (expect_false (light))
               if (light < 0)
                 pass2 = 1;
               else
-                apply_light<los_brighten> (pl, x - op->x, y - op->y, light, light_atten [light + MAX_LIGHT_RADIUS]);
+                apply_light<los_brighten> (pl, dx - pl->observe->x, dy - pl->observe->y, light, light_atten [light + MAX_LIGHT_RADIUS]);
           }
       /* grant some vision to the player, based on the darklevel */
       {
         int light = clamp (MAX_DARKNESS - darklevel, 0, MAX_DARKNESS);
+        /* If the player can see in the dark, lower the darklevel for him */
+        if (op->flag [FLAG_SEE_IN_DARK])
+          light += SEE_IN_DARK_RADIUS;
         apply_light<los_brighten> (pl, 0, 0, light, vision_atten [light]);
       }
     }
   // possibly do 2nd pass for rare negative glow radii
   // for effect, those are always considered to be stronger than anything else
   // but they can't darken a place completely
   if (pass2)
-    for (int x = min_x; x <= max_x; x++)
+    for (maprect *r = rects; r->m; ++r)
-      for (int y = min_y; y <= max_y; y++)
+      rect_mapwalk (r, 0, 0)
         {
-          maptile *m = pl->observe->map;
-          sint16 nx = x;
-          sint16 ny = y;
-          if (!xy_normalise (m, nx, ny))
-            continue;
           mapspace &ms = m->at (nx, ny);
           ms.update ();
           sint8 light = ms.light;
           if (expect_false (light < 0))
-            apply_light<los_darken> (pl, x - op->x, y - op->y, -light, light_atten [light + MAX_LIGHT_RADIUS]);
+            apply_light<los_darken> (pl, dx - pl->observe->x, dy - pl->observe->y, -light, light_atten [light + MAX_LIGHT_RADIUS]);
         }
 }
 /* blinded_sight() - sets all viewable squares to blocked except
  * for the one the central one that the player occupies.  A little
 player::update_los ()
 {
   if (ob->flag [FLAG_REMOVED])//D really needed?
     return;
-  clear_los ();
   if (ob->flag [FLAG_WIZLOOK])
-    memset (los, 0, sizeof (los));
+    clear_los (0);
   else if (observe->flag [FLAG_BLIND])      /* player is blind */
+    {
+      clear_los ();
-    blinded_sight (this);
+      blinded_sight (this);
+    }
   else
     {
+      clear_los ();
       calculate_los (this);
       apply_lights (this);
     }
   if (observe->flag [FLAG_XRAYS])
     for (int dx = -2; dx <= 2; dx++)
       for (int dy = -2; dy <= 2; dy++)
-        min_it (los[dx + LOS_X0][dy + LOS_X0], 1);
+        min_it (los[dx + LOS_X0][dy + LOS_Y0], 1);
 }
 /* update all_map_los is like update_all_los below,
  * but updates everyone on the map, no matter where they
  * are. This generally should not be used, as a per
 {
   for_all_players (pl)
     if (pl->ob->map == op->map &&
         pl->ob->y - pl->ns->mapy / 2 <= op->y &&
         pl->ob->y + pl->ns->mapy / 2 >= op->y && pl->ob->x - pl->ns->mapx / 2 <= op->x && pl->ob->x + pl->ns->mapx / 2 >= op->x)
-      pl->los[op->x - pl->ob->x + LOS_X0][op->y - pl->ob->y + LOS_X0] = 0;
+      pl->los[op->x - pl->ob->x + LOS_X0][op->y - pl->ob->y + LOS_Y0] = 0;
 }
 /*
  * make_sure_not_seen: The object which is supposed to be visible through
  * walls has just been removed from the map, so update the los of any
     if (pl->ob->map == op->map &&
         pl->ob->y - pl->ns->mapy / 2 <= op->y &&
         pl->ob->y + pl->ns->mapy / 2 >= op->y && pl->ob->x - pl->ns->mapx / 2 <= op->x && pl->ob->x + pl->ns->mapx / 2 >= op->x)
       pl->do_los = 1;
 }

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.48 by root, Tue Dec 23 06:58:23 2008 UTC vs. Revision 1.52 by root, Fri Dec 26 10:36:42 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.48 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.52 by root, Fri Dec 26 10:36:42 2008 UTC