Cleaner render of walkables and materials. Convert Vector3 color parameters to Color4.

3 files changed, 134 insertions, 178 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1d616a76fb..d18df2d9b2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13516,332 +13516,213 @@
       <key>Value</key>
 	  <integer>0</integer>
     </map>
-	<key>NavMeshClearRGB</key>
+	<key>PathfindingNavMeshClear</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
         <real>0.5</real>
         <real>0.5</real>
         <real>0.5</real>
+        <real>1.0</real>
       </array>
     </map>
- <key>WalkableRGB</key>
+ <key>PathfindingWalkable</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
         <real>0.0</real>
-        <real>255.0</real>
+        <real>1.0</real>
         <real>0.0</real>
+        <real>0.3</real>
       </array>
     </map>
- <key>WalkableA</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>75</real>
-    </map>	
-	<key>ObstacleRGB</key>
+ <key>PathfindingObstacle</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>255.0</real>
+        <real>1.0</real>
         <real>0.0</real>
         <real>0.0</real>
+        <real>0.3</real>
       </array>
     </map>
- <key>ObstacleA</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>75</real>
-    </map>	
-	<key>MaterialRGB</key>
+ <key>PathfindingMaterial</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>128.0</real>
+        <real>0.5</real>
         <real>0.0</real>
-        <real>255.0</real>
+        <real>1.0</real>
+        <real>0.3</real>
       </array>
     </map>
- <key>MaterialA</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>75</real>
-    </map>	
-	<key>ExclusionRGB</key>
+ <key>PathfindingExclusion</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>255.0</real>
-        <real>255.0</real>
+        <real>1.0</real>
+        <real>1.0</real>
         <real>0.0</real>
+        <real>0.3</real>
       </array>
     </map>
- <key>ExclusionA</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>75</real>
-    </map>	
-<key>ConnectedEdgeRGB</key>
+ <key>PathfindingConnectedEdge</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>220.0</real>
-        <real>220.0</real>
-        <real>220.0</real>
+        <real>0.86</real>
+        <real>0.86</real>
+        <real>0.86</real>
+        <real>1.0</real>
       </array>
     </map>
- <key>ConnectedEdgeA</key>
+ <key>PathfindingBoundaryEdge</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>255</real>
-    </map>	
-<key>BoundaryEdgeRGB</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>255.0</real>
+        <real>1.0</real>
         <real>0.0</real>
         <real>0.0</real>
+        <real>1.0</real>
       </array>
     </map>
- <key>BoundaryEdgeA</key>
+ <key>PathfindingHeatColorBase</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>255</real>
-    </map>	
-<key>HeatColorBase</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
         <real>0.0</real>
         <real>1.0</real>
         <real>0.5</real>
+        <real>1.0</real>
       </array>
     </map>
- <key>HeatColorBaseA</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>1.0</real>
-    </map>	
-<key>HeatColorMax</key>
+ <key>PathfindingHeatColorMax</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
         <real>0.0</real>
         <real>1.0</real>
         <real>1.0</real>
+        <real>1.0</real>
       </array>
     </map>
- <key>HeatColorMaxA</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>1.0</real>
-    </map>		
-	 <key>FaceColorRGB</key>
+  <key>PathfindingFaceColor</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>255.0</real>
-        <real>255.0</real>
-        <real>255.0</real>
+        <real>1.0</real>
+        <real>1.0</real>
+        <real>1.0</real>
+        <real>1.0</real>
       </array>
     </map>
- <key>FaceColorA</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>255</real>
-    </map>	
-	 <key>StarValidColorRGB</key>
+ 	 <key>PathfindingStarValidColor</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>200.0</real>
-        <real>120.0</real>
+        <real>0.78</real>
+        <real>0.47</real>
         <real>0.0</real>
+        <real>1.0</real>
       </array>
     </map>
- <key>StarValidColorA</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>255</real>
-    </map>	
-     <key>StarInvalidRGB</key>
+     <key>PathfindingStarInvalidColor</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>255.0</real>
+        <real>1.0</real>
         <real>0.0</real>
-        <real>255.0</real>
+        <real>1.0</real>
+        <real>1.0</real>
       </array>
     </map>
- <key>StarInvalidA</key>
+	 <key>PathfindingTestPathColor</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>255</real>
-    </map>	
-	 <key>TestPathColorRGB</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Vector3</string>
+      <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>255.0</real>
-        <real>150.0</real>
+        <real>1.0</real>
+        <real>0.59</real>
         <real>0.0</real>
+        <real>1.0</real>
       </array>
     </map>
- <key>TestPathColorA</key>
-    <map>
-      <key>Comment</key>
-      <string>yay!</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>255</real>
-    </map>		
-</map>
+ </map>
 </llsd>
diff --git a/indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl b/indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl
new file mode 100644
index 0000000000..40605bee78
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl
@@ -0,0 +1,35 @@
+/** 
+ * @file pathfindingF.glsl
+ *
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2007, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifdef DEFINE_GL_FRAGCOLOR
+out vec4 gl_FragColor;
+#endif
+
+VARYING vec4 vertex_color;
+
+void main() 
+{
+	gl_FragColor = vertex_color;
+}
diff --git a/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl b/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl
new file mode 100644
index 0000000000..dc9fefd156
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl
@@ -0,0 +1,40 @@
+/** 
+ * @file pathfindingV.glsl
+ *
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2007, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+uniform mat4 modelview_projection_matrix;
+
+ATTRIBUTE vec3 position;
+ATTRIBUTE vec4 diffuse_color;
+
+VARYING vec4 vertex_color;
+
+uniform float tint;
+
+void main()
+{
+	gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0);
+	vertex_color = diffuse_color * tint;
+}
+