From 98a8057bdc661394e362ebd5c3f3f26d92dac12f Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 13 Dec 2011 17:39:39 -0800 Subject: Introducing the initial hooks for building a pathfinding console floater. --- indra/newview/app_settings/commands.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index a44b895f7b..808c92351a 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -145,6 +145,16 @@ is_running_function="Floater.IsOpen" is_running_parameters="people" /> + Date: Thu, 15 Dec 2011 10:31:25 -0800 Subject: Introducing the initial hooks for building the pathfinding linkset floater. --- indra/newview/app_settings/commands.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 808c92351a..5d970c06e2 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -145,7 +145,7 @@ is_running_function="Floater.IsOpen" is_running_parameters="people" /> - + Date: Fri, 16 Dec 2011 11:06:36 -0800 Subject: Moving the pathfinding console link into the toolbar under the Build menu. --- indra/newview/app_settings/commands.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 5d970c06e2..b373ec0807 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -146,7 +146,7 @@ is_running_parameters="people" /> Date: Wed, 1 Feb 2012 18:14:04 -0800 Subject: Renaming the XUI files for the pathfinding console to setup. --- indra/newview/app_settings/commands.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 22dc336399..7d42f237b1 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -155,15 +155,15 @@ is_running_function="Floater.IsOpen" is_running_parameters="people" /> - Date: Thu, 2 Feb 2012 18:30:35 -0800 Subject: PATH-245: First pass at laying out the characters floater. Functionality is mostly stubbed in. The data is currently tied to the same cap service as the linkset data, so that will need to change as soon as the new service is available. --- indra/newview/app_settings/commands.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 7d42f237b1..4ff6b6f37d 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -165,6 +165,16 @@ is_running_function="Floater.IsOpen" is_running_parameters="pathfinding_setup" /> + Date: Fri, 10 Feb 2012 17:49:18 -0800 Subject: PATH-284: Updating the class names in preparation for the new pathfinding console design. --- indra/newview/app_settings/commands.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 4ff6b6f37d..e8454f6dad 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -155,15 +155,15 @@ is_running_function="Floater.IsOpen" is_running_parameters="people" /> - Date: Tue, 14 Feb 2012 19:33:33 -0800 Subject: PATH-297: Initial layout and basic implementation for the pathfinding basic floater. --- indra/newview/app_settings/commands.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index e8454f6dad..d3253bc381 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -155,6 +155,16 @@ is_running_function="Floater.IsOpen" is_running_parameters="people" /> + Date: Thu, 16 Feb 2012 15:59:54 -0500 Subject: Path-278 Debug option to download multiple navmeshes to the viewer. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0e26013152..631e45d0ec 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13483,5 +13483,16 @@ Value 0 + RetrieveNeighboringRegion + + Comment + Download a neighboring region when visualize a navmesh (default val 99 is for the current region). + Persist + 1 + Type + U32 + Value + 6 + -- cgit v1.2.3 From 399d0da9ef5802e85894e8d7e6e52e893653e24c Mon Sep 17 00:00:00 2001 From: prep Date: Fri, 17 Feb 2012 11:01:48 -0500 Subject: Path-317: debug option to enable vbo rendering of navmeshes --- indra/newview/app_settings/settings.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 631e45d0ec..331ae02223 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13494,5 +13494,17 @@ Value 6 + EnableVBOForNavMeshVisualization + + Comment + Enable the use of VBOs for navmesh visualization. + Persist + 1 + Type + Boolean + Value + 0 + + -- cgit v1.2.3 From f611c10c8cb2db98fa54cd41ef19aced685d1d22 Mon Sep 17 00:00:00 2001 From: prep Date: Tue, 28 Feb 2012 15:54:19 -0500 Subject: Turn off the neighbor region query when loading a navmesh --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 331ae02223..77a76e6bf7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13492,7 +13492,7 @@ Type U32 Value - 6 + 99 EnableVBOForNavMeshVisualization -- cgit v1.2.3 From 901ed57e6bc1fae1c3c0a6f6790c0361298c5744 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 28 Mar 2012 13:11:45 -0400 Subject: Added support for customizing the colors used in the navmesh visualizer. --- indra/newview/app_settings/settings.xml | 249 ++++++++++++++++++++++++++++++++ 1 file changed, 249 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index eb2b0834e9..aac04ae15f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13516,6 +13516,255 @@ Value 0 + NavMeshClearRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 0.0 + 0.0 + 0.0 + + + WalkableRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 255.0 + 255.0 + 255.0 + + + WalkableA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 75 + + ObstacleRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 255.0 + 0.0 + 0.0 + + + ObstacleA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 75 + + MaterialRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 255.0 + 255.0 + 0.0 + + + MaterialA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 75 + + ExclusionRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 255.0 + 0.0 + 0.0 + + + ExclusionA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 75 + +ConnectedEdgeRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 0.0 + 40.0 + 114.0 + + + ConnectedEdgeA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 75 + +BoundaryEdgeRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 170.0 + 0.0 + 0.0 + + + BoundaryEdgeA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 75 + +HeatColorBase + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 0.0 + 40.0 + 114.0 + + + HeatColorBaseA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 75 + +HeatColorMax + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 0.0 + 40.0 + 114.0 + + + HeatColorMaxA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 75 + + FaceColorRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 0.0 + 255.0 + 255.0 + + + FaceColorA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 0 + -- cgit v1.2.3 From 5722c5923cb763a165c50c1d2be426b2e532ea65 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 28 Mar 2012 14:55:55 -0400 Subject: Fixed blend caps for navmesh tris and updated navmesh face alpha to be totally opaque. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index aac04ae15f..37e4a43449 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13763,7 +13763,7 @@ Type F32 Value - 0 + 255 -- cgit v1.2.3 From 3b5b80e037ba6fec0aa3c900feb232207007cd62 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 28 Mar 2012 15:50:49 -0700 Subject: Adding some missing constant names. Most still need documentation. --- indra/newview/app_settings/keywords.ini | 92 +++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 82b43432eb..7a9be77f96 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -558,6 +558,98 @@ STATUS_NOT_SUPPORTED Feature not supported STATUS_INTERNAL_ERROR An internal error occurred STATUS_WHITELIST_FAILED URL failed to pass whitelist +PROFILE_NONE Disables profiling +PROFILE_SCRIPT_MEMORY Enables memory profiling + +RC_DATA_FLAGS TODO: add documentation +RC_DETECT_PHANTOM TODO: add documentation +RC_GET_LINK_NUM TODO: add documentation +RC_GET_NORMAL TODO: add documentation +RC_GET_ROOT_KEY TODO: add documentation +RC_MAX_HITS TODO: add documentation +RC_REJECT_TYPES Optional parameter set in llCastRay() to reject hit against certain object types. +RC_REJECT_AGENTS Bit mask for RC_REJECT_TYPES, rejects hits against avatars. +RC_REJECT_PHYSICAL Bit mask for RC_REJECT_TYPES, rejects hits against moving objects. +RC_REJECT_NONPHYSICAL Bit mask for RC_REJECT_TYPES, rejects hits against non-moving objects. +RC_REJECT_LAND Bit mask for RC_REJECT_TYPES, rejects hits against the terrian. + +RCERR_CAST_TIME_EXCEEDED TODO: add documentation +RCERR_SIM_PERF_LOW TODO: add documentation +RCERR_UNKNOWN TODO: add documentation + +ESTATE_ACCESS_ALLOWED_AGENT_ADD TODO: add documentation +ESTATE_ACCESS_ALLOWED_AGENT_REMOVE TODO: add documentation +ESTATE_ACCESS_ALLOWED_GROUP_ADD TODO: add documentation +ESTATE_ACCESS_ALLOWED_GROUP_REMOVE TODO: add documentation +ESTATE_ACCESS_BANNED_AGENT_ADD TODO: add documentation +ESTATE_ACCESS_BANNED_AGENT_REMOVE TODO: add documentation + +DENSITY TODO: add documentation +FRICTION TODO: add documentation +RESTITUTION TODO: add documentation +GRAVITY_MULTIPLIER TODO: add documentation + +KFM_COMMAND TODO: add documentation +KFM_CMD_PLAY TODO: add documentation +KFM_CMD_STOP TODO: add documentation +KFM_CMD_PAUSE TODO: add documentation +KFM_CMD_SET_MODE TODO: add documentation +KFM_MODE TODO: add documentation +KFM_FORWARD TODO: add documentation +KFM_LOOP TODO: add documentation +KFM_PING_PONG TODO: add documentation +KFM_REVERSE TODO: add documentation +KFM_DATA TODO: add documentation +KFM_ROTATION TODO: add documentation +KFM_TRANSLATION TODO: add documentation + +CHARACTER_CMD_STOP TODO: add documentation +CHARACTER_CMD_JUMP TODO: add documentation + +CHARACTER_DESIRED_SPEED TODO: add documentation +CHARACTER_RADIUS TODO: add documentation +CHARACTER_LENGTH TODO: add documentation +CHARACTER_ORIENTATION TODO: add documentation +CHARACTER_AVOIDANCE_MODE TODO: add documentation +PURSUIT_OFFSET TODO: add documentation +REQUIRE_LINE_OF_SIGHT TODO: add documentation +PURSUIT_FUZZ_FACTOR TODO: add documentation +PURSUIT_INTERCEPT TODO: add documentation +FORCE_DIRECT_PATH TODO: add documentation +VERTICAL TODO: add documentation +HORIZONTAL TODO: add documentation +AVOID_CHARACTERS TODO: add documentation +AVOID_DYNAMIC_OBSTACLES TODO: add documentation + +PU_EVADE_HIDDEN Triggered when an llEvade character thinks it has hidden from its pursuer. +PU_EVADE_SPOTTED Triggered when an llEvade character switches from hiding to running +PU_FAILURE_INVALID_GOAL Goal is not on the navigation-mesh and cannot be reached. +PU_FAILURE_INVALID_START Character cannot navigate from the current location - e.g., the character is off the navmesh or too high above it. +PU_FAILURE_NO_VALID_DESTINATION There's no good place for the character to go - e.g., it is patrolling and all the patrol points are now unreachable. +PU_FAILURE_OTHER Unknown failure +PU_FAILURE_TARGET_GONE Target (for llPursue or llEvade) can no longer be tracked - e.g., it left the region or is an avatar that is now more than about 30m outside the region. +PU_FAILURE_UNREACHABLE Goal is no longer reachable for some reason - e.g., an obstacle blocks the path. +PU_GOAL_REACHED Character has reached the goal and will stop or choose a new goal (if wandering). +PU_SLOWDOWN_DISTANCE_REACHED Character is near current goal. + +CHARACTER_TYPE TODO: add documentation +CHARACTER_TYPE_A TODO: add documentation +CHARACTER_TYPE_B TODO: add documentation +CHARACTER_TYPE_C TODO: add documentation +CHARACTER_TYPE_D TODO: add documentation +CHARACTER_TYPE_NONE TODO: add documentation + +TRAVERSAL_TYPE TODO: add documentation +TRAVERSAL_TYPE_SLOW TODO: add documentation +TRAVERSAL_TYPE_FAST TODO: add documentation +TRAVERSAL_TYPE_NONE TODO: add documentation + +CHARACTER_MAX_ACCEL TODO: add documentation +CHARACTER_MAX_DECEL TODO: add documentation +CHARACTER_MAX_ANGULAR_SPEED TODO: add documentation +CHARACTER_MAX_ANGULAR_ACCEL TODO: add documentation +CHARACTER_TURN_SPEED_MULTIPLIER TODO: add documentation + # string constants [word .1, .3, .5] NULL_KEY Indicates an empty key -- cgit v1.2.3 From f9a0f79838d2431894bd6cc1e244f743e8581ccb Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 28 Mar 2012 18:26:00 -0700 Subject: Updating the navmesh colors based on discussions with Leo. --- indra/newview/app_settings/settings.xml | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 37e4a43449..829a5b75b1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13526,9 +13526,9 @@ Vector3 Value - 0.0 - 0.0 - 0.0 + 0.1960784313725490196078431372549 + 0.1960784313725490196078431372549 + 0.1960784313725490196078431372549 WalkableRGB @@ -13541,9 +13541,9 @@ Vector3 Value + 0.0 255.0 - 255.0 - 255.0 + 0.0 WalkableA @@ -13593,9 +13593,9 @@ Vector3 Value - 255.0 - 255.0 + 128.0 0.0 + 255.0 MaterialA @@ -13620,7 +13620,7 @@ Value 255.0 - 0.0 + 255.0 0.0 @@ -13645,9 +13645,9 @@ Vector3 Value - 0.0 - 40.0 - 114.0 + 220.0 + 220.0 + 220.0 ConnectedEdgeA @@ -13659,7 +13659,7 @@ Type F32 Value - 75 + 255 BoundaryEdgeRGB @@ -13671,7 +13671,7 @@ Vector3 Value - 170.0 + 255.0 0.0 0.0 @@ -13685,7 +13685,7 @@ Type F32 Value - 75 + 255 HeatColorBase @@ -13698,8 +13698,8 @@ Value 0.0 - 40.0 - 114.0 + 1.0 + 0.5 HeatColorBaseA @@ -13711,7 +13711,7 @@ Type F32 Value - 75 + 1.0 HeatColorMax @@ -13724,8 +13724,8 @@ Value 0.0 - 40.0 - 114.0 + 1.0 + 1.0 HeatColorMaxA @@ -13737,7 +13737,7 @@ Type F32 Value - 75 + 1.0 FaceColorRGB -- cgit v1.2.3 From 07f2cc34befae376cf7398650a285be3eced073d Mon Sep 17 00:00:00 2001 From: "Todd Stinson (stinson@lindenlab.com)" Date: Wed, 28 Mar 2012 22:50:46 -0700 Subject: Altering the default navmesh color. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 829a5b75b1..4c673e08db 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13749,7 +13749,7 @@ Vector3 Value - 0.0 + 255.0 255.0 255.0 -- cgit v1.2.3 From 0e7311caa73e598e8a2df626c67a74bdff23446e Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 29 Mar 2012 11:20:32 -0400 Subject: Exposed star(valid/invalid) and test path colors. Refactored path drawing code to use ll f()'s --- indra/newview/app_settings/settings.xml | 79 ++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4c673e08db..9dcf43cd8d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13765,6 +13765,83 @@ Value 255 - + StarValidColorRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 214.0 + 212.0 + 212.0 + + + StarValidColorA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 255 + + StarInvalidRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 255.0 + 0.0 + 255.0 + + + StarInvalidA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 255 + + TestPathColorRGB + + Comment + yay! + Persist + 1 + Type + Vector3 + Value + + 96.0 + 96.0 + 96.0 + + + TestPathColorA + + Comment + yay! + Persist + 1 + Type + F32 + Value + 255 + -- cgit v1.2.3 From e07af906968d3aec49cd04a28d6439bc1759759f Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 29 Mar 2012 12:13:11 -0700 Subject: Updating the test path and universe colors based on Leo's direction. --- indra/newview/app_settings/settings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9dcf43cd8d..1d616a76fb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13526,9 +13526,9 @@ Vector3 Value - 0.1960784313725490196078431372549 - 0.1960784313725490196078431372549 - 0.1960784313725490196078431372549 + 0.5 + 0.5 + 0.5 WalkableRGB @@ -13775,9 +13775,9 @@ Vector3 Value - 214.0 - 212.0 - 212.0 + 200.0 + 120.0 + 0.0 StarValidColorA @@ -13827,9 +13827,9 @@ Vector3 Value - 96.0 - 96.0 - 96.0 + 255.0 + 150.0 + 0.0 TestPathColorA -- cgit v1.2.3 From 32e352ece9e3cc2e20044f621338ec07a2484773 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 30 Mar 2012 16:05:57 -0700 Subject: Adding in some debug functionality to allow permanent and/or character flags on objects to be hidden from the viewer. This enables testing of the server-side enforcement of object rules. --- indra/newview/app_settings/settings.xml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1d616a76fb..8e9a82a77d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13842,6 +13842,28 @@ F32 Value 255 - + + PathfindingDisablePermanentObjects + + Comment + Disables the viewer from seeing the permanent object flag. Useful for testing server-side enforcement of permanent object rules. + Persist + 0 + Type + Boolean + Value + 0 + + PathfindingDisableCharacterObjects + + Comment + Disables the viewer from seeing the character object flag. Useful for testing server-side enforcement of character object rules. + Persist + 0 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From 6e184e33018a5395bfbb2c92812229d115944ab5 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 2 Apr 2012 17:55:04 -0500 Subject: Cleaner render of walkables and materials. Convert Vector3 color parameters to Color4. --- indra/newview/app_settings/settings.xml | 237 +++++---------------- .../shaders/class1/interface/pathfindingF.glsl | 35 +++ .../shaders/class1/interface/pathfindingV.glsl | 40 ++++ 3 files changed, 134 insertions(+), 178 deletions(-) create mode 100644 indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl create mode 100644 indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl (limited to 'indra/newview/app_settings') 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 @@ Value 0 - NavMeshClearRGB + PathfindingNavMeshClear Comment yay! Persist 1 Type - Vector3 + Color4 Value 0.5 0.5 0.5 + 1.0 - WalkableRGB + PathfindingWalkable Comment yay! Persist 1 Type - Vector3 + Color4 Value 0.0 - 255.0 + 1.0 0.0 + 0.3 - WalkableA - - Comment - yay! - Persist - 1 - Type - F32 - Value - 75 - - ObstacleRGB + PathfindingObstacle Comment yay! Persist 1 Type - Vector3 + Color4 Value - 255.0 + 1.0 0.0 0.0 + 0.3 - ObstacleA - - Comment - yay! - Persist - 1 - Type - F32 - Value - 75 - - MaterialRGB + PathfindingMaterial Comment yay! Persist 1 Type - Vector3 + Color4 Value - 128.0 + 0.5 0.0 - 255.0 + 1.0 + 0.3 - MaterialA - - Comment - yay! - Persist - 1 - Type - F32 - Value - 75 - - ExclusionRGB + PathfindingExclusion Comment yay! Persist 1 Type - Vector3 + Color4 Value - 255.0 - 255.0 + 1.0 + 1.0 0.0 + 0.3 - ExclusionA - - Comment - yay! - Persist - 1 - Type - F32 - Value - 75 - -ConnectedEdgeRGB + PathfindingConnectedEdge Comment yay! Persist 1 Type - Vector3 + Color4 Value - 220.0 - 220.0 - 220.0 + 0.86 + 0.86 + 0.86 + 1.0 - ConnectedEdgeA + PathfindingBoundaryEdge Comment yay! Persist 1 Type - F32 - Value - 255 - -BoundaryEdgeRGB - - Comment - yay! - Persist - 1 - Type - Vector3 + Color4 Value - 255.0 + 1.0 0.0 0.0 + 1.0 - BoundaryEdgeA + PathfindingHeatColorBase Comment yay! Persist 1 Type - F32 - Value - 255 - -HeatColorBase - - Comment - yay! - Persist - 1 - Type - Vector3 + Color4 Value 0.0 1.0 0.5 + 1.0 - HeatColorBaseA - - Comment - yay! - Persist - 1 - Type - F32 - Value - 1.0 - -HeatColorMax + PathfindingHeatColorMax Comment yay! Persist 1 Type - Vector3 + Color4 Value 0.0 1.0 1.0 + 1.0 - HeatColorMaxA - - Comment - yay! - Persist - 1 - Type - F32 - Value - 1.0 - - FaceColorRGB + PathfindingFaceColor Comment yay! Persist 1 Type - Vector3 + Color4 Value - 255.0 - 255.0 - 255.0 + 1.0 + 1.0 + 1.0 + 1.0 - FaceColorA - - Comment - yay! - Persist - 1 - Type - F32 - Value - 255 - - StarValidColorRGB + PathfindingStarValidColor Comment yay! Persist 1 Type - Vector3 + Color4 Value - 200.0 - 120.0 + 0.78 + 0.47 0.0 + 1.0 - StarValidColorA - - Comment - yay! - Persist - 1 - Type - F32 - Value - 255 - - StarInvalidRGB + PathfindingStarInvalidColor Comment yay! Persist 1 Type - Vector3 + Color4 Value - 255.0 + 1.0 0.0 - 255.0 + 1.0 + 1.0 - StarInvalidA + PathfindingTestPathColor Comment yay! Persist 1 Type - F32 - Value - 255 - - TestPathColorRGB - - Comment - yay! - Persist - 1 - Type - Vector3 + Color4 Value - 255.0 - 150.0 + 1.0 + 0.59 0.0 + 1.0 - TestPathColorA - - Comment - yay! - Persist - 1 - Type - F32 - Value - 255 - - + 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; +} + -- cgit v1.2.3 From 817f1629bdafd6c28efa2a868a7aad75eb8a9514 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 3 Apr 2012 02:52:34 -0500 Subject: Pathfinding visualization WIP -- add many controls for x-ray render, add lighting, and better combat z-fighting and noise from wireframes and overlays --- indra/newview/app_settings/settings.xml | 84 +++++++++++++++++++--- .../shaders/class1/interface/pathfindingV.glsl | 18 ++++- 2 files changed, 89 insertions(+), 13 deletions(-) (limited to 'indra/newview/app_settings') 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 @@ PathfindingNavMeshClear Comment - yay! + Background color Persist 1 Type @@ -13535,7 +13535,7 @@ PathfindingWalkable Comment - yay! + Walkable color Persist 1 Type @@ -13551,7 +13551,7 @@ PathfindingObstacle Comment - yay! + Obstacle color Persist 1 Type @@ -13567,7 +13567,7 @@ PathfindingMaterial Comment - yay! + Material volume color Persist 1 Type @@ -13583,7 +13583,7 @@ PathfindingExclusion Comment - yay! + Exclusion volume color Persist 1 Type @@ -13599,7 +13599,7 @@ PathfindingConnectedEdge Comment - yay! + Connected edge color Persist 1 Type @@ -13615,7 +13615,7 @@ PathfindingBoundaryEdge Comment - yay! + Boundary edge color Persist 1 Type @@ -13631,7 +13631,7 @@ PathfindingHeatColorBase Comment - yay! + Least walkable heat map color Persist 1 Type @@ -13647,7 +13647,7 @@ PathfindingHeatColorMax Comment - yay! + Most walkable heat map color Persist 1 Type @@ -13663,7 +13663,7 @@ PathfindingFaceColor Comment - yay! + Nav mesh color? Persist 1 Type @@ -13724,6 +13724,66 @@ 1.0 + PathfindingAmbiance + + Comment + Ambiance of lit pathfinding displays. + Persist + 0 + Type + F32 + Value + 0.5 + + + PathfindingXRayTint + + Comment + Amount to darken/lighten x-ray lines in pathfinding display + Persist + 0 + Type + F32 + Value + 0.8 + + + PathfindingXRayOpacity + + Comment + Opacity of xray lines in pathfinding display. + Persist + 0 + Type + F32 + Value + 0.25 + + + PathfindingLineWidth + + Comment + Width of volume outlines in pathfinding display. + Persist + 0 + Type + F32 + Value + 2.0 + + + PathfindingLineOffset + + Comment + Depth offset of volume outlines in pathfinding display. + Persist + 0 + Type + F32 + Value + 1.6 + + PathfindingDisablePermanentObjects Comment @@ -13746,5 +13806,7 @@ Value 0 - + + + 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); } -- cgit v1.2.3 From 6b64ea6779a6d35bb6c9f94e354f5635ee633366 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 3 Apr 2012 17:05:44 -0500 Subject: Switch x-ray render to non-wirefrmae by default. --- indra/newview/app_settings/settings.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ed9bcb0380..425f624180 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13760,6 +13760,18 @@ 0.25 + PathfindingXRayWireframe + + Comment + Render pathfinding xray as a wireframe. + Persist + 0 + Type + Boolean + Value + 0 + + PathfindingLineWidth Comment -- cgit v1.2.3 From 5c68a69af0249728cef2b1e58683c03ecf462e95 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 3 Apr 2012 17:52:32 -0500 Subject: Cleanup -- use falcon's default colors -- fix bug where screen remains blank after closing pathfinding console --- indra/newview/app_settings/settings.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 425f624180..7988aba954 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13526,9 +13526,9 @@ Color4 Value - 0.5 - 0.5 - 0.5 + 0 + 0 + 0 1.0 @@ -13542,10 +13542,10 @@ Color4 Value - 0.0 + 0.5 + 0.5 + 0.5 1.0 - 0.0 - 0.3 PathfindingObstacle @@ -13561,7 +13561,7 @@ 1.0 0.0 0.0 - 0.3 + 1.0 PathfindingMaterial @@ -13591,8 +13591,8 @@ Value 1.0 - 1.0 - 0.0 + 0.01 + 0.1 0.3 @@ -13638,9 +13638,9 @@ Color4 Value - 0.0 1.0 - 0.5 + 0.0 + 0.07 1.0 @@ -13654,9 +13654,9 @@ Color4 Value - 0.0 - 1.0 1.0 + 0.93 + 0.936 1.0 @@ -13793,7 +13793,7 @@ Type F32 Value - 1.6 + 2.3 PathfindingDisablePermanentObjects -- cgit v1.2.3 From 382c4bdfeb8350aeea1363b4ca8e01bf233a08be Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 4 Apr 2012 00:01:02 -0500 Subject: Better contrast between shapes and their outlines. --- indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl b/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl index 31e878ebc6..91f252cf1e 100644 --- a/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl @@ -39,7 +39,7 @@ void main() { gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); - vec3 l1 = vec3(-0.75, 1, 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; -- cgit v1.2.3 From 59f57a7b67ba200135b8a2d2c8904b4168edbb32 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 4 Apr 2012 11:35:45 -0400 Subject: Support for navmesh vbo. Navmesh vb supports heat map. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7988aba954..9fff0b398c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13514,7 +13514,7 @@ Type Boolean Value - 0 + 1 PathfindingNavMeshClear -- cgit v1.2.3 From 0f22e20bcef5e4344394e4cda1f8bafd52dc5dd2 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 4 Apr 2012 15:48:43 -0500 Subject: Add pathfindingNoNormal shader. --- .../class1/interface/pathfindingNoNormalV.glsl | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 indra/newview/app_settings/shaders/class1/interface/pathfindingNoNormalV.glsl (limited to 'indra/newview/app_settings') 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); +} + -- cgit v1.2.3 From 2d011abb6b09e35ab64b6133fbed8d617d2add88 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 19 Apr 2012 12:32:17 -0700 Subject: Cleaning up the navmesh colors a bit. --- indra/newview/app_settings/settings.xml | 37 ++++++++++++--------------------- 1 file changed, 13 insertions(+), 24 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ab119e37fa..d702ae4766 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13526,24 +13526,13 @@ U32 Value 99 - - EnableVBOForNavMeshVisualization - - Comment - Enable the use of VBOs for navmesh visualization. - Persist - 1 - Type - Boolean - Value - 1 PathfindingNavMeshClear Comment Background color Persist - 1 + 0 Type Color4 Value @@ -13559,7 +13548,7 @@ Comment Walkable color Persist - 1 + 0 Type Color4 Value @@ -13575,7 +13564,7 @@ Comment Obstacle color Persist - 1 + 0 Type Color4 Value @@ -13591,7 +13580,7 @@ Comment Material volume color Persist - 1 + 0 Type Color4 Value @@ -13607,7 +13596,7 @@ Comment Exclusion volume color Persist - 1 + 0 Type Color4 Value @@ -13623,7 +13612,7 @@ Comment Connected edge color Persist - 1 + 0 Type Color4 Value @@ -13639,7 +13628,7 @@ Comment Boundary edge color Persist - 1 + 0 Type Color4 Value @@ -13655,7 +13644,7 @@ Comment Least walkable heat map color Persist - 1 + 0 Type Color4 Value @@ -13671,7 +13660,7 @@ Comment Most walkable heat map color Persist - 1 + 0 Type Color4 Value @@ -13687,7 +13676,7 @@ Comment Nav mesh color? Persist - 1 + 0 Type Color4 Value @@ -13703,7 +13692,7 @@ Comment yay! Persist - 1 + 0 Type Color4 Value @@ -13719,7 +13708,7 @@ Comment yay! Persist - 1 + 0 Type Color4 Value @@ -13735,7 +13724,7 @@ Comment yay! Persist - 1 + 0 Type Color4 Value -- cgit v1.2.3 From 00f5158699ad081a133ebb377f8943e0f6fffbc1 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 20 Apr 2012 12:20:12 -0700 Subject: Updating the pathfinding object colors to Leo's recommendations. --- indra/newview/app_settings/settings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d702ae4766..aa73694bca 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13553,9 +13553,9 @@ Color4 Value - 0.5 - 0.5 - 0.5 + 0.45490196078431372549019607843137 + 0.93333333333333333333333333333333 + 0.38823529411764705882352941176471 1.0 @@ -13651,7 +13651,7 @@ 1.0 0.0 - 0.07 + 0.0 1.0 @@ -13666,8 +13666,8 @@ Value 1.0 - 0.93 - 0.936 + 1.0 + 1.0 1.0 -- cgit v1.2.3 From a4adebb116e6e32f35f94e7b34d83a1b3a8fce0a Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 20 Apr 2012 14:46:14 -0700 Subject: Updating the pathfinding object colors to Leo's recommendations. --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index aa73694bca..e67425e5f4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13602,8 +13602,8 @@ Value 1.0 - 0.01 - 0.1 + 1.0 + 0.0 0.3 -- cgit v1.2.3 From c32f12afd3e6d22614a84a81918c26b5f82e5efa Mon Sep 17 00:00:00 2001 From: prep Date: Tue, 24 Apr 2012 12:14:17 -0400 Subject: Added support for rendering the regions water height. Also added initial support for a simple shape vb which allows us to create and expand from for one off shapes --- indra/newview/app_settings/settings.xml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e67425e5f4..e5b13ca508 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13732,7 +13732,7 @@ 1.0 0.59 0.0 - 1.0 + 0.9 PathfindingAmbiance @@ -13829,6 +13829,22 @@ Value 0 + PathfindingWaterColor + + Comment + yay! + Persist + 0 + Type + Color4 + Value + + 0.0 + 0.0 + 1.0 + 1.0 + + -- cgit v1.2.3 From e65852e9a58ec92763b88369f53092628ab7a6b8 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 3 May 2012 11:38:05 -0600 Subject: For SH-3086: add functions to refetch all previous textures through HTTP and from cache --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c2f3d244f3..88c5831ce7 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10708,6 +10708,17 @@ Value 0 + TextureFetchSource + + Comment + Debug use: Source to fetch textures + Persist + 1 + Type + S32 + Value + 0 + TextureLoadFullRes Comment -- cgit v1.2.3 From 2716e38d42ca7c65a7017b465b499f752268d9e1 Mon Sep 17 00:00:00 2001 From: Jonathan Goodman Date: Thu, 10 May 2012 16:28:07 -0400 Subject: Encode viewspace Z normal to preserve negative Z (fixes all light shifting errors, and shiny environment map errors due to lack of negative Z) --- indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl | 2 +- indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl | 2 +- .../newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl | 2 +- .../app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl | 2 +- .../app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl | 2 +- indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl | 2 +- indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl | 2 +- indra/newview/app_settings/shaders/class1/deferred/waterF.glsl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl index 9a3b2e3e8a..e68af3c8b4 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl @@ -44,6 +44,6 @@ void main() gl_FragData[0] = vec4(diff.rgb, 0.0); gl_FragData[1] = vec4(0,0,0,0); vec3 nvn = normalize(vary_normal); - gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + gl_FragData[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl index 6cc5f23aca..ea8f32684d 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl @@ -50,5 +50,5 @@ void main() gl_FragData[1] = vertex_color.aaaa; // spec //gl_FragData[1] = vec4(vec3(vertex_color.a), vertex_color.a+(1.0-vertex_color.a)*vertex_color.a); // spec - from former class3 - maybe better, but not so well tested vec3 nvn = normalize(tnorm); - gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + gl_FragData[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl index e9989a4e48..04c3afaa97 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl @@ -47,6 +47,6 @@ void main() gl_FragData[0] = vec4(col.rgb, 0.0); gl_FragData[1] = vec4(0,0,0,0); // spec vec3 nvn = normalize(vary_normal); - gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + gl_FragData[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl index fdf8d72b38..29502371bc 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl @@ -46,5 +46,5 @@ void main() gl_FragData[0] = vec4(col.rgb, 0.0); gl_FragData[1] = vec4(0,0,0,0); vec3 nvn = normalize(vary_normal); - gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + gl_FragData[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl index bb20e2ca47..5b3ab76a5f 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl @@ -47,6 +47,6 @@ void main() gl_FragData[0] = vec4(col.rgb, 0.0); gl_FragData[1] = vec4(0,0,0,0); // spec vec3 nvn = normalize(vary_normal); - gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + gl_FragData[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl index 7bde49eb86..29b246c35f 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl @@ -40,6 +40,6 @@ void main() gl_FragData[1] = vertex_color.aaaa; // spec //gl_FragData[1] = vec4(vec3(vertex_color.a), vertex_color.a+(1.0-vertex_color.a)*vertex_color.a); // spec - from former class3 - maybe better, but not so well tested vec3 nvn = normalize(vary_normal); - gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + gl_FragData[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl index 75b45111e0..30181a2ef3 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl @@ -39,5 +39,5 @@ void main() gl_FragData[1] = vertex_color.aaaa; // spec //gl_FragData[1] = vec4(vec3(vertex_color.a), vertex_color.a+(1.0-vertex_color.a)*vertex_color.a); // spec - from former class3 - maybe better, but not so well tested vec3 nvn = normalize(vary_normal); - gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + gl_FragData[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl index 4c9ea24a24..07ed7b5401 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl @@ -159,5 +159,5 @@ void main() gl_FragData[0] = vec4(color.rgb, 0.5); // diffuse gl_FragData[1] = vec4(0.5,0.5,0.5, 0.95); // speccolor*spec, spec - gl_FragData[2] = vec4(screenspacewavef.xy*0.5+0.5, screenspacewavef.z, screenspacewavef.z*0.5); // normalxyz, displace + gl_FragData[2] = vec4(screenspacewavef.xyz*0.5+0.5, screenspacewavef.z*0.5); // normalxyz, displace } -- cgit v1.2.3 From a4f27c1b5518cadff653d7e34cbe941d77b4f791 Mon Sep 17 00:00:00 2001 From: Jonathan Goodman Date: Thu, 10 May 2012 17:05:48 -0400 Subject: Unpack X, Y, and Z within the light shaders. Also some missing bits from terrainF and treeF. --- .../newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl | 2 +- indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl | 2 +- indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 2 +- indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl | 2 +- indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl | 2 +- indra/newview/app_settings/shaders/class1/deferred/treeF.glsl | 2 +- indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl | 2 +- indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 2 +- indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl | 2 +- indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl | 2 +- indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl index 179c721a2f..e59c6a1d93 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl @@ -77,7 +77,7 @@ void main() } vec3 norm = texture2DRect(normalMap, frag.xy).xyz; - norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm + norm = (norm.xyz-0.5)*2.0; // unpack norm norm = normalize(norm); vec4 spec = texture2DRect(specularRect, frag.xy); vec3 diff = texture2DRect(diffuseRect, frag.xy).rgb; diff --git a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl index b673d00d6e..85b7f885b5 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl @@ -81,7 +81,7 @@ void main() } vec3 norm = texture2DRect(normalMap, frag.xy).xyz; - norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm + norm = (norm.xyz-0.5)*2.0; // unpack norm float da = dot(norm, lv); if (da < 0.0) { diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index 0c53a4ffa5..c39ceddee6 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -275,7 +275,7 @@ void main() float depth = texture2DRect(depthMap, tc.xy).r; vec3 pos = getPosition_d(tc, depth).xyz; vec3 norm = texture2DRect(normalMap, tc).xyz; - norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm + norm = (norm.xyz-0.5)*2.0; // unpack norm float da = max(dot(norm.xyz, sun_dir.xyz), 0.0); diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl index fc5959a33c..29fd59a9e5 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl @@ -126,7 +126,7 @@ void main() vec4 pos = getPosition(pos_screen); vec3 norm = texture2DRect(normalMap, pos_screen).xyz; - norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm + norm = (norm.xyz-0.5)*2.0; // unpack norm gl_FragColor[0] = 1.0; gl_FragColor[1] = calcAmbientOcclusion(pos, norm); diff --git a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl index 5522e6c41d..3a3b17d7f3 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl @@ -54,6 +54,6 @@ void main() gl_FragData[0] = vec4(outColor.rgb, 0.0); gl_FragData[1] = vec4(0,0,0,0); vec3 nvn = normalize(vary_normal); - gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + gl_FragData[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } diff --git a/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl b/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl index ea98d6884c..805d118f35 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl @@ -46,5 +46,5 @@ void main() gl_FragData[0] = vec4(vertex_color.rgb*col.rgb, 0.0); gl_FragData[1] = vec4(0,0,0,0); vec3 nvn = normalize(vary_normal); - gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + gl_FragData[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl index 14a683971a..8bfa44f2c5 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl @@ -152,7 +152,7 @@ void main() } vec3 norm = texture2DRect(normalMap, frag.xy).xyz; - norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm + norm = (norm.xyz-0.5)*2.0; // unpack norm norm = normalize(norm); float l_dist = -dot(lv, proj_n); diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 27ea77b5a2..6f696e2ed7 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -277,7 +277,7 @@ void main() float depth = texture2DRect(depthMap, tc.xy).r; vec3 pos = getPosition_d(tc, depth).xyz; vec3 norm = texture2DRect(normalMap, tc).xyz; - norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm + norm = (norm.xyz-0.5)*2.0; // unpack norm float da = max(dot(norm.xyz, sun_dir.xyz), 0.0); diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl index 31bd0c79da..8791ef35f3 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl @@ -104,7 +104,7 @@ void main() } vec3 norm = texture2DRect(normalMap, frag.xy).xyz; - norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm + norm = (norm.xyz-0.5)*2.0; // unpack norm norm = normalize(norm); float l_dist = -dot(lv, proj_n); diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl index 229c2f4b67..56d6d60aa4 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl @@ -123,7 +123,7 @@ void main() vec4 pos = getPosition(pos_screen); vec4 nmap4 = texture2DRect(normalMap, pos_screen); - nmap4 = vec4((nmap4.xy-0.5)*2.0,nmap4.z,nmap4.w); // unpack norm + nmap4 = vec4((nmap4.xyz-0.5)*2.0,nmap4.w); // unpack norm float displace = nmap4.w; vec3 norm = nmap4.xyz; diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl index 6b420833b9..54a51a4e16 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl @@ -184,7 +184,7 @@ void main() vec4 pos = getPosition(pos_screen); vec4 nmap4 = texture2DRect(normalMap, pos_screen); - nmap4 = vec4((nmap4.xy-0.5)*2.0,nmap4.z,nmap4.w); // unpack norm + nmap4 = vec4((nmap4.xyz-0.5)*2.0,nmap4.w); // unpack norm float displace = nmap4.w; vec3 norm = nmap4.xyz; -- cgit v1.2.3 From a99dfeb58bd78fcd8cbc9ab39bc6eea725f22906 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 8 Jun 2012 19:21:48 -0700 Subject: SH-3145 : Expose update fetch and update priorities magic numbers in settings.xml --- indra/newview/app_settings/settings.xml | 66 +++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 47f37d7d3e..5fe51c97c5 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10752,6 +10752,72 @@ Value 0 + TextureFetchUpdateHighPriority + + Comment + Number of high priority textures to update per frame + Persist + 1 + Type + S32 + Value + 32 + + TextureFetchUpdateMaxMediumPriority + + Comment + Maximum number of medium priority textures to update per frame + Persist + 1 + Type + S32 + Value + 256 + + TextureFetchUpdateMinMediumPriority + + Comment + Minimum number of medium priority textures to update per frame + Persist + 1 + Type + S32 + Value + 32 + + TextureFetchUpdatePriorityThreshold + + Comment + Threshold under which textures will be considered too low priority and skipped for update + Persist + 1 + Type + F32 + Value + 0.0 + + TextureFetchUpdateSkipLowPriority + + Comment + Flag indicating if we want to skip textures with too low of a priority + Persist + 1 + Type + Boolean + Value + 0 + + TextureFetchUpdatePriorities + + Comment + Number of priority texture to update per frame + Persist + 1 + Type + S32 + Value + 32 + TextureLoadFullRes Comment -- cgit v1.2.3 From a087c4dfbb0823c66f21e3587de9d57937333e32 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 11 Jun 2012 15:00:33 -0700 Subject: PATH-710: Removing the pathfinding basic floater and supporting class. --- indra/newview/app_settings/commands.xml | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index ff4d9ceb93..cb6bdc627f 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -157,16 +157,6 @@ is_running_function="Floater.IsOpen" is_running_parameters="people" /> - Date: Tue, 12 Jun 2012 17:01:48 -0600 Subject: for SH-3073: implement a fast cache system for texture fetching --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5fe51c97c5..1911943842 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3258,6 +3258,17 @@ Boolean Value 0 + + FastCacheFetchEnabled + + Comment + Enable texture fast cache fetching if set + Persist + 1 + Type + Boolean + Value + 1 FeatureManagerHTTPTable -- cgit v1.2.3 From d500379cea865e4a6958eee82b5615ace61036c4 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 12 Jun 2012 21:58:52 -0400 Subject: PATH-735: Limit and clean up grid selection --- indra/newview/app_settings/cmd_line.xml | 34 +-------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 15434f2b8f..c02f89dee5 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -45,35 +45,13 @@ grid desc - Specify the name of the grid, local, or an IP address to connect to. + Specify the name of the grid to connect to. count 1 map-to CmdLineGridChoice - loginuri - - desc - login server and CGI script to use - count - 1 - compose - true - map-to - CmdLineLoginURI - - - helperuri - - desc - helper web CGI prefix to use - count - 1 - map-to - CmdLineHelperURI - - debugviews map-to @@ -377,16 +355,6 @@ - loginpage - - desc - Login authentication page to use. - count - 1 - map-to - LoginPage - - qa desc -- cgit v1.2.3 From e053c0a5cfd2a75a1128e5094fd3762c113ede77 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 20 Jun 2012 12:59:53 -0700 Subject: PATh-762: Adding a debug flag for server testing to always show the rebake navmesh button on dirty regions regardless of whether the user has permissions. --- indra/newview/app_settings/settings.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dbadad7056..fb1395712f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13829,7 +13829,18 @@ Value 0 - PathfindingWaterColor + PathfindingEnableAlwaysAllowRebakeNavMesh + + Comment + Always allows the rebake navmesh button to appear on dirty regions, regardless of whether the user has permissions. + Persist + 0 + Type + Boolean + Value + 0 + + PathfindingWaterColor Comment yay! @@ -13845,7 +13856,5 @@ 1.0 - - -- cgit v1.2.3 From 28ccf4190e83670af2f03015ac16db6b9c76c805 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 22 Jun 2012 17:31:46 -0500 Subject: MAINT-653 Fix for shadow acne at high altitudes --- indra/newview/app_settings/settings.xml | 2 +- .../shaders/class2/deferred/alphaF.glsl | 37 ++++++++-------- .../shaders/class2/deferred/alphaNonIndexedF.glsl | 36 ++++++++-------- .../class2/deferred/alphaNonIndexedNoColorF.glsl | 39 +++++++++-------- .../shaders/class2/deferred/sunLightF.glsl | 45 ++++++++++---------- .../shaders/class2/deferred/sunLightSSAOF.glsl | 49 +++++++++++----------- 6 files changed, 101 insertions(+), 107 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b7b040f98b..ea54f4b881 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8068,7 +8068,7 @@ Type F32 Value - 0 + -0.007 RenderShadowOffsetError diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index 08f6ec63fe..99bf03ceca 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -34,10 +34,10 @@ out vec4 frag_color; VARYING vec4 vertex_color; VARYING vec2 vary_texcoord0; -uniform sampler2DRectShadow shadowMap0; -uniform sampler2DRectShadow shadowMap1; -uniform sampler2DRectShadow shadowMap2; -uniform sampler2DRectShadow shadowMap3; +uniform sampler2DShadow shadowMap0; +uniform sampler2DShadow shadowMap1; +uniform sampler2DShadow shadowMap2; +uniform sampler2DShadow shadowMap3; uniform sampler2DRect depthMap; uniform mat4 shadow_matrix[6]; @@ -58,18 +58,21 @@ uniform float shadow_bias; uniform mat4 inv_proj; -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl) { stc.xyz /= stc.w; stc.z += shadow_bias; - - float cs = shadow2DRect(shadowMap, stc.xyz).x; + + float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, -scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, -scl, 0.0)).x, cs); + + vec2 off = scl/shadow_res; + + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, -off.y, 0.0)).x, cs); return shadow/5.0; } @@ -97,8 +100,7 @@ void main() if (spos.z < near_split.z) { lpos = shadow_matrix[3]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; @@ -109,8 +111,7 @@ void main() if (spos.z < near_split.y && spos.z > far_split.z) { lpos = shadow_matrix[2]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; @@ -121,8 +122,7 @@ void main() if (spos.z < near_split.x && spos.z > far_split.y) { lpos = shadow_matrix[1]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; w -= max(near_split.y-spos.z, 0.0)/transition_domain.y; @@ -133,8 +133,7 @@ void main() if (spos.z > far_split.x) { lpos = shadow_matrix[0]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl index aae6a070e2..4f6a88961b 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl @@ -31,17 +31,16 @@ out vec4 frag_color; #define frag_color gl_FragColor #endif -uniform sampler2DRectShadow shadowMap0; -uniform sampler2DRectShadow shadowMap1; -uniform sampler2DRectShadow shadowMap2; -uniform sampler2DRectShadow shadowMap3; +uniform sampler2DShadow shadowMap0; +uniform sampler2DShadow shadowMap1; +uniform sampler2DShadow shadowMap2; +uniform sampler2DShadow shadowMap3; uniform sampler2DRect depthMap; uniform sampler2D diffuseMap; uniform mat4 shadow_matrix[6]; uniform vec4 shadow_clip; uniform vec2 screen_res; -uniform vec2 shadow_res; vec3 atmosLighting(vec3 light); vec3 scaleSoftClip(vec3 light); @@ -54,6 +53,7 @@ VARYING vec3 vary_pointlight_col; VARYING vec2 vary_texcoord0; VARYING vec4 vertex_color; +uniform vec2 shadow_res; uniform float shadow_bias; uniform mat4 inv_proj; @@ -71,18 +71,20 @@ vec4 getPosition(vec2 pos_screen) return pos; } -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl) { stc.xyz /= stc.w; stc.z += shadow_bias; - + float cs = shadow2DRect(shadowMap, stc.xyz).x; float shadow = cs; + + vec2 off = scl/shadow_res; - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, -scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, -scl, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, -off.y, 0.0)).x, cs); return shadow/5.0; } @@ -110,8 +112,7 @@ void main() if (spos.z < near_split.z) { lpos = shadow_matrix[3]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; @@ -122,8 +123,7 @@ void main() if (spos.z < near_split.y && spos.z > far_split.z) { lpos = shadow_matrix[2]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; @@ -134,8 +134,7 @@ void main() if (spos.z < near_split.x && spos.z > far_split.y) { lpos = shadow_matrix[1]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; w -= max(near_split.y-spos.z, 0.0)/transition_domain.y; @@ -146,8 +145,7 @@ void main() if (spos.z > far_split.x) { lpos = shadow_matrix[0]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl index d6848c8dc1..90cd0f8602 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl @@ -33,17 +33,16 @@ out vec4 frag_color; uniform float minimum_alpha; -uniform sampler2DRectShadow shadowMap0; -uniform sampler2DRectShadow shadowMap1; -uniform sampler2DRectShadow shadowMap2; -uniform sampler2DRectShadow shadowMap3; +uniform sampler2DShadow shadowMap0; +uniform sampler2DShadow shadowMap1; +uniform sampler2DShadow shadowMap2; +uniform sampler2DShadow shadowMap3; uniform sampler2DRect depthMap; uniform sampler2D diffuseMap; uniform mat4 shadow_matrix[6]; uniform vec4 shadow_clip; uniform vec2 screen_res; -uniform vec2 shadow_res; vec3 atmosLighting(vec3 light); vec3 scaleSoftClip(vec3 light); @@ -55,6 +54,8 @@ VARYING vec3 vary_position; VARYING vec3 vary_pointlight_col; VARYING vec2 vary_texcoord0; +uniform vec2 shadow_res; + uniform float shadow_bias; uniform mat4 inv_proj; @@ -72,18 +73,20 @@ vec4 getPosition(vec2 pos_screen) return pos; } -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl) { stc.xyz /= stc.w; stc.z += shadow_bias; - - float cs = shadow2DRect(shadowMap, stc.xyz).x; + + float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, -scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, -scl, 0.0)).x, cs); + vec2 off = scl/shadow_res; + + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, -off.y, 0.0)).x, cs); return shadow/5.0; } @@ -118,8 +121,7 @@ void main() if (spos.z < near_split.z) { lpos = shadow_matrix[3]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; @@ -130,8 +132,7 @@ void main() if (spos.z < near_split.y && spos.z > far_split.z) { lpos = shadow_matrix[2]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; @@ -142,8 +143,7 @@ void main() if (spos.z < near_split.x && spos.z > far_split.y) { lpos = shadow_matrix[1]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; w -= max(near_split.y-spos.z, 0.0)/transition_domain.y; @@ -154,8 +154,7 @@ void main() if (spos.z > far_split.x) { lpos = shadow_matrix[0]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl index 8c4ccf9cb3..219ae687d5 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl @@ -35,10 +35,10 @@ out vec4 frag_color; uniform sampler2DRect depthMap; uniform sampler2DRect normalMap; -uniform sampler2DRectShadow shadowMap0; -uniform sampler2DRectShadow shadowMap1; -uniform sampler2DRectShadow shadowMap2; -uniform sampler2DRectShadow shadowMap3; +uniform sampler2DShadow shadowMap0; +uniform sampler2DShadow shadowMap1; +uniform sampler2DShadow shadowMap2; +uniform sampler2DShadow shadowMap3; uniform sampler2DShadow shadowMap4; uniform sampler2DShadow shadowMap5; @@ -55,10 +55,10 @@ VARYING vec2 vary_fragcoord; uniform mat4 inv_proj; uniform vec2 screen_res; -uniform vec2 shadow_res; uniform vec2 proj_shadow_res; uniform vec3 sun_dir; +uniform vec2 shadow_res; uniform float shadow_bias; uniform float shadow_offset; @@ -78,29 +78,32 @@ vec4 getPosition(vec2 pos_screen) return pos; } -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl) { stc.xyz /= stc.w; - stc.z += shadow_bias*scl; - - float cs = shadow2DRect(shadowMap, stc.xyz).x; + stc.z += shadow_bias; + + float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(1.5, 1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(1.5, -1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-1.5, 1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-1.5, -1.5, 0.0)).x, cs); + + vec2 off = 1.5/shadow_res; + + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, -off.y, 0.0)).x, cs); return shadow/5.0; //return shadow; } -float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl) +float pcfSpotShadow(sampler2DShadow shadowMap, vec4 stc, float scl) { stc.xyz /= stc.w; stc.z += spot_shadow_bias*scl; - + float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; @@ -162,8 +165,7 @@ void main() if (spos.z < near_split.z) { lpos = shadow_matrix[3]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; @@ -174,8 +176,7 @@ void main() if (spos.z < near_split.y && spos.z > far_split.z) { lpos = shadow_matrix[2]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; @@ -186,7 +187,6 @@ void main() if (spos.z < near_split.x && spos.z > far_split.y) { lpos = shadow_matrix[1]*spos; - lpos.xy *= shadow_res; float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; @@ -198,7 +198,6 @@ void main() if (spos.z > far_split.x) { lpos = shadow_matrix[0]*spos; - lpos.xy *= shadow_res; float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; @@ -237,11 +236,11 @@ void main() //spotlight shadow 1 vec4 lpos = shadow_matrix[4]*spos; - frag_color[2] = pcfShadow(shadowMap4, lpos, 0.8); + frag_color[2] = pcfSpotShadow(shadowMap4, lpos, 0.8); //spotlight shadow 2 lpos = shadow_matrix[5]*spos; - frag_color[3] = pcfShadow(shadowMap5, lpos, 0.8); + frag_color[3] = pcfSpotShadow(shadowMap5, lpos, 0.8); //frag_color.rgb = pos.xyz; //frag_color.b = shadow; diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl index 02075a7687..f6b009577a 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl @@ -34,10 +34,10 @@ out vec4 frag_color; uniform sampler2DRect depthMap; uniform sampler2DRect normalMap; -uniform sampler2DRectShadow shadowMap0; -uniform sampler2DRectShadow shadowMap1; -uniform sampler2DRectShadow shadowMap2; -uniform sampler2DRectShadow shadowMap3; +uniform sampler2DShadow shadowMap0; +uniform sampler2DShadow shadowMap1; +uniform sampler2DShadow shadowMap2; +uniform sampler2DShadow shadowMap3; uniform sampler2DShadow shadowMap4; uniform sampler2DShadow shadowMap5; uniform sampler2D noiseMap; @@ -55,10 +55,11 @@ VARYING vec2 vary_fragcoord; uniform mat4 inv_proj; uniform vec2 screen_res; -uniform vec2 shadow_res; uniform vec2 proj_shadow_res; uniform vec3 sun_dir; +uniform vec2 shadow_res; + uniform float shadow_bias; uniform float shadow_offset; @@ -139,29 +140,31 @@ float calcAmbientOcclusion(vec4 pos, vec3 norm) return min(ret, 1.0); } -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl) { stc.xyz /= stc.w; - stc.z += shadow_bias*scl; - - float cs = shadow2DRect(shadowMap, stc.xyz).x; + stc.z += shadow_bias; + + float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(1.5, 1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(1.5, -1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-1.5, 1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-1.5, -1.5, 0.0)).x, cs); + vec2 off = 1.5/shadow_res; + + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, off.y, 0.0)).x, cs); + shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, -off.y, 0.0)).x, cs); return shadow/5.0; //return shadow; } -float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl) +float pcfSpotShadow(sampler2DShadow shadowMap, vec4 stc, float scl) { stc.xyz /= stc.w; stc.z += spot_shadow_bias*scl; - + float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; @@ -223,8 +226,7 @@ void main() if (spos.z < near_split.z) { lpos = shadow_matrix[3]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; @@ -235,8 +237,7 @@ void main() if (spos.z < near_split.y && spos.z > far_split.z) { lpos = shadow_matrix[2]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; @@ -247,8 +248,7 @@ void main() if (spos.z < near_split.x && spos.z > far_split.y) { lpos = shadow_matrix[1]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; w -= max(near_split.y-spos.z, 0.0)/transition_domain.y; @@ -259,8 +259,7 @@ void main() if (spos.z > far_split.x) { lpos = shadow_matrix[0]*spos; - lpos.xy *= shadow_res; - + float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; @@ -298,11 +297,11 @@ void main() //spotlight shadow 1 vec4 lpos = shadow_matrix[4]*spos; - frag_color[2] = pcfShadow(shadowMap4, lpos, 0.8); + frag_color[2] = pcfSpotShadow(shadowMap4, lpos, 0.8); //spotlight shadow 2 lpos = shadow_matrix[5]*spos; - frag_color[3] = pcfShadow(shadowMap5, lpos, 0.8); + frag_color[3] = pcfSpotShadow(shadowMap5, lpos, 0.8); //frag_color.rgb = pos.xyz; //frag_color.b = shadow; -- cgit v1.2.3 From 3f172058897c1d7dbee73a72ddd4f8890727f9ca Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 26 Jun 2012 12:27:08 -0700 Subject: Some clean-up after checking the differences between the pathfinding branch and viewer-release. --- indra/newview/app_settings/cmd_line.xml | 22 ---------------------- indra/newview/app_settings/commands.xml | 30 ------------------------------ 2 files changed, 52 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 2853c7383d..711191128b 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -164,28 +164,6 @@ UserLoginInfo - loginpage - - desc - Login authentication page to use. - count - 1 - map-to - LoginPage - - - loginuri - - desc - login server and CGI script to use - count - 1 - compose - true - map-to - CmdLineLoginURI - - logmetrics desc diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index cb6bdc627f..73df064ab2 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -157,36 +157,6 @@ is_running_function="Floater.IsOpen" is_running_parameters="people" /> - - - 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 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'indra/newview/app_settings') 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 -- cgit v1.2.3 From 4c4a23226a2db8b1dac5b8d6b8f1537fc9164cf6 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 28 Jun 2012 17:53:43 -0500 Subject: Merge cleanup --- .../newview/app_settings/shaders/class2/deferred/alphaF.glsl | 12 ++++++------ .../shaders/class2/deferred/alphaNonIndexedF.glsl | 12 ++++++------ .../shaders/class2/deferred/alphaNonIndexedNoColorF.glsl | 2 +- .../app_settings/shaders/class2/deferred/sunLightF.glsl | 4 ++-- .../app_settings/shaders/class2/deferred/sunLightSSAOF.glsl | 11 +++++------ 5 files changed, 20 insertions(+), 21 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index 813cfb605b..12706f130b 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -63,17 +63,17 @@ float pcfShadow(sampler2DShadow shadowMap, vec4 stc) stc.xyz /= stc.w; stc.z += shadow_bias; - stc.x = floor(stc.x + fract(stc.y*12345)); // add some chaotic jitter to X sample pos according to Y to disguise the snapping going on here + stc.x = floor(stc.x*shadow_res.x + fract(stc.y*shadow_res.y*12345))/shadow_res.x; // add some chaotic jitter to X sample pos according to Y to disguise the snapping going on here float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; - shadow += shadow2DRect(shadowMap, stc.xyz+vec3(2.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; - shadow += shadow2DRect(shadowMap, stc.xyz+vec3(1.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; - shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-1.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; - shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-2.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(2.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(1.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-1.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-2.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; - return shadow*0.2; + return shadow*0.2; } diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl index f77d0ae398..228dc104ac 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl @@ -76,17 +76,17 @@ float pcfShadow(sampler2DShadow shadowMap, vec4 stc) stc.xyz /= stc.w; stc.z += shadow_bias; - stc.x = floor(stc.x + fract(stc.y*12345)); // add some chaotic jitter to X sample pos according to Y to disguise the snapping going on here + stc.x = floor(stc.x*shadow_res.x + fract(stc.y*12345))/shadow_res.x; // add some chaotic jitter to X sample pos according to Y to disguise the snapping going on here float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; - shadow += shadow2D(shadowMap, stc.xyz+vec3(2.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; - shadow += shadow2D(shadowMap, stc.xyz+vec3(1.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; - shadow += shadow2D(shadowMap, stc.xyz+vec3(-1.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; - shadow += shadow2D(shadowMap, stc.xyz+vec3(-2.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(2.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(1.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-1.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-2.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; - return shadow*0.2; + return shadow*0.2; } diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl index cce510d406..c3950a10e1 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl @@ -78,7 +78,7 @@ float pcfShadow(sampler2DShadow shadowMap, vec4 stc) stc.xyz /= stc.w; stc.z += shadow_bias; - stc.x = floor(stc.x + fract(stc.y*12345)); // add some chaotic jitter to X sample pos according to Y to disguise the snapping going on here + stc.x = floor(stc.x*shadow_res.x + fract(stc.y*12345))/shadow_res.x; // add some chaotic jitter to X sample pos according to Y to disguise the snapping going on here float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl index 20ff0c3402..c1495b145e 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl @@ -83,7 +83,7 @@ float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl, vec2 pos_screen) stc.xyz /= stc.w; stc.z += shadow_bias; - stc.x = floor(stc.x + fract(pos_screen.y*0.666666666)); // add some jitter to X sample pos according to Y to disguise the snapping going on here + stc.x = floor(stc.x*shadow_res.x + fract(pos_screen.y*0.666666666))/shadow_res.x; // add some jitter to X sample pos according to Y to disguise the snapping going on here float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; @@ -94,7 +94,7 @@ float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl, vec2 pos_screen) shadow += shadow2D(shadowMap, stc.xyz+vec3(-1.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; - return shadow*0.2; + return shadow*0.2; } float pcfSpotShadow(sampler2DShadow shadowMap, vec4 stc, float scl, vec2 pos_screen) diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl index 37689bef4f..039fca9df2 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl @@ -145,17 +145,16 @@ float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl, vec2 pos_screen) stc.xyz /= stc.w; stc.z += shadow_bias; - stc.x = floor(stc.x + fract(pos_screen.y*0.666666666)); + stc.x = floor(stc.x*shadow_res.x + fract(pos_screen.y*0.666666666))/shadow_res.x; float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; shadow += shadow2D(shadowMap, stc.xyz+vec3(2.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; - shadow += shadow2D(shadowMap, stc.xyz+vec3(1.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; - shadow += shadow2D(shadowMap, stc.xyz+vec3(-1.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; - shadow += shadow2D(shadowMap, stc.xyz+vec3(-2.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; - - + shadow += shadow2D(shadowMap, stc.xyz+vec3(1.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-1.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-2.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x; + return shadow*0.2; } -- cgit v1.2.3 From b62cb3249c37778815a165250ab1110e4c45ef43 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 29 Jun 2012 16:24:08 -0400 Subject: Fix --skin command-line switch by mapping to the correct var name. It said it mapped to 'SkinFolder', which doesn't exist. 'SkinCurrent' is correct. --- indra/newview/app_settings/cmd_line.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index be79f91919..f280613275 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -389,7 +389,7 @@ count 1 map-to - SkinFolder + SkinCurrent slurl -- cgit v1.2.3 From e86b1c18db0629d64f8bf26fcf69e64072d084e6 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 11 Jul 2012 15:17:13 -0500 Subject: MAINT-794 Fix for assert on loading some types of objects before their parents. --- .../newview/app_settings/shaders/class1/objects/indexedTextureV.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl b/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl index 7c0699d72f..ca29bf3143 100644 --- a/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl @@ -23,9 +23,9 @@ * $/LicenseInfo$ */ -ATTRIBUTE ivec4 texture_index; +ATTRIBUTE int texture_index; -VARYING_FLAT ivec4 vary_texture_index; +VARYING_FLAT int vary_texture_index; void passTextureIndex() { -- cgit v1.2.3 From e61785a45f7ad1ace4937423f421ea1f0b956e23 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 12 Jul 2012 14:29:11 -0700 Subject: Removing debug settings that were in place for pathfinding simulator testing. --- indra/newview/app_settings/settings.xml | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0f3ae89fa8..f57a63cd03 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13886,39 +13886,6 @@ 2.3 - PathfindingDisablePermanentObjects - - Comment - Disables the viewer from seeing the permanent object flag. Useful for testing server-side enforcement of permanent object rules. - Persist - 0 - Type - Boolean - Value - 0 - - PathfindingDisableCharacterObjects - - Comment - Disables the viewer from seeing the character object flag. Useful for testing server-side enforcement of character object rules. - Persist - 0 - Type - Boolean - Value - 0 - - PathfindingEnableAlwaysAllowRebakeNavMesh - - Comment - Always allows the rebake navmesh button to appear on dirty regions, regardless of whether the user has permissions. - Persist - 0 - Type - Boolean - Value - 0 - PathfindingWaterColor Comment -- cgit v1.2.3 From 02a182867c4a760e535ad87d21465ffc1499aa25 Mon Sep 17 00:00:00 2001 From: prep Date: Mon, 16 Jul 2012 15:11:23 -0400 Subject: Path-814: Corrected shader fragment compilation error. --- .../newview/app_settings/shaders/class1/interface/pathfindingF.glsl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl b/indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl index 40605bee78..7379360e17 100644 --- a/indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl @@ -24,12 +24,14 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif VARYING vec4 vertex_color; void main() { - gl_FragColor = vertex_color; + frag_color = vertex_color; } -- cgit v1.2.3 From 5f1230e911623d77dbc3353819bed338c514f671 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 9 Aug 2012 11:52:48 -0700 Subject: MAINT-1342: correct initial login location handling, clarify the two related persistent settings --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2af71d98b8..1bf773bb9e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5023,7 +5023,7 @@ LoginLocation Comment - Login location ('last', 'home') + Default Login location ('last', 'home') preference Persist 1 Type @@ -6123,7 +6123,7 @@ NextLoginLocation Comment - Location to log into by default. + Location to log into for this session - set from command line or the login panel, cleared following a successfull login. Persist 1 Type -- cgit v1.2.3