From 2cd321eaa9b9b9872318ce3977acd9a2f782872f Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 26 Jun 2012 14:09:07 -0700 Subject: Updating the pathfinding-specific settings with appropriate comments and an unified naming scheme. --- indra/newview/app_settings/settings.xml | 44 +++++++++++++-------------- indra/newview/llfloaterpathfindingconsole.cpp | 6 ++-- indra/newview/llpathfindingnavmeshzone.cpp | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f144e9f007..0f3ae89fa8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13595,10 +13595,10 @@ Value 0 - RetrieveNeighboringRegion + PathfindingRetrieveNeighboringRegion Comment - Download a neighboring region when visualize a navmesh (default val 99 is for the current region). + Download a neighboring region when visualizing a pathfinding navmesh (default val 99 means do not download neighbors). Persist 1 Type @@ -13609,7 +13609,7 @@ PathfindingNavMeshClear Comment - Background color + Background color when displaying pathfinding navmesh. Persist 0 Type @@ -13625,7 +13625,7 @@ PathfindingWalkable Comment - Walkable color + Color of walkable objects when displaying pathfinding navmesh object types. Persist 0 Type @@ -13641,7 +13641,7 @@ PathfindingObstacle Comment - Obstacle color + Color of static obstacle objects when displaying pathfinding navmesh object types. Persist 0 Type @@ -13657,7 +13657,7 @@ PathfindingMaterial Comment - Material volume color + Color of material volumes when displaying pathfinding navmesh object types. Persist 0 Type @@ -13673,7 +13673,7 @@ PathfindingExclusion Comment - Exclusion volume color + Color of exclusion volumes when displaying pathfinding navmesh object types. Persist 0 Type @@ -13689,7 +13689,7 @@ PathfindingConnectedEdge Comment - Connected edge color + Color of a connected (crossable) edge when displaying pathfinding navmesh. Persist 0 Type @@ -13705,7 +13705,7 @@ PathfindingBoundaryEdge Comment - Boundary edge color + Color of a boundary (non-crossable) edge when displaying pathfinding navmesh. Persist 0 Type @@ -13721,7 +13721,7 @@ PathfindingHeatColorBase Comment - Least walkable heat map color + Color of the least walkable value when displaying the pathfinding navmesh as a heatmap. Persist 0 Type @@ -13737,7 +13737,7 @@ PathfindingHeatColorMax Comment - Most walkable heat map color + Color of the most walkable value when displaying the pathfinding navmesh as a heatmap. Persist 0 Type @@ -13753,7 +13753,7 @@ PathfindingFaceColor Comment - Nav mesh color? + Color of the faces when displaying the default view of the pathfinding navmesh. Persist 0 Type @@ -13766,10 +13766,10 @@ 1.0 - PathfindingStarValidColor + PathfindingTestPathValidEndColor Comment - yay! + Color of the pathfinding test-pathing tool end-point when the path is valid. Persist 0 Type @@ -13782,10 +13782,10 @@ 1.0 - PathfindingStarInvalidColor + PathfindingTestPathInvalidEndColor Comment - yay! + Color of the pathfinding test-pathing tool end-point when the path is invalid. Persist 0 Type @@ -13801,7 +13801,7 @@ PathfindingTestPathColor Comment - yay! + Color of the pathfinding test-path when the path is valid. Persist 0 Type @@ -13817,7 +13817,7 @@ PathfindingAmbiance Comment - Ambiance of lit pathfinding displays. + Ambiance of lit pathfinding navmesh displays. Persist 0 Type @@ -13829,7 +13829,7 @@ PathfindingXRayTint Comment - Amount to darken/lighten x-ray lines in pathfinding display + Amount to darken/lighten x-ray lines in pathfinding display. Persist 0 Type @@ -13853,7 +13853,7 @@ PathfindingXRayWireframe Comment - Render pathfinding xray as a wireframe. + Render pathfinding navmesh xray as a wireframe. Persist 0 Type @@ -13865,7 +13865,7 @@ PathfindingLineWidth Comment - Width of volume outlines in pathfinding display. + Width of volume outlines in pathfinding navmesh display. Persist 0 Type @@ -13922,7 +13922,7 @@ PathfindingWaterColor Comment - yay! + Color of water plane when displaying pathfinding navmesh. Persist 0 Type diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index 2cf7f3aeb1..c2d19bfb9a 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -70,7 +70,7 @@ #define SET_SHAPE_RENDER_FLAG(_flag,_type) _flag |= (1U << _type) -#define CONTROL_NAME_RETRIEVE_NEIGHBOR "RetrieveNeighboringRegion" +#define CONTROL_NAME_RETRIEVE_NEIGHBOR "PathfindingRetrieveNeighboringRegion" #define CONTROL_NAME_WALKABLE_OBJECTS "PathfindingWalkable" #define CONTROL_NAME_STATIC_OBSTACLE_OBJECTS "PathfindingObstacle" #define CONTROL_NAME_MATERIAL_VOLUMES "PathfindingMaterial" @@ -80,8 +80,8 @@ #define CONTROL_NAME_HEATMAP_MIN "PathfindingHeatColorBase" #define CONTROL_NAME_HEATMAP_MAX "PathfindingHeatColorMax" #define CONTROL_NAME_NAVMESH_FACE "PathfindingFaceColor" -#define CONTROL_NAME_TEST_PATH_VALID_END "PathfindingStarValidColor" -#define CONTROL_NAME_TEST_PATH_INVALID_END "PathfindingStarInvalidColor" +#define CONTROL_NAME_TEST_PATH_VALID_END "PathfindingTestPathValidEndColor" +#define CONTROL_NAME_TEST_PATH_INVALID_END "PathfindingTestPathInvalidEndColor" #define CONTROL_NAME_TEST_PATH "PathfindingTestPathColor" #define CONTROL_NAME_WATER "PathfindingWaterColor" diff --git a/indra/newview/llpathfindingnavmeshzone.cpp b/indra/newview/llpathfindingnavmeshzone.cpp index d8670062e9..ee81762792 100644 --- a/indra/newview/llpathfindingnavmeshzone.cpp +++ b/indra/newview/llpathfindingnavmeshzone.cpp @@ -71,7 +71,7 @@ void LLPathfindingNavMeshZone::initialize() NavMeshLocationPtr centerNavMeshPtr(new NavMeshLocation(CENTER_REGION, boost::bind(&LLPathfindingNavMeshZone::handleNavMeshLocation, this))); mNavMeshLocationPtrs.push_back(centerNavMeshPtr); - U32 neighborRegionDir = gSavedSettings.getU32("RetrieveNeighboringRegion"); + U32 neighborRegionDir = gSavedSettings.getU32("PathfindingRetrieveNeighboringRegion"); if (neighborRegionDir != CENTER_REGION) { NavMeshLocationPtr neighborNavMeshPtr(new NavMeshLocation(neighborRegionDir, boost::bind(&LLPathfindingNavMeshZone::handleNavMeshLocation, this))); -- cgit v1.2.3