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

pCamBot: download Meshes 

The "Sculpt" field in prims is used for both Sculpties (where the assets are Textures), and real meshes. Meshes require a different download URL than textures.
bullet-2.82
Oren Hurvitz 2014-07-01 15:26:22 +03:00
parent 470161ae2e
commit 46c1d4e319
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Tools/pCampBot/Bot.cs
View File

@ -635,7 +635,7 @@ namespace pCampBot
{
if (prim.Textures.DefaultTexture.TextureID != UUID.Zero)
{
GetTexture(prim.Textures.DefaultTexture.TextureID);
GetTextureOrMesh(prim.Textures.DefaultTexture.TextureID, true);
}
for (int i = 0; i < prim.Textures.FaceTextures.Length; i++)
@ -647,32 +647,56 @@ namespace pCampBot
UUID textureID = prim.Textures.FaceTextures[i].TextureID;
if (textureID != UUID.Zero)
GetTexture(textureID);
GetTextureOrMesh(textureID, true);
}
}
}
if (prim.Sculpt != null && prim.Sculpt.SculptTexture != UUID.Zero)
GetTexture(prim.Sculpt.SculptTexture);
{
bool mesh = (prim.Sculpt.Type == SculptType.Mesh);
GetTextureOrMesh(prim.Sculpt.SculptTexture, !mesh);
}
}
}
private void GetTexture(UUID textureID)
private void GetTextureOrMesh(UUID assetID, bool texture)
{
lock (Manager.AssetsReceived)
{
// Don't request assets more than once.
if (Manager.AssetsReceived.ContainsKey(textureID))
if (Manager.AssetsReceived.ContainsKey(assetID))
return;
Manager.AssetsReceived[textureID] = false;
Client.Assets.RequestImage(textureID, ImageType.Normal, Asset_TextureCallback_Texture);
Manager.AssetsReceived[assetID] = false;
}
try
{
if (texture)
Client.Assets.RequestImage(assetID, ImageType.Normal, Asset_TextureCallback_Texture);
else
Client.Assets.RequestMesh(assetID, Asset_MeshCallback);
}
catch (Exception e)
{
m_log.Warn(string.Format("Error requesting {0} {1}", texture ? "texture" : "mesh", assetID), e);
}
}
public void Asset_TextureCallback_Texture(TextureRequestState state, AssetTexture assetTexture)
{
//TODO: Implement texture saving and applying
if (state == TextureRequestState.Finished)
{
lock (Manager.AssetsReceived)
Manager.AssetsReceived[assetTexture.AssetID] = true;
}
}
private void Asset_MeshCallback(bool success, AssetMesh assetMesh)
{
lock (Manager.AssetsReceived)
Manager.AssetsReceived[assetMesh.AssetID] = success;
}
public void Asset_ReceivedCallback(AssetDownload transfer, Asset asset)