Pathfinding visualization WIP -- add many controls for x-ray render, add lighting, and better combat z-fighting and noise from wireframes and overlays

2 files changed, 89 insertions, 13 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8e2d69ea9b..ed9bcb0380 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13519,7 +13519,7 @@
 	<key>PathfindingNavMeshClear</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Background color</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13535,7 +13535,7 @@
  <key>PathfindingWalkable</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Walkable color</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13551,7 +13551,7 @@
  <key>PathfindingObstacle</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Obstacle color</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13567,7 +13567,7 @@
  <key>PathfindingMaterial</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Material volume color</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13583,7 +13583,7 @@
  <key>PathfindingExclusion</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Exclusion volume color</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13599,7 +13599,7 @@
  <key>PathfindingConnectedEdge</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Connected edge color</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13615,7 +13615,7 @@
  <key>PathfindingBoundaryEdge</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Boundary edge color</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13631,7 +13631,7 @@
  <key>PathfindingHeatColorBase</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Least walkable heat map color</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13647,7 +13647,7 @@
  <key>PathfindingHeatColorMax</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Most walkable heat map color</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13663,7 +13663,7 @@
   <key>PathfindingFaceColor</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Nav mesh color?</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13724,6 +13724,66 @@
         <real>1.0</real>
       </array>
     </map>
+  <key>PathfindingAmbiance</key>
+  <map>
+    <key>Comment</key>
+    <string>Ambiance of lit pathfinding displays.</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.5</real>
+  </map>
+
+  <key>PathfindingXRayTint</key>
+  <map>
+    <key>Comment</key>
+    <string>Amount to darken/lighten x-ray lines in pathfinding display</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.8</real>
+  </map>
+
+  <key>PathfindingXRayOpacity</key>
+  <map>
+    <key>Comment</key>
+    <string>Opacity of xray lines in pathfinding display.</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.25</real>
+  </map>
+
+  <key>PathfindingLineWidth</key>
+  <map>
+    <key>Comment</key>
+    <string>Width of volume outlines in pathfinding display.</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>2.0</real>
+  </map>
+
+  <key>PathfindingLineOffset</key>
+  <map>
+    <key>Comment</key>
+    <string>Depth offset of volume outlines in pathfinding display.</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>1.6</real>
+  </map>
+
   <key>PathfindingDisablePermanentObjects</key>
   <map>
     <key>Comment</key>
@@ -13746,5 +13806,7 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
- </map>
+  
+
+</map>
 </llsd>
diff --git a/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl b/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl
index dc9fefd156..31e878ebc6 100644
--- a/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl
@@ -27,14 +27,28 @@ uniform mat4 modelview_projection_matrix;
 
 ATTRIBUTE vec3 position;
 ATTRIBUTE vec4 diffuse_color;
+ATTRIBUTE vec3 normal;
 
 VARYING vec4 vertex_color;
 
 uniform float tint;
-
+uniform float ambiance;
+uniform float alpha_scale;
+ 
 void main()
 {
 	gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0);
-	vertex_color = diffuse_color * tint;
+
+	vec3 l1 = vec3(-0.75, 1, 1.0);
+	vec3 l2 = vec3(0.5, -0.6, 0.4)*0.25;
+	vec3 l3 = vec3(0.5, -0.8, 0.3)*0.5;
+
+	float lit = max(dot(normal, l1), 0.0);
+	lit += max(dot(normal, l2), 0.0);
+	lit += max(dot(normal, l3), 0.0);
+
+	lit = clamp(lit, ambiance, 1.0);
+	
+	vertex_color = vec4(diffuse_color.rgb * tint * lit, diffuse_color.a*alpha_scale);
 }