diff options
Diffstat (limited to 'indra/newview/app_settings')
4 files changed, 282 insertions, 196 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 947561d454..ab119e37fa 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13536,335 +13536,288 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> - <key>NavMeshClearRGB</key> + <key>PathfindingNavMeshClear</key> <map> <key>Comment</key> - <string>yay!</string> + <string>Background color</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>0</real> + <real>0</real> + <real>0</real> + <real>1.0</real> </array> </map> - <key>WalkableRGB</key> + <key>PathfindingWalkable</key> <map> <key>Comment</key> - <string>yay!</string> + <string>Walkable color</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>0.0</real> + <real>0.5</real> + <real>0.5</real> + <real>0.5</real> + <real>1.0</real> </array> </map> - <key>WalkableA</key> + <key>PathfindingObstacle</key> <map> <key>Comment</key> - <string>yay!</string> + <string>Obstacle color</string> <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>75</real> - </map> - <key>ObstacleRGB</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>ObstacleA</key> + <key>PathfindingMaterial</key> <map> <key>Comment</key> - <string>yay!</string> + <string>Material volume color</string> <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>75</real> - </map> - <key>MaterialRGB</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> + <key>PathfindingExclusion</key> <map> <key>Comment</key> - <string>yay!</string> + <string>Exclusion volume color</string> <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>75</real> - </map> - <key>ExclusionRGB</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>0.0</real> + <real>1.0</real> + <real>0.01</real> + <real>0.1</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> + <string>Connected edge color</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> + <string>Boundary edge color</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> + <string>Least walkable heat map color</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>1.0</real> <real>0.0</real> + <real>0.07</real> <real>1.0</real> - <real>0.5</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> + <string>Most walkable heat map color</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.93</real> + <real>0.936</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> + <string>Nav mesh color?</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> + <key>PathfindingStarValidColor</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> - <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> + <key>PathfindingStarInvalidColor</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> - <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> - <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> + <key>PathfindingTestPathColor</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> + <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>PathfindingXRayWireframe</key> + <map> + <key>Comment</key> + <string>Render pathfinding xray as a wireframe.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </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>2.3</real> + </map> + <key>PathfindingDisablePermanentObjects</key> <map> <key>Comment</key> @@ -13887,5 +13840,7 @@ <key>Value</key> <integer>0</integer> </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/pathfindingNoNormalV.glsl b/indra/newview/app_settings/shaders/class1/interface/pathfindingNoNormalV.glsl new file mode 100644 index 0000000000..19fa607307 --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/interface/pathfindingNoNormalV.glsl @@ -0,0 +1,42 @@ +/** + * @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; +uniform float alpha_scale; + +void main() +{ + gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); + + vertex_color = vec4(diffuse_color.rgb * tint, diffuse_color.a*alpha_scale); +} + 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..91f252cf1e --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl @@ -0,0 +1,54 @@ +/** + * @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; +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); + + vec3 l1 = vec3(-0.75, 1, 1.0)*0.5; + 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); +} + |