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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.65 by root, Wed Nov 4 18:17:57 2009 UTC vs.
Revision 1.78 by root, Wed Dec 5 19:03:26 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <cmath>
   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
 };
+// it is important for performance reasons that this structure
+// has a size easily computable by the cpu (*8 is perfect).
+// it is possible to move culled and visible into flags, at
+// some speed loss.
 struct los_info
 {
   uint8 flags;   // FLG_xxx
   uint8 culled;  // culled from "tree"
   uint8 visible;
 // temporary storage for the los algorithm,
 // one los_info for each lightable map space
 static los_info los[MAP_CLIENT_X][MAP_CLIENT_Y];
-struct point
+struct point8
 {
   sint8 x, y;
 };
 // minimum size, but must be a power of two
 #define QUEUE_LENGTH ((MAP_CLIENT_X + MAP_CLIENT_Y) * 2)
 // a queue of spaces to calculate
-static point queue [QUEUE_LENGTH];
+static point8 queue [QUEUE_LENGTH];
 static int q1, q2; // queue start, end
 /*
  * Clears/initialises the los-array associated to the player
  * controlling the object.
   los_info &l = los[x][y];
   l.flags |= flags;
-  if (l.flags & FLG_QUEUED)
+  if (ecb_expect_false (l.flags & FLG_QUEUED))
     return;
   l.flags |= FLG_QUEUED;
   queue[q1].x = dx;
     // spiral path algorithm below, except when very little
     // area is visible, in which case it is slower. which evens
     // 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->viewpoint, -half_x, -half_y, half_x, half_y)
+    unordered_mapwalk (mapwalk_buf, pl->viewpoint, -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;
       }
   }
       sint8 x = LOS_X0 + dx;
       sint8 y = LOS_Y0 + dy;
       los_info &l = los[x][y];
-      if (expect_true (l.flags & (FLG_XI | FLG_YI)))
+      if (ecb_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 & FLG_XI))
+          if (ecb_expect_true (l.flags & FLG_XI))
             {
               los_info *xi = &los[x - sign (dx)][y];
 	      // don't cull unless obscured
               l.culled &= !xi->visible;
               /* merge input space */
-              if (expect_false (xi->xo || xi->yo))
+              if (ecb_expect_false (xi->xo || xi->yo))
                 {
 	          // The X input can provide two main pieces of information:
 	          // 1. Progressive X obscurity.
 	          // 2. Recessive Y obscurity.
 	          // Progressive X obscurity, favouring recessive input angle
 	          if (xi->xe > 0 && l.xo == 0)
 		    }
                 }
             }
           // check contributing spaces, last vertical, identical structure
-          if (expect_true (l.flags & FLG_YI))
+          if (ecb_expect_true (l.flags & FLG_YI))
             {
               los_info *yi = &los[x][y - sign (dy)];
 	      // don't cull unless obscured
               l.culled &= !yi->visible;
               /* merge input space */
-              if (expect_false (yi->yo || yi->xo))
+              if (ecb_expect_false (yi->yo || yi->xo))
                 {
 	          // The Y input can provide two main pieces of information:
 	          // 1. Progressive Y obscurity.
 	          // 2. Recessive X obscurity.
 	          // Progressive Y obscurity, favouring recessive input angle
 	          if (yi->ye > 0 && l.yo == 0)
             }
         }
       // 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, FLG_XI);
           if (dx <= 0) enqueue (dx - 1, dy, FLG_XI);
       for (int distance = 0; distance <= MAX_VISION * 3 / 2; ++distance)
         vision_atten [radius][distance] = distance <= radius ? clamp (lerp (radius, 0, MAX_DARKNESS, 3, 0), 0, 3) : 4;
   }
 } los_init;
+// the following functions cannot be static, due to c++ stupidity :/
+namespace {
-// brighten area, ignore los
+  // brighten area, ignore los
-sint8
+  sint8
-los_brighten_nolos (sint8 b, sint8 l)
+  los_brighten_nolos (sint8 b, sint8 l)
-{
+  {
-  return min (b, l);
+    return min (b, l);
-}
+  }
-// brighten area, but respect los
+  // brighten area, but respect los
-sint8
+  sint8
-los_brighten (sint8 b, sint8 l)
+  los_brighten (sint8 b, sint8 l)
-{
+  {
-  return b == LOS_BLOCKED ? b : min (b, l);
+    return b == LOS_BLOCKED ? b : min (b, l);
-}
+  }
-// darken area, respect los
+  // darken area, respect los
-sint8
+  sint8
-los_darken (sint8 b, sint8 l)
+  los_darken (sint8 b, sint8 l)
-{
+  {
-  return max (b, l);
+    return max (b, l);
-}
+  }
+};
 template<sint8 change_it (sint8, sint8)>
 static void
 apply_light (player *pl, int dx, int dy, int light, const sint8 *atten_table)
 {
     for (int ay = ay0; ay <= ay1; ay++)
       pl->los[ax][ay] =
         change_it (pl->los[ax][ay], atten_table [idistance (ax - dx, ay - dy)]);
 }
 /* add light, by finding all (non-null) nearby light sources, then
  * mark those squares specially.
  */
 static void
 apply_lights (player *pl)
 {
   int half_y = pl->ns->mapy / 2;
   int pass2 = 0; // negative lights have an extra pass
   maprect *rects = pl->viewpoint->map->split_to_tiles (
+    mapwalk_buf,
     pl->viewpoint->x - half_x - MAX_LIGHT_RADIUS,
     pl->viewpoint->y - half_y - MAX_LIGHT_RADIUS,
     pl->viewpoint->x + half_x + MAX_LIGHT_RADIUS + 1,
     pl->viewpoint->y + half_y + MAX_LIGHT_RADIUS + 1
   );
           {
             mapspace &ms = m->at (nx, ny);
             ms.update ();
             sint8 light = ms.light;
-            if (expect_false (light))
+            if (ecb_expect_false (light))
               if (light < 0)
                 pass2 = 1;
               else
                 {
                   light = clamp (light + bonus, 0, MAX_LIGHT_RADIUS);
         {
           mapspace &ms = m->at (nx, ny);
           ms.update ();
           sint8 light = ms.light;
-          if (expect_false (light < 0))
+          if (ecb_expect_false (light < 0))
             {
               light = clamp (light - bonus, 0, MAX_DARKNESS);
               apply_light<los_darken> (pl, dx - pl->viewpoint->x, dy - pl->viewpoint->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
  * odd that you can see yourself (and what your standing on), but
  * really need for any reasonable game play.
  */
 static void
       if (!pl->ob || !pl->ob->map || !pl->ns)
         continue;
       rv_vector rv;
-      get_rangevector_from_mapcoord (map, x, y, pl->ob, &rv);
+      get_rangevector_from_mapcoord (pl->ob->map, x, y, pl->ob, &rv);
       if ((abs (rv.distance_x) <= pl->ns->mapx / 2) && (abs (rv.distance_y) <= pl->ns->mapy / 2))
         pl->do_los = 1;
     }
 }

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.65 by root, Wed Nov 4 18:17:57 2009 UTC vs. Revision 1.78 by root, Wed Dec 5 19:03:26 2018 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.65 by root, Wed Nov 4 18:17:57 2009 UTC vs.
Revision 1.78 by root, Wed Dec 5 19:03:26 2018 UTC