From e81135b5d82701745a6fb324d70312796a1ee855 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 28 Apr 2016 11:28:46 -0400 Subject: adjust avatar complexity defaults to be more generous and more consistent --- indra/newview/app_settings/low_graphics.xml | 2 +- indra/newview/app_settings/mid_graphics.xml | 2 +- indra/newview/app_settings/ultra_graphics.xml | 2 +- indra/newview/featuretable.txt | 2 +- indra/newview/featuretable_mac.txt | 6 +++--- indra/newview/llfloaterpreference.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/app_settings/low_graphics.xml b/indra/newview/app_settings/low_graphics.xml index b0ddb5bd56..df3f67a5a1 100644 --- a/indra/newview/app_settings/low_graphics.xml +++ b/indra/newview/app_settings/low_graphics.xml @@ -28,7 +28,7 @@ - + diff --git a/indra/newview/app_settings/mid_graphics.xml b/indra/newview/app_settings/mid_graphics.xml index 41344f935d..a10c02b79f 100644 --- a/indra/newview/app_settings/mid_graphics.xml +++ b/indra/newview/app_settings/mid_graphics.xml @@ -28,7 +28,7 @@ - + diff --git a/indra/newview/app_settings/ultra_graphics.xml b/indra/newview/app_settings/ultra_graphics.xml index 6b8956bf79..3e7fccbd5f 100644 --- a/indra/newview/app_settings/ultra_graphics.xml +++ b/indra/newview/app_settings/ultra_graphics.xml @@ -29,7 +29,7 @@ - + diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 222a992f03..c589c508e8 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -400,7 +400,7 @@ RenderAnisotropic 1 0 RenderAvatarCloth 0 0 RenderAvatarVP 0 0 RenderAvatarMaxNonImpostors 1 16 -RenderAvatarMaxComplexity 1 60000 +RenderAvatarMaxComplexity 1 80000 RenderObjectBump 0 0 RenderLocalLights 1 0 RenderMaxPartCount 1 1024 diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index f46de50ef6..ce068819e2 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -80,7 +80,7 @@ RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 0 RenderAvatarPhysicsLODFactor 1 0 RenderAvatarMaxNonImpostors 1 3 -RenderAvatarMaxComplexity 1 30000 +RenderAvatarMaxComplexity 1 35000 RenderAvatarVP 1 0 RenderFarClip 1 64 RenderFlexTimeFactor 1 0 @@ -111,7 +111,7 @@ RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 0 RenderAvatarPhysicsLODFactor 1 0 RenderAvatarMaxNonImpostors 1 3 -RenderAvatarMaxComplexity 1 30000 +RenderAvatarMaxComplexity 1 35000 RenderAvatarVP 1 0 RenderFarClip 1 64 RenderFlexTimeFactor 1 0 @@ -393,7 +393,7 @@ RenderAnisotropic 1 0 RenderAvatarCloth 0 0 RenderAvatarVP 0 0 RenderAvatarMaxNonImpostors 1 16 -RenderAvatarMaxComplexity 1 60000 +RenderAvatarMaxComplexity 1 80000 RenderObjectBump 0 0 RenderLocalLights 1 0 RenderMaxPartCount 1 1024 diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 113b307255..227d0eac77 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -131,7 +131,7 @@ static const U32 MAX_INDIRECT_ARC_LIMIT = INDIRECT_MAX_ARC_OFF-1; // one short o /// These are the effective range of values for RenderAvatarMaxComplexity static const F32 MIN_ARC_LIMIT = 20000.0f; -static const F32 MAX_ARC_LIMIT = 300000.0f; +static const F32 MAX_ARC_LIMIT = 350000.0f; static const F32 MIN_ARC_LOG = log(MIN_ARC_LIMIT); static const F32 MAX_ARC_LOG = log(MAX_ARC_LIMIT); static const F32 ARC_LIMIT_MAP_SCALE = (MAX_ARC_LOG - MIN_ARC_LOG) / (MAX_INDIRECT_ARC_LIMIT - MIN_INDIRECT_ARC_LIMIT); -- cgit v1.2.3