merge

6 files changed, 84 insertions, 234 deletions

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index c9b99d83ff..f5e3d160fc 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -451,8 +451,7 @@ void LLFloaterTools::refresh()
 	if (sShowObjectCost)
 	{
 		std::string prim_cost_string;
-		S32 cost = LLSelectMgr::getInstance()->getSelection()->getSelectedObjectRenderCost();
-		LLResMgr::getInstance()->getIntegerString(prim_cost_string, cost);
+  		LLResMgr::getInstance()->getIntegerString(prim_cost_string, calcRenderCost());
 		getChild<LLUICtrl>("RenderingCost")->setTextArg("[COUNT]", prim_cost_string);
 	}
 
@@ -1010,6 +1009,35 @@ void LLFloaterTools::onClickGridOptions()
 	//floaterp->addDependentFloater(LLFloaterBuildOptions::getInstance(), FALSE);
 }
 
+S32 LLFloaterTools::calcRenderCost()
+{
+       S32 cost = 0;
+       std::set<LLUUID> textures;
+
+       for (LLObjectSelection::iterator selection_iter = LLSelectMgr::getInstance()->getSelection()->begin();
+                 selection_iter != LLSelectMgr::getInstance()->getSelection()->end();
+                 ++selection_iter)
+       {
+               LLSelectNode *select_node = *selection_iter;
+               if (select_node)
+               {
+                       LLViewerObject *vobj = select_node->getObject();
+                       if (vobj->getVolume())
+                       {
+                               LLVOVolume* volume = (LLVOVolume*) vobj;
+
+                               cost += volume->getRenderCost(textures);
+							   cost += textures.size() * LLVOVolume::ARC_TEXTURE_COST;
+							   textures.clear();
+                       }
+               }
+       }
+
+
+       return cost;
+}
+
+
 // static
 void LLFloaterTools::setEditTool(void* tool_pointer)
 {
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index d5595445e0..87c3d2ab47 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -114,6 +114,7 @@ private:
 	static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
 	static void setObjectType( LLPCode pcode );
 	void onClickGridOptions();
+	S32 calcRenderCost();
 
 public:
 	LLButton		*mBtnFocus;
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 8ffbd5510d..e0b9f1d736 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6395,7 +6395,7 @@ U32 LLObjectSelection::getSelectedObjectTriangleCount()
 	return count;
 }
 
-S32 LLObjectSelection::getSelectedObjectRenderCost()
+/*S32 LLObjectSelection::getSelectedObjectRenderCost()
 {
        S32 cost = 0;
        LLVOVolume::texture_cost_t textures;
@@ -6419,7 +6419,7 @@ S32 LLObjectSelection::getSelectedObjectRenderCost()
 
 
        return cost;
-}
+}*/
 
 
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index dd6f7011a1..ec264b1f07 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8241,7 +8241,7 @@ void LLVOAvatar::getImpostorValues(LLVector4a* extents, LLVector3& angle, F32& d
 
 void LLVOAvatar::idleUpdateRenderCost()
 {
-	static const U32 ARC_BODY_PART_COST = 200;
+	static const U32 ARC_BODY_PART_COST = 20;
 	static const U32 ARC_LIMIT = 2048;
 
 	static std::set<LLUUID> all_textures;
@@ -8252,7 +8252,7 @@ void LLVOAvatar::idleUpdateRenderCost()
 	}
 
 	U32 cost = 0;
-	LLVOVolume::texture_cost_t textures;
+	std::set<LLUUID> textures;
 
 	for (U8 baked_index = 0; baked_index < BAKED_NUM_INDICES; baked_index++)
 	{
@@ -8293,21 +8293,15 @@ void LLVOAvatar::idleUpdateRenderCost()
 
 	}
 
-	for (LLVOVolume::texture_cost_t::iterator iter = textures.begin(); iter != textures.end(); ++iter)
-	{
-		// add the cost of each individual texture in the linkset
-		cost += iter->second;
-	}
-
 	// Diagnostic output to identify all avatar-related textures.
 	// Does not affect rendering cost calculation.
 	// Could be wrapped in a debug option if output becomes problematic.
 	if (isSelf())
 	{
 		// print any attachment textures we didn't already know about.
-		for (LLVOVolume::texture_cost_t::iterator it = textures.begin(); it != textures.end(); ++it)
+		for (std::set<LLUUID>::iterator it = textures.begin(); it != textures.end(); ++it)
 		{
-			LLUUID image_id = it->first;
+			LLUUID image_id = *it;
 			if( image_id.isNull() || image_id == IMG_DEFAULT || image_id == IMG_DEFAULT_AVATAR)
 				continue;
 			if (all_textures.find(image_id) == all_textures.end())
@@ -8339,6 +8333,8 @@ void LLVOAvatar::idleUpdateRenderCost()
 		}
 	}
 
+	cost += textures.size() * LLVOVolume::ARC_TEXTURE_COST;
+
 	setDebugText(llformat("%d", cost));
 	F32 green = 1.f-llclamp(((F32) cost-(F32)ARC_LIMIT)/(F32)ARC_LIMIT, 0.f, 1.f);
 	F32 red = llmin((F32) cost/(F32)ARC_LIMIT, 1.f);
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 55e68d61f9..8f1a761549 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2931,39 +2931,17 @@ const LLMatrix4 LLVOVolume::getRenderMatrix() const
 // total cost is returned value + 5 * size of the resulting set.

 // Cannot include cost of textures, as they may be re-used in linked

 // children, and cost should only be increased for unique textures  -Nyx

-U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const

+U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const

 {

 	// base cost of each prim should be 10 points

 	static const U32 ARC_PRIM_COST = 10;

-

-	// Get access to params we'll need at various points.  

-	// Skip if this is object doesn't have a volume (e.g. is an avatar).

-	const BOOL has_volume = (getVolume() != NULL);

-	LLVolumeParams volume_params;

-	LLPathParams path_params;

-	LLProfileParams profile_params;

-

-	if (has_volume)

-	{

-		volume_params = getVolume()->getParams();

-		path_params = volume_params.getPathParams();

-		profile_params = volume_params.getProfileParams();

-	}

-	

 	// per-prim costs

 	static const U32 ARC_INVISI_COST = 1;

-	static const U32 ARC_PARTICLE_COST = 100;

-	static const U32 ARC_CUT_COST = 1;

-	static const U32 ARC_TEXTURE_COST = 5;

-

-	// per-prim multipliers

-	static const U32 ARC_HOLLOW_MULT = 2;

-	static const U32 ARC_CIRC_PROF_MULT = 2;

-	static const U32 ARC_CIRC_PATH_MULT = 2;

-	static const U32 ARC_GLOW_MULT = 2;

-	static const U32 ARC_BUMP_MULT = 2;

-	static const U32 ARC_FLEXI_MULT = 4;

-	static const U32 ARC_SHINY_MULT = 2;

+	static const U32 ARC_SHINY_COST = 1;

+	static const U32 ARC_GLOW_COST = 1;

+	static const U32 ARC_FLEXI_COST = 8;

+	static const U32 ARC_PARTICLE_COST = 16;

+	static const U32 ARC_BUMP_COST = 4;

 

 	// per-face costs

 	static const U32 ARC_PLANAR_COST = 1;

@@ -2979,68 +2957,9 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 	U32 flexi = 0;

 	U32 animtex = 0;

 	U32 particles = 0;

+	U32 scale = 0;

 	U32 bump = 0;

 	U32 planar = 0;

-	U32 cuts = 0;

-	U32 hollow = 0;

-	U32 circular_profile = 0;

-	U32 circular_path = 0;

-

-	// these multipliers are variable and can be floating point

-	F32 scale = 0.f;

-	F32 twist = 0.f; 

-	F32 revolutions = 0.f;

-

-

-	const LLDrawable* drawablep = mDrawable;

-

-	if (isSculpted())

-	{

-		if (isMesh())

-		{

-			// base cost is dependent on mesh complexity

-			// note that 3 is the highest LOD as of the time of this coding.

-			S32 size = gMeshRepo.getMeshSize(volume_params.getSculptID(),3);

-			if ( size > 0)

-			{

-				if (gMeshRepo.getSkinInfo(volume_params.getSculptID()))

-				{

-					// weighted attachment - 1 point for every 3 bytes

-					shame = (U32)(size / 3.f);

-				}

-				else

-				{

-					// non-weighted attachment - 1 point for every 4 bytes

-					shame = (U32)(size / 4.f);

-				}

-

-				if (shame == 0)

-				{

-					// someone made a really tiny mesh. 

-					shame = 1;

-				}

-			}

-			else

-			{

-				// something went wrong - user should know their content isn't render-free

-				return 0;

-			}

-		}

-		else

-		{

-			const LLSculptParams *sculpt_params = (LLSculptParams *) getParameterEntry(LLNetworkData::PARAMS_SCULPT);

-			LLUUID sculpt_id = sculpt_params->getSculptTexture();

-			if (textures.find(sculpt_id) == textures.end())

-			{

-				LLViewerFetchedTexture *texture = LLViewerTextureManager::getFetchedTexture(sculpt_id);

-				if (texture)

-				{

-					S32 texture_cost = (S32)(ARC_TEXTURE_COST * (texture->getFullHeight() / 128.f + texture->getFullWidth() / 128.f + 1));

-					textures.insert(texture_cost_t::value_type(sculpt_id, texture_cost));

-				}

-			}

-		}

-	}

 

 	if (isFlexible())

 	{

@@ -3052,67 +2971,15 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 	}

 

 	const LLVector3& sc = getScale();

-	scale += sc.mV[0] + sc.mV[1] + sc.mV[2];

-	if (scale > 4.f)

-	{

-		// scale is a multiplier, cap it at 4.

-		scale = 4.f;

-	}

-

-	// add points for cut prims

-	if (path_params.getBegin() != 0.f || path_params.getEnd() != 1.f)

-	{

-		++cuts;

-	}

-

-	if (profile_params.getBegin() != 0.f || profile_params.getEnd() != 1.f)

-	{

-		++cuts;

-	}

-

-	// double cost for hollow prims / sculpties

-	if (volume_params.getHollow() != 0.f)

-	{

-		hollow = 1;

-	}

-

-	F32 twist_mag = path_params.getTwistBegin() - path_params.getTwistEnd();

-	if (twist_mag < 0)

-	{

-		twist_mag *= -1.f;

-	}

-

-	// note magnitude of twist is [-1.f, 1.f]. which translates to [-180, 180] degrees.

-	// scale to degrees / 90 by multiplying by 2.

-	twist = twist_mag * 2.f;

-

-	// multiply by the number of revolutions in the prim. cap at 4.

-	revolutions = path_params.getRevolutions();

-	if (revolutions > 4.f)

-	{

-		revolutions = 4.f;

-	}

+	scale += (U32) sc.mV[0] + (U32) sc.mV[1] + (U32) sc.mV[2];

 

-	// double cost for circular profiles / sculpties

-	if (profile_params.getCurveType() == LL_PCODE_PROFILE_CIRCLE ||

-		profile_params.getCurveType() == LL_PCODE_PROFILE_CIRCLE_HALF)

-	{

-		circular_profile = 1;

-	}

-

-	// double cost for circular paths / sculpties

-	if (path_params.getCurveType() == LL_PCODE_PATH_CIRCLE ||

-		path_params.getCurveType() == LL_PCODE_PATH_CIRCLE2)

-	{

-		circular_path = 1;

-	}

+	const LLDrawable* drawablep = mDrawable;

 

-	// treat sculpties as hollow prims with circular paths & profiles

-	if (isSculpted() && !isMesh())

+	if (isSculpted())

 	{

-		hollow = 1;

-		circular_profile = 1;

-		circular_path = 1;

+		const LLSculptParams *sculpt_params = (LLSculptParams *) getParameterEntry(LLNetworkData::PARAMS_SCULPT);

+		LLUUID sculpt_id = sculpt_params->getSculptTexture();

+		textures.insert(sculpt_id);

 	}

 

 	for (S32 i = 0; i < drawablep->getNumFaces(); ++i)

@@ -3123,11 +2990,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 

 		if (img)

 		{

-			if (textures.find(img->getID()) == textures.end())

-			{

-				S32 texture_cost = (S32)(ARC_TEXTURE_COST * (img->getFullHeight() / 128.f + img->getFullWidth() / 128.f + 1));

-				textures.insert(texture_cost_t::value_type(img->getID(), texture_cost));

-			}

+			textures.insert(img->getID());

 		}

 

 		if (face->getPoolType() == LLDrawPool::POOL_ALPHA)

@@ -3136,24 +2999,21 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 		}

 		else if (img && img->getPrimaryFormat() == GL_ALPHA)

 		{

-			invisi++;

+			invisi = 1;

 		}

 

 		if (te)

 		{

 			if (te->getBumpmap())

 			{

-				// bump is a multiplier, don't add per-face

 				bump = 1;

 			}

 			if (te->getShiny())

 			{

-				// shiny is a multiplier, don't add per-face

 				shiny = 1;

 			}

 			if (te->getGlow() > 0.f)

 			{

-				// glow is a multiplier, don't add per-face

 				glow = 1;

 			}

 			if (face->mTextureMatrix != NULL)

@@ -3167,70 +3027,37 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 		}

 	}

 

-	// shame currently has the "base" cost of 10 for normal prims, variable for mesh

 

-	// add modifier settings

-	shame += cuts * ARC_CUT_COST;

-	shame += planar * ARC_PLANAR_COST;

-	shame += animtex * ARC_ANIM_TEX_COST;

-	shame += alpha * ARC_ALPHA_COST;

 	shame += invisi * ARC_INVISI_COST;

+	shame += shiny * ARC_SHINY_COST;

+	shame += glow * ARC_GLOW_COST;

+	shame += alpha * ARC_ALPHA_COST;

+	shame += flexi * ARC_FLEXI_COST;

+	shame += animtex * ARC_ANIM_TEX_COST;

+	shame += particles * ARC_PARTICLE_COST;

+	shame += bump * ARC_BUMP_COST;

+	shame += planar * ARC_PLANAR_COST;

+	shame += scale;

 

-	// multiply shame by multipliers

-	if (hollow)

-	{

-		shame *= hollow * ARC_HOLLOW_MULT;

-	}

-

-	if (circular_profile)

-	{

-		shame *= circular_profile * ARC_CIRC_PROF_MULT;

-	}

-

-	if (circular_path)

-	{

-		shame *= circular_path * ARC_CIRC_PATH_MULT;

-	}

-

-	if (glow)

-	{

-		shame *= glow * ARC_GLOW_MULT;

-	}

-

-	if (bump)

-	{

-		shame *= bump * ARC_BUMP_MULT;

-	}

-

-	if (flexi)

-	{

-		shame *= flexi * ARC_FLEXI_MULT;

-	}

-

-	if (shiny)

-	{

-		shame *= shiny * ARC_SHINY_MULT;

-	}

-

-	if (twist > 1.f)

-	{

-		shame = (U32)(shame * twist);

-	}

-

-	if (scale > 1.f)

-	{

-		shame = (U32)(shame *scale);

-	}

-

-	if (revolutions > 1.f)

+	LLViewerObject::const_child_list_t& child_list = getChildren();

+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();

+		 iter != child_list.end(); 

+		 ++iter)

 	{

-		shame = (U32)(shame * revolutions);

+		const LLViewerObject* child_objectp = *iter;

+		const LLDrawable* child_drawablep = child_objectp->mDrawable;

+		if (child_drawablep)

+		{

+			const LLVOVolume* child_volumep = child_drawablep->getVOVolume();

+			if (child_volumep)

+			{

+				shame += child_volumep->getRenderCost(textures);

+			}

+		}

 	}

 

-	// add additional costs

-	shame += particles * ARC_PARTICLE_COST;

-

 	return shame;

+

 }

 

 F32 LLVOVolume::getStreamingCost()

@@ -3247,16 +3074,13 @@ F32 LLVOVolume::getStreamingCost()
 	return 0.f;

 }

 

-U32 LLVOVolume::getTriangleCount()

+U32 LLVOVolume::getTriangleCount() const

 {

 	U32 count = 0;

 	LLVolume* volume = getVolume();

 	if (volume)

 	{

-		for (S32 i = 0; i < volume->getNumVolumeFaces(); ++i)

-		{

-			count += volume->getVolumeFace(i).mNumIndices/3;

-		}

+		count = volume->getNumTriangles();

 	}

 

 	return count;

diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 5af88c6cbd..0c12f14832 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -129,10 +129,9 @@ public:
 	const LLMatrix4&	getRelativeXform() const				{ return mRelativeXform; }
 	const LLMatrix3&	getRelativeXformInvTrans() const		{ return mRelativeXformInvTrans; }
 	/*virtual*/	const LLMatrix4	getRenderMatrix() const;
-				typedef std::map<LLUUID, S32> texture_cost_t;
-				U32 	getRenderCost(texture_cost_t &textures) const;
+				U32 	getRenderCost(std::set<LLUUID> &textures) const;
 	/*virtual*/	F32		getStreamingCost();
-	/*virtual*/ U32		getTriangleCount();
+	/*virtual*/ U32		getTriangleCount() const;
 	/*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, 
 										  S32 face = -1,                        // which face to check, -1 = ALL_SIDES
 										  BOOL pick_transparent = FALSE,
@@ -359,6 +358,8 @@ public:
 	static LLPointer<LLObjectMediaDataClient> sObjectMediaClient;
 	static LLPointer<LLObjectMediaNavigateClient> sObjectMediaNavigateClient;
 
+	static const U32 ARC_TEXTURE_COST = 5;
+
 protected:
 	static S32 sNumLODChanges;