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

* Refactor: Renaming various *Entity*() methods to *Object*() methods on the basis that they all take SOG parameters to improve code readability for now

0.6.0-stable
Justin Clarke Casey 2008-05-24 22:10:14 +00:00
parent 42693f3b20
commit 79eecd3d25
8 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
View File

@ -179,7 +179,7 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator
if (Util.RandomClass.NextDouble() < killLikelyhood) if (Util.RandomClass.NextDouble() < killLikelyhood)
{ {
m_scene.RemoveEntity(selectedTree.ParentGroup); m_scene.RemoveObject(selectedTree.ParentGroup);
m_trees.Remove(selectedTree.ParentGroup.UUID); m_trees.Remove(selectedTree.ParentGroup.UUID);
m_scene.ForEachClient(delegate(IClientAPI controller) m_scene.ForEachClient(delegate(IClientAPI controller)

17
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -182,7 +182,11 @@ namespace OpenSim.Region.Environment.Scenes
#region Entity Methods #region Entity Methods
public void AddEntityFromStorage(SceneObjectGroup sceneObject) /// <summary>
/// Add an object into the scene that has come from storage
/// </summary>
/// <param name="sceneObject"></param>
public void AddObjectFromStorage(SceneObjectGroup sceneObject)
{ {
sceneObject.RegionHandle = m_regInfo.RegionHandle; sceneObject.RegionHandle = m_regInfo.RegionHandle;
sceneObject.SetScene(m_parentScene); sceneObject.SetScene(m_parentScene);
@ -192,10 +196,15 @@ namespace OpenSim.Region.Environment.Scenes
} }
sceneObject.UpdateParentIDs(); sceneObject.UpdateParentIDs();
AddEntity(sceneObject);
AddObject(sceneObject);
} }
public void AddEntity(SceneObjectGroup sceneObject) /// <summary>
/// Add an object to the scene.
/// </summary>
/// <param name="sceneObject"></param>
public void AddObject(SceneObjectGroup sceneObject)
{ {
if (!Entities.ContainsKey(sceneObject.UUID)) if (!Entities.ContainsKey(sceneObject.UUID))
{ {
@ -290,7 +299,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (m_parentScene.ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)obj).UUID, avatar_deleter)) if (m_parentScene.ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)obj).UUID, avatar_deleter))
{ {
m_parentScene.RemoveEntity((SceneObjectGroup)obj); m_parentScene.RemoveObject((SceneObjectGroup)obj);
m_numPrim--; m_numPrim--;
} }
return; return;

6
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1501,7 +1501,8 @@ namespace OpenSim.Region.Environment.Scenes
} }
group.ResetIDs(); group.ResetIDs();
AddEntity(group);
AddObject(group);
// if attachment we set it's asset id so object updates can reflect that // if attachment we set it's asset id so object updates can reflect that
// if not, we set it's position in world. // if not, we set it's position in world.
@ -1612,7 +1613,8 @@ namespace OpenSim.Region.Environment.Scenes
return null; return null;
} }
group.ResetIDs(); group.ResetIDs();
AddEntity(group);
AddObject(group);
// Set the startup parameter for on_rez event and llGetStartParameter() function // Set the startup parameter for on_rez event and llGetStartParameter() function
group.StartParameter = param; group.StartParameter = param;

28
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1163,7 +1163,7 @@ namespace OpenSim.Region.Environment.Scenes
List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID); List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID);
foreach (SceneObjectGroup group in PrimsFromDB) foreach (SceneObjectGroup group in PrimsFromDB)
{ {
AddEntityFromStorage(group); AddObjectFromStorage(group);
SceneObjectPart rootPart = group.GetChildPart(group.UUID); SceneObjectPart rootPart = group.GetChildPart(group.UUID);
rootPart.ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted; rootPart.ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted;
rootPart.TrimPermissions(); rootPart.TrimPermissions();
@ -1290,7 +1290,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
SceneObjectGroup sceneOb = SceneObjectGroup sceneOb =
new SceneObjectGroup(this, m_regionHandle, ownerID, PrimIDAllocate(), pos, rot, shape); new SceneObjectGroup(this, m_regionHandle, ownerID, PrimIDAllocate(), pos, rot, shape);
AddEntity(sceneOb); AddObject(sceneOb);
SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID); SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID);
// if grass or tree, make phantom // if grass or tree, make phantom
//rootPart.TrimPermissions(); //rootPart.TrimPermissions();
@ -1324,17 +1324,29 @@ namespace OpenSim.Region.Environment.Scenes
m_innerScene.RemovePrim(localID, avatar_deleter); m_innerScene.RemovePrim(localID, avatar_deleter);
} }
public void AddEntityFromStorage(SceneObjectGroup sceneObject) /// <summary>
/// Add an object into the scene that has come from storage
/// </summary>
/// <param name="sceneObject"></param>
public void AddObjectFromStorage(SceneObjectGroup sceneObject)
{ {
m_innerScene.AddEntityFromStorage(sceneObject); m_innerScene.AddObjectFromStorage(sceneObject);
} }
public void AddEntity(SceneObjectGroup sceneObject) /// <summary>
/// Add an object to the scene
/// </summary>
/// <param name="sceneObject"></param>
public void AddObject(SceneObjectGroup sceneObject)
{ {
m_innerScene.AddEntity(sceneObject); m_innerScene.AddObject(sceneObject);
} }
public void RemoveEntity(SceneObjectGroup sceneObject) /// <summary>
/// Remove an object from the scene
/// </summary>
/// <param name="sceneObject"></param>
public void RemoveObject(SceneObjectGroup sceneObject)
{ {
if (Entities.ContainsKey(sceneObject.UUID)) if (Entities.ContainsKey(sceneObject.UUID))
{ {
@ -3152,7 +3164,7 @@ namespace OpenSim.Region.Environment.Scenes
lock (Entities) lock (Entities)
{ {
RemoveEntity(group); RemoveObject(group);
} }
group.DeleteParts(); group.DeleteParts();

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -1841,7 +1841,7 @@ namespace OpenSim.Region.Environment.Scenes
SceneObjectGroup objectGroup = new SceneObjectGroup(m_scene, m_regionHandle, linkPart); SceneObjectGroup objectGroup = new SceneObjectGroup(m_scene, m_regionHandle, linkPart);
m_scene.AddEntity(objectGroup); m_scene.AddObject(objectGroup);
ScheduleGroupForFullUpdate(); ScheduleGroupForFullUpdate();
} }

5
OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
View File

@ -71,7 +71,8 @@ namespace OpenSim.Region.Environment.Scenes
} }
//if we want this to be a import method then we need new uuids for the object to avoid any clashes //if we want this to be a import method then we need new uuids for the object to avoid any clashes
//obj.RegenerateFullIDs(); //obj.RegenerateFullIDs();
m_innerScene.AddEntity(obj);
m_innerScene.AddObject(obj);
SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
// Apply loadOffsets for load/import and move combinations // Apply loadOffsets for load/import and move combinations
@ -183,7 +184,7 @@ namespace OpenSim.Region.Environment.Scenes
SceneObjectGroup obj = new SceneObjectGroup(xmlData); SceneObjectGroup obj = new SceneObjectGroup(xmlData);
LLVector3 receivedVelocity = obj.RootPart.Velocity; LLVector3 receivedVelocity = obj.RootPart.Velocity;
//System.Console.WriteLine(obj.RootPart.Velocity.ToString()); //System.Console.WriteLine(obj.RootPart.Velocity.ToString());
m_innerScene.AddEntityFromStorage(obj); m_innerScene.AddObjectFromStorage(obj);
SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
bool UsePhysics = (((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) > 0) && bool UsePhysics = (((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) > 0) &&

2
OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
View File

@ -126,7 +126,7 @@ namespace OpenSim.Region.Examples.SimpleModule
if (m_parts.Count == 1) if (m_parts.Count == 1)
{ {
m_parts.Remove(m_rootPart.UUID); m_parts.Remove(m_rootPart.UUID);
m_scene.RemoveEntity(this); m_scene.RemoveObject(this);
remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId); remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId);
remoteClient.AddMoney(50); remoteClient.AddMoney(50);
remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);

6
OpenSim/Region/Examples/SimpleModule/RegionModule.cs
View File

@ -76,7 +76,7 @@ namespace OpenSim.Region.Examples.SimpleModule
} }
FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos); FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos);
m_scene.AddEntity(fileObject); m_scene.AddObject(fileObject);
fileObject.ScheduleGroupForFullUpdate(); fileObject.ScheduleGroupForFullUpdate();
} }
} }
@ -107,7 +107,7 @@ namespace OpenSim.Region.Examples.SimpleModule
ComplexObject complexObject = ComplexObject complexObject =
new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(),
pos + posOffset); pos + posOffset);
m_scene.AddEntity(complexObject); m_scene.AddObject(complexObject);
} }
} }
@ -116,7 +116,7 @@ namespace OpenSim.Region.Examples.SimpleModule
SceneObjectGroup sceneObject = SceneObjectGroup sceneObject =
new CpuCounterObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), new CpuCounterObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(),
pos + new LLVector3(1f, 1f, 1f)); pos + new LLVector3(1f, 1f, 1f));
m_scene.AddEntity(sceneObject); m_scene.AddObject(sceneObject);
} }
public void Close() public void Close()