summaryrefslogtreecommitdiff
path: root/digital/io-hub/src/common-cc/path.hh
diff options
context:
space:
mode:
authorOlivier Lanneluc2013-04-16 01:35:50 +0200
committerNicolas Schodet2013-04-27 00:20:31 +0200
commitbda9896e4205537fbf5d124e36f8ca27e9665292 (patch)
tree21d387a112ee6bd8200bdf2b28d125c8adbf4f61 /digital/io-hub/src/common-cc/path.hh
parent89880e703e7b92e2b50c4a72d69f7fa12400bc14 (diff)
Rename "points[]" and associated variables into "navpoints[]"
Diffstat (limited to 'digital/io-hub/src/common-cc/path.hh')
-rw-r--r--digital/io-hub/src/common-cc/path.hh18
1 files changed, 9 insertions, 9 deletions
diff --git a/digital/io-hub/src/common-cc/path.hh b/digital/io-hub/src/common-cc/path.hh
index 53bae657..54822e22 100644
--- a/digital/io-hub/src/common-cc/path.hh
+++ b/digital/io-hub/src/common-cc/path.hh
@@ -74,15 +74,15 @@ class Path
/** Number of possible obstacles. */
static const int PATH_OBSTACLES_NB = (4+1/*cake*/);
/** Number of points per standard obstacle. */
- static const int PATH_OBSTACLES_POINTS_NB = 8;
+ static const int PATH_OBSTACLES_NAVPOINTS_NB = 8;
/** Number of points for the cake */
- static const int PATH_CAKE_POINTS_NB = 14;
+ static const int PATH_CAKE_NAVPOINTS_NB = 14;
/** Number of reserved points for the 2 endpoints */
- static const int PATH_RESERVED_POINTS_NB = 2;
+ static const int PATH_RESERVED_NAVPOINTS_NB = 2;
/** Number of points. */
- static const int PATH_POINTS_NB = (PATH_RESERVED_POINTS_NB +
- (PATH_OBSTACLES_NB * PATH_OBSTACLES_POINTS_NB) +
- (PATH_CAKE_POINTS_NB - PATH_OBSTACLES_POINTS_NB));
+ static const int PATH_NAVPOINTS_NB = (PATH_RESERVED_NAVPOINTS_NB +
+ (PATH_OBSTACLES_NB * PATH_OBSTACLES_NAVPOINTS_NB) +
+ (PATH_CAKE_NAVPOINTS_NB - PATH_OBSTACLES_NAVPOINTS_NB));
/** Borders, any point outside borders is eliminated. */
const uint16_t border_xmin, border_ymin, border_xmax, border_ymax;
@@ -93,11 +93,11 @@ class Path
/** Number of obstacles */
int obstacles_nb;
/** List of navigation points coordonates */
- vect_t points[PATH_POINTS_NB];
+ vect_t navpoints[PATH_NAVPOINTS_NB];
/** Number of navigation points */
- int points_nb;
+ int navpoints_nb;
/** List of nodes used for A*. */
- struct astar_node_t astar_nodes[PATH_POINTS_NB];
+ struct astar_node_t astar_nodes[PATH_NAVPOINTS_NB];
/** Which node to look at for next step. */
int next_node;
/** TRUE when a path has been found */