OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

same cleanup

avinationmerge
UbitUmarov 2012-09-17 19:09:51 +01:00
parent 1740325392
commit 7f5b1182ef
1 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
View File

@ -42,7 +42,7 @@ namespace OpenSim.Region.ClientStack.Linden
const float physMeshSizeWth = 6f; // counts 7x const float physMeshSizeWth = 6f; // counts 7x
const float physHullSizeWth = 8f; // counts 9x const float physHullSizeWth = 8f; // counts 9x
// stream cost size factors // stream cost area factors
const float highLodFactor = 17.36f; const float highLodFactor = 17.36f;
const float midLodFactor = 277.78f; const float midLodFactor = 277.78f;
const float lowLodFactor = 1111.11f; const float lowLodFactor = 1111.11f;
@ -94,13 +94,12 @@ namespace OpenSim.Region.ClientStack.Linden
totalcost += textures_cost; totalcost += textures_cost;
} }
float meshsfee = 0;
// meshs assets cost // meshs assets cost
float meshsfee = 0;
int numberMeshs = 0; int numberMeshs = 0;
bool haveMeshs = false;
List<ameshCostParam> meshsCosts = new List<ameshCostParam>(); List<ameshCostParam> meshsCosts = new List<ameshCostParam>();
// a model could have no mesh actually
if (resources.mesh_list != null && resources.mesh_list.Array.Count > 0) if (resources.mesh_list != null && resources.mesh_list.Array.Count > 0)
{ {
numberMeshs = resources.mesh_list.Array.Count; numberMeshs = resources.mesh_list.Array.Count;
@ -117,6 +116,7 @@ namespace OpenSim.Region.ClientStack.Linden
meshsCosts.Add(curCost); meshsCosts.Add(curCost);
meshsfee += curCost.costFee; meshsfee += curCost.costFee;
} }
haveMeshs = true;
} }
// instances (prims) cost // instances (prims) cost
@ -126,16 +126,17 @@ namespace OpenSim.Region.ClientStack.Linden
{ {
Hashtable inst = (Hashtable)resources.instance_list.Array[i]; Hashtable inst = (Hashtable)resources.instance_list.Array[i];
// streamming cost if (haveMeshs && inst.ContainsKey("mesh"))
// assume all instances have a mesh {
// but in general they can have normal prims mesh = (int)inst["mesh"];
// but for now that seems not suported
// when they do, we will need to inspect pbs information
// and have cost funtions for all prims types
// don't check for shape type none, since
// that could be used to upload meshs with low cost
// changing later inworld
if (mesh >= numberMeshs)
{
error = "Unable to upload mesh model. incoerent information.";
return false;
}
// streamming cost
ArrayList ascale = (ArrayList)inst["scale"]; ArrayList ascale = (ArrayList)inst["scale"];
Vector3 scale; Vector3 scale;
double tmp; double tmp;
@ -148,22 +149,20 @@ namespace OpenSim.Region.ClientStack.Linden
float sqdiam = scale.LengthSquared(); float sqdiam = scale.LengthSquared();
mesh = (int)inst["mesh"];
if(mesh >= numberMeshs)
{
error = "Unable to upload mesh model. incoerent information.";
return false;
}
ameshCostParam curCost = meshsCosts[mesh]; ameshCostParam curCost = meshsCosts[mesh];
float mesh_streaming = streamingCost(curCost, sqdiam); float mesh_streaming = streamingCost(curCost, sqdiam);
meshcostdata.model_streaming_cost += mesh_streaming; meshcostdata.model_streaming_cost += mesh_streaming;
meshcostdata.physics_cost += curCost.physicsCost; meshcostdata.physics_cost += curCost.physicsCost;
}
else // instance as no mesh ??
{
// to do later if needed
meshcostdata.model_streaming_cost += 0.5f;
meshcostdata.physics_cost += 1.0f;
}
// unscripted and static prim server cost // assume unscripted and static prim server cost
meshcostdata.simulation_cost += 0.5f; meshcostdata.simulation_cost += 0.5f;
// charge for prims creation // charge for prims creation
meshsfee += primCreationCost; meshsfee += primCreationCost;
@ -174,6 +173,10 @@ namespace OpenSim.Region.ClientStack.Linden
else else
meshcostdata.resource_cost = meshcostdata.physics_cost; meshcostdata.resource_cost = meshcostdata.physics_cost;
if (meshcostdata.resource_cost < meshcostdata.simulation_cost)
meshcostdata.resource_cost = meshcostdata.simulation_cost;
if (meshsfee < ModelMinCost) if (meshsfee < ModelMinCost)
meshsfee = ModelMinCost; meshsfee = ModelMinCost;