diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-26 18:05:03 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-26 18:05:03 -0400 |
| commit | 2e4dcca9e2049aa4a8c29820937b6a956d75e5d8 (patch) | |
| tree | ee344b048c6abc1aa977ec03548666c37b9753e7 | |
| parent | 291cc7a7a2c6ef58a9ca0e7dbe9cc80d6542600e (diff) | |
| parent | f8d68b088782567c2b0023cf693896368d97babb (diff) | |
Automated merge with https://hg.secondlife.com/mesh-development
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 3fe93c8e65..6f2de6c1c1 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3015,9 +3015,6 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const U32 produces_light = 0; U32 media_faces = 0; - // these multipliers are variable and can be floating point - F32 scale = 0.f; - const LLDrawable* drawablep = mDrawable; U32 num_faces = drawablep->getNumFaces(); @@ -3032,8 +3029,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const if (weighted_triangles > 0.0) { - num_triangles = (U32)(weighted_triangles * 2); // scale weighted triangles to match the recorded scale. - // a complex prim (tortured torus, sculptie) should be 1000-1200 points @ 5 m + num_triangles = (U32)(weighted_triangles); } } @@ -3094,12 +3090,6 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const produces_light = 1; } - const LLVector3& sc = getScale(); - scale += (sc.mV[0] + sc.mV[1] + sc.mV[2]) / 4.f; // scale to 1/4 the sum of the size - // enforce scale multiplier to be in the range [1,7] (7 was determined to experimentally be a reasonable max) - scale = scale > 7.f ? 7.f : scale; - scale = scale < 1.f ? 1.f : scale; - for (S32 i = 0; i < num_faces; ++i) { const LLFace* face = drawablep->getFace(i); @@ -3157,12 +3147,9 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const } // shame currently has the "base" cost of 1 point per 15 triangles, min 2. - shame = num_triangles / 15.f; + shame = num_triangles * 5.f; shame = shame < 2.f ? 2.f : shame; - // factor in scale - shame *= scale; - // multiply by per-face modifiers if (planar) { |