Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simian: Added support for prim texturing

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2255 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
2008-10-03 08:11:32 +00:00
parent 9dd54dca50
commit 6c1e9a0e7b
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Programs/Simian/Extensions/ObjectManager.cs
View File

@@ -502,6 +502,16 @@ namespace Simian.Extensions
void ObjectImageHandler(Packet packet, Agent agent)
{
ObjectImagePacket image = (ObjectImagePacket)packet;
for (int i = 0; i < image.ObjectData.Length; i++)
{
SimulationObject obj;
if (Server.Scene.TryGetObject(image.ObjectData[i].ObjectLocalID, out obj))
Server.Scene.ObjectImage(this, obj,
Utils.BytesToString(image.ObjectData[i].MediaURL),
new Primitive.TextureEntry(image.ObjectData[i].TextureEntry, 0, image.ObjectData[i].TextureEntry.Length));
}
}
void DeRezObjectHandler(Packet packet, Agent agent)

16
Programs/Simian/Extensions/SceneManager.cs
View File

@@ -22,6 +22,7 @@ namespace Simian.Extensions
public event ObjectRemoveCallback OnObjectRemove;
public event ObjectTransformCallback OnObjectTransform;
public event ObjectFlagsCallback OnObjectFlags;
public event ObjectImageCallback OnObjectImage;
public event ObjectModifyCallback OnObjectModify;
public event TerrainUpdatedCallback OnTerrainUpdated;
@@ -149,6 +150,21 @@ namespace Simian.Extensions
BroadcastObjectUpdate(obj);
}
public void ObjectImage(object sender, SimulationObject obj, string mediaURL, Primitive.TextureEntry textureEntry)
{
if (OnObjectImage != null)
{
OnObjectImage(sender, obj, mediaURL, textureEntry);
}
// Update the object
obj.Prim.Textures = textureEntry;
obj.Prim.MediaURL = mediaURL;
// Inform clients
BroadcastObjectUpdate(obj);
}
public void ObjectModify(object sender, SimulationObject obj, Primitive.ConstructionData data)
{
if (OnObjectModify != null)

3
Programs/Simian/Interfaces/ISceneProvider.cs
View File

@@ -9,6 +9,8 @@ namespace Simian
Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 acceleration,
Vector3 angularVelocity, Vector3 scale);
public delegate void ObjectFlagsCallback(object sender, SimulationObject obj, PrimFlags flags);
public delegate void ObjectImageCallback(object sender, SimulationObject obj,
string mediaURL, Primitive.TextureEntry textureEntry);
public delegate void ObjectModifyCallback(object sender, SimulationObject obj,
Primitive.ConstructionData data);
// TODO: Convert terrain to a patch-based system
@@ -34,6 +36,7 @@ namespace Simian
Quaternion rotation, Vector3 velocity, Vector3 acceleration,
Vector3 angularVelocity, Vector3 scale);
void ObjectFlags(object sender, SimulationObject obj, PrimFlags flags);
void ObjectImage(object sender, SimulationObject obj, string mediaURL, Primitive.TextureEntry textureEntry);
void ObjectModify(object sender, SimulationObject obj, Primitive.ConstructionData data);
bool TryGetObject(uint localID, out SimulationObject obj);
bool TryGetObject(UUID id, out SimulationObject obj);