Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
ubit
commit
453c008998
|
|
@ -87,6 +87,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
|
||||
private Scene m_Scene;
|
||||
private Caps m_HostCapsObj;
|
||||
private ModelCost m_ModelCost;
|
||||
|
||||
private static readonly string m_requestPath = "0000/";
|
||||
// private static readonly string m_mapLayerPath = "0001/";
|
||||
|
|
@ -116,13 +117,22 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
private bool m_dumpAssetsToFile = false;
|
||||
private string m_regionName;
|
||||
private int m_levelUpload = 0;
|
||||
private bool m_addNewTextures = false;
|
||||
private bool m_addNewMeshes = false;
|
||||
// private bool m_addNewTextures = false;
|
||||
// private bool m_addNewMeshes = false;
|
||||
|
||||
public BunchOfCaps(Scene scene, Caps caps)
|
||||
{
|
||||
m_Scene = scene;
|
||||
m_HostCapsObj = caps;
|
||||
|
||||
// create a model upload cost provider
|
||||
m_ModelCost = new ModelCost();
|
||||
// tell it about scene object limits
|
||||
m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys;
|
||||
m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys;
|
||||
// m_ModelCost.PrimScaleMin = ??
|
||||
// m_ModelCost.ObjectLinkedPartsMax = ??
|
||||
|
||||
IConfigSource config = m_Scene.Config;
|
||||
if (config != null)
|
||||
{
|
||||
|
|
@ -193,7 +203,6 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
{
|
||||
try
|
||||
{
|
||||
// I don't think this one works...
|
||||
m_HostCapsObj.RegisterHandler(
|
||||
"NewFileAgentInventory",
|
||||
new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>(
|
||||
|
|
@ -472,9 +481,8 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
{
|
||||
string error;
|
||||
int modelcost;
|
||||
ModelCost mc = new ModelCost();
|
||||
|
||||
if (!mc.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost,
|
||||
if (!m_ModelCost.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost,
|
||||
meshcostdata, out error))
|
||||
{
|
||||
client.SendAgentAlertMessage(error, false);
|
||||
|
|
@ -607,6 +615,8 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
}
|
||||
}
|
||||
else if (inventoryType == "object")
|
||||
{
|
||||
if (assetType == "mesh") // this code for now is for mesh models uploads only
|
||||
{
|
||||
inType = (sbyte)InventoryType.Object;
|
||||
assType = (sbyte)AssetType.Object;
|
||||
|
|
@ -627,6 +637,10 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
textureAsset.Data = texture_list[i].AsBinary();
|
||||
m_assetService.Store(textureAsset);
|
||||
textures.Add(textureAsset.FullID);
|
||||
/*
|
||||
don't do this
|
||||
replace it by optionaly making model textures cost less than if individually uploaded
|
||||
since they can't be used for other purpuses
|
||||
|
||||
// save it to inventory
|
||||
if (m_addNewTextures && AddNewInventoryItem != null)
|
||||
|
|
@ -660,9 +674,8 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
AddNewInventoryItem(m_HostCapsObj.AgentID, texitem, 0);
|
||||
texitem = null;
|
||||
}
|
||||
|
||||
*/
|
||||
textureAsset = null;
|
||||
|
||||
}
|
||||
|
||||
// create and store meshs assets
|
||||
|
|
@ -674,6 +687,10 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
m_assetService.Store(meshAsset);
|
||||
meshAssets.Add(meshAsset.FullID);
|
||||
|
||||
/* this was a test, funny and showed viewers deal with mesh inventory itens
|
||||
* nut also same reason as for textures
|
||||
* let integrated in a model cost eventually less than hipotetical independent meshs assets
|
||||
* that will be in inventory
|
||||
// save it to inventory
|
||||
if (m_addNewMeshes && AddNewInventoryItem != null)
|
||||
{
|
||||
|
|
@ -706,7 +723,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
AddNewInventoryItem(m_HostCapsObj.AgentID, meshitem, 0);
|
||||
meshitem = null;
|
||||
}
|
||||
|
||||
*/
|
||||
meshAsset = null;
|
||||
}
|
||||
|
||||
|
|
@ -725,9 +742,9 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
{
|
||||
OSDMap faceMap = (OSDMap)face_list[(int)face];
|
||||
Primitive.TextureEntryFace f = pbs.Textures.CreateFace(face);
|
||||
if(faceMap.ContainsKey("fullbright"))
|
||||
if (faceMap.ContainsKey("fullbright"))
|
||||
f.Fullbright = faceMap["fullbright"].AsBoolean();
|
||||
if (faceMap.ContainsKey ("diffuse_color"))
|
||||
if (faceMap.ContainsKey("diffuse_color"))
|
||||
f.RGBA = faceMap["diffuse_color"].AsColor4();
|
||||
|
||||
int textureNum = faceMap["image"].AsInteger();
|
||||
|
|
@ -737,10 +754,10 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
float scales = (float)faceMap["scales"].AsReal();
|
||||
float scalet = (float)faceMap["scalet"].AsReal();
|
||||
|
||||
if(imagerot != 0)
|
||||
if (imagerot != 0)
|
||||
f.Rotation = imagerot;
|
||||
|
||||
if(offsets != 0)
|
||||
if (offsets != 0)
|
||||
f.OffsetU = offsets;
|
||||
|
||||
if (offsett != 0)
|
||||
|
|
@ -845,6 +862,13 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
data = ASCIIEncoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(grp));
|
||||
}
|
||||
|
||||
else // not a mesh model
|
||||
{
|
||||
m_log.ErrorFormat("[CAPS Asset Upload] got unsuported assetType for object upload");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
AssetBase asset;
|
||||
asset = new AssetBase(assetID, assetName, assType, m_HostCapsObj.AgentID.ToString());
|
||||
asset.Data = data;
|
||||
|
|
|
|||
|
|
@ -23,42 +23,81 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap;
|
|||
|
||||
namespace OpenSim.Region.ClientStack.Linden
|
||||
{
|
||||
public struct ModelPrimLimits
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public class ModelCost
|
||||
{
|
||||
float ModelMinCost = 5.0f; // try to favor small meshs versus sculpts
|
||||
|
||||
const float primCreationCost = 0.01f; // 256 prims cost extra 2.56
|
||||
// upload fee tunning paramenters
|
||||
// fees are normalized to 1.0
|
||||
// this parameters scale them to basic cost ( so 1.0 translates to 10 )
|
||||
|
||||
// weigthed size to money convertion
|
||||
const float bytecost = 1e-4f;
|
||||
public float ModelMeshCostFactor = 1.0f; // scale total cost relative to basic (excluding textures)
|
||||
public float ModelTextureCostFactor = 0.25f; //(2.5c$) scale textures fee to basic.
|
||||
// promote integration in a model
|
||||
// since they will not show up in inventory
|
||||
public float ModelMinCostFactor = 0.5f; // minimum total model free excluding textures
|
||||
|
||||
// for mesh upload fees based on compressed data sizes
|
||||
// not using streaming physics and server costs as SL apparently does ??
|
||||
// itens costs in normalized values
|
||||
// ie will be multiplied by basicCost and factors above
|
||||
const float primCreationCost = 0.002f; // extra cost for each prim creation overhead
|
||||
// weigthed size to normalized cost
|
||||
const float bytecost = 1e-5f;
|
||||
|
||||
// mesh upload fees based on compressed data sizes
|
||||
// several data sections are counted more that once
|
||||
// to promote user optimization
|
||||
// following parameters control how many extra times they are added
|
||||
// to global size.
|
||||
// LOD meshs
|
||||
const float medSizeWth = 1f; // 2x
|
||||
const float lowSizeWth = 1.5f; // 2.5x
|
||||
const float lowestSizeWth = 2f; // 3x
|
||||
// favor potencial optimized meshs versus automatic decomposition
|
||||
// favor potencially physical optimized meshs versus automatic decomposition
|
||||
const float physMeshSizeWth = 6f; // counts 7x
|
||||
const float physHullSizeWth = 8f; // counts 9x
|
||||
|
||||
// stream cost area factors
|
||||
// more or less like SL
|
||||
const float highLodFactor = 17.36f;
|
||||
const float midLodFactor = 277.78f;
|
||||
const float lowLodFactor = 1111.11f;
|
||||
|
||||
// physics cost is below, identical to SL, assuming shape type convex
|
||||
// server cost is below identical to SL assuming non scripted non physical object
|
||||
|
||||
// internal
|
||||
const int bytesPerCoord = 6; // 3 coords, 2 bytes per each
|
||||
|
||||
// control prims dimensions
|
||||
public float PrimScaleMin = 0.01f;
|
||||
public float NonPhysicalPrimScaleMax = 256f;
|
||||
public float PhysicalPrimScaleMax = 10f;
|
||||
public int ObjectLinkedPartsMax = 512;
|
||||
|
||||
// storage for a single mesh asset cost parameters
|
||||
private class ameshCostParam
|
||||
{
|
||||
// LOD sizes for size dependent streaming cost
|
||||
public int highLODSize;
|
||||
public int medLODSize;
|
||||
public int lowLODSize;
|
||||
public int lowestLODSize;
|
||||
// normalized fee based on compressed data sizes
|
||||
public float costFee;
|
||||
// physics cost
|
||||
public float physicsCost;
|
||||
}
|
||||
|
||||
// calculates a mesh model costs
|
||||
// returns false on error, with a reason on parameter error
|
||||
// resources input LLSD request
|
||||
// basicCost input region assets upload cost
|
||||
// totalcost returns model total upload fee
|
||||
// meshcostdata returns detailed costs for viewer
|
||||
public bool MeshModelCost(LLSDAssetResource resources, int basicCost, out int totalcost, LLSDAssetUploadResponseData meshcostdata, out string error)
|
||||
{
|
||||
totalcost = 0;
|
||||
|
|
@ -72,6 +111,14 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
return false;
|
||||
}
|
||||
|
||||
int numberInstances = resources.instance_list.Array.Count;
|
||||
|
||||
if( numberInstances > ObjectLinkedPartsMax )
|
||||
{
|
||||
error = "upload failed: Model whould have two many linked prims";
|
||||
return false;
|
||||
}
|
||||
|
||||
meshcostdata.model_streaming_cost = 0.0;
|
||||
meshcostdata.simulation_cost = 0.0;
|
||||
meshcostdata.physics_cost = 0.0;
|
||||
|
|
@ -87,11 +134,12 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
// textures cost
|
||||
if (resources.texture_list != null && resources.texture_list.Array.Count > 0)
|
||||
{
|
||||
int textures_cost = resources.texture_list.Array.Count;
|
||||
textures_cost *= basicCost;
|
||||
float textures_cost = (float)(resources.texture_list.Array.Count * basicCost);
|
||||
textures_cost *= ModelTextureCostFactor;
|
||||
|
||||
meshcostdata.upload_price_breakdown.texture = textures_cost;
|
||||
totalcost += textures_cost;
|
||||
itmp = (int)(textures_cost + 0.5f); // round
|
||||
meshcostdata.upload_price_breakdown.texture = itmp;
|
||||
totalcost += itmp;
|
||||
}
|
||||
|
||||
// meshs assets cost
|
||||
|
|
@ -120,12 +168,35 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
}
|
||||
|
||||
// instances (prims) cost
|
||||
int numberInstances = resources.instance_list.Array.Count;
|
||||
|
||||
|
||||
int mesh;
|
||||
for (int i = 0; i < numberInstances; i++)
|
||||
{
|
||||
Hashtable inst = (Hashtable)resources.instance_list.Array[i];
|
||||
|
||||
ArrayList ascale = (ArrayList)inst["scale"];
|
||||
Vector3 scale;
|
||||
double tmp;
|
||||
tmp = (double)ascale[0];
|
||||
scale.X = (float)tmp;
|
||||
tmp = (double)ascale[1];
|
||||
scale.Y = (float)tmp;
|
||||
tmp = (double)ascale[2];
|
||||
scale.Z = (float)tmp;
|
||||
|
||||
if (scale.X < PrimScaleMin || scale.Y < PrimScaleMin || scale.Z < PrimScaleMin)
|
||||
{
|
||||
error = " upload fail: Model contains parts with a dimension lower than 0.01. Please adjust scaling";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (scale.X > NonPhysicalPrimScaleMax || scale.Y > NonPhysicalPrimScaleMax || scale.Z > NonPhysicalPrimScaleMax)
|
||||
{
|
||||
error = "upload fail: Model contains parts larger than maximum allowed. Please adjust scaling";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (haveMeshs && inst.ContainsKey("mesh"))
|
||||
{
|
||||
mesh = (int)inst["mesh"];
|
||||
|
|
@ -137,15 +208,6 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
}
|
||||
|
||||
// streamming cost
|
||||
ArrayList ascale = (ArrayList)inst["scale"];
|
||||
Vector3 scale;
|
||||
double tmp;
|
||||
tmp = (double)ascale[0];
|
||||
scale.X = (float)tmp;
|
||||
tmp = (double)ascale[1];
|
||||
scale.Y = (float)tmp;
|
||||
tmp = (double)ascale[2];
|
||||
scale.Z = (float)tmp;
|
||||
|
||||
float sqdiam = scale.LengthSquared();
|
||||
|
||||
|
|
@ -176,12 +238,16 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
if (meshcostdata.resource_cost < meshcostdata.simulation_cost)
|
||||
meshcostdata.resource_cost = meshcostdata.simulation_cost;
|
||||
|
||||
// scale cost
|
||||
// at this point a cost of 1.0 whould mean basic cost
|
||||
meshsfee *= ModelMeshCostFactor;
|
||||
|
||||
if (meshsfee < ModelMinCost)
|
||||
meshsfee = ModelMinCost;
|
||||
if (meshsfee < ModelMinCostFactor)
|
||||
meshsfee = ModelMinCostFactor;
|
||||
|
||||
// actually scale it to basic cost
|
||||
meshsfee *= (float)basicCost;
|
||||
|
||||
// scale cost with basic cost changes relative to 10
|
||||
meshsfee *= (float)basicCost / 10.0f;
|
||||
meshsfee += 0.5f; // rounding
|
||||
|
||||
totalcost += (int)meshsfee;
|
||||
|
|
@ -192,6 +258,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
return true;
|
||||
}
|
||||
|
||||
// single mesh asset cost
|
||||
private bool MeshCost(byte[] data, ameshCostParam cost, out string error)
|
||||
{
|
||||
cost.highLODSize = 0;
|
||||
|
|
@ -377,6 +444,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
return true;
|
||||
}
|
||||
|
||||
// parses a LOD or physics mesh component
|
||||
private bool submesh(byte[] data, int offset, int size, out int ntriangles)
|
||||
{
|
||||
ntriangles = 0;
|
||||
|
|
@ -443,6 +511,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
return true;
|
||||
}
|
||||
|
||||
// parses convex hulls component
|
||||
private bool hulls(byte[] data, int offset, int size, out int nvertices, out int nhulls)
|
||||
{
|
||||
nvertices = 0;
|
||||
|
|
@ -512,6 +581,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
return true;
|
||||
}
|
||||
|
||||
// returns streaming cost from on mesh LODs sizes in curCost and square of prim size length
|
||||
private float streamingCost(ameshCostParam curCost, float sqdiam)
|
||||
{
|
||||
// compute efective areas
|
||||
|
|
@ -571,7 +641,6 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
h = 16;
|
||||
|
||||
// compute cost weighted by relative effective areas
|
||||
|
||||
float cost = (float)lst * mlst + (float)l * ml + (float)m * mm + (float)h * mh;
|
||||
cost /= ma;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue