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

add SOG helper properties IsPhantom, IsTemporary, etc. to improve code readability 

use these in some sog methods
bulletsim
Justin Clark-Casey (justincc) 2011-08-24 21:53:12 +01:00
parent 801b7f18a7
commit 9ba4511d3e
1 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -167,6 +167,44 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
/// <summary>
/// Is this scene object phantom?
/// </summary>
/// <remarks>
/// Updating must currently take place through UpdatePrimFlags()
/// </remarks>
public bool IsPhantom
{
get { return (RootPart.Flags & PrimFlags.Phantom) != 0; }
}
/// <summary>
/// Does this scene object use physics?
/// </summary>
/// <remarks>
/// Updating must currently take place through UpdatePrimFlags()
/// </remarks>
public bool UsesPhysics
{
get { return (RootPart.Flags & PrimFlags.TemporaryOnRez) != 0; }
}
/// <summary>
/// Is this scene object temporary?
/// </summary>
/// <remarks>
/// Updating must currently take place through UpdatePrimFlags()
/// </remarks>
public bool IsTemporary
{
get { return (RootPart.Flags & PrimFlags.TemporaryOnRez) != 0; }
}
public bool IsVolumeDetect
{
get { return RootPart.VolumeDetectActive; }
}
public float scriptScore; public float scriptScore;
private Vector3 lastPhysGroupPos; private Vector3 lastPhysGroupPos;
@ -1510,36 +1548,24 @@ namespace OpenSim.Region.Framework.Scenes
SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed)); SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed));
} }
public void ScriptSetPhysicsStatus(bool UsePhysics) public void ScriptSetPhysicsStatus(bool usePhysics)
{ {
bool IsTemporary = ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0); UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
bool IsPhantom = ((RootPart.Flags & PrimFlags.Phantom) != 0);
bool IsVolumeDetect = RootPart.VolumeDetectActive;
UpdatePrimFlags(RootPart.LocalId, UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
} }
public void ScriptSetTemporaryStatus(bool TemporaryStatus) public void ScriptSetTemporaryStatus(bool makeTemporary)
{ {
bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0); UpdatePrimFlags(RootPart.LocalId, UsesPhysics, makeTemporary, IsPhantom, IsVolumeDetect);
bool IsPhantom = ((RootPart.Flags & PrimFlags.Phantom) != 0);
bool IsVolumeDetect = RootPart.VolumeDetectActive;
UpdatePrimFlags(RootPart.LocalId, UsePhysics, TemporaryStatus, IsPhantom, IsVolumeDetect);
} }
public void ScriptSetPhantomStatus(bool PhantomStatus) public void ScriptSetPhantomStatus(bool makePhantom)
{ {
bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0); UpdatePrimFlags(RootPart.LocalId, UsesPhysics, IsTemporary, makePhantom, IsVolumeDetect);
bool IsTemporary = ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0);
bool IsVolumeDetect = RootPart.VolumeDetectActive;
UpdatePrimFlags(RootPart.LocalId, UsePhysics, IsTemporary, PhantomStatus, IsVolumeDetect);
} }
public void ScriptSetVolumeDetect(bool VDStatus) public void ScriptSetVolumeDetect(bool makeVolumeDetect)
{ {
bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0); UpdatePrimFlags(RootPart.LocalId, UsesPhysics, IsTemporary, IsPhantom, makeVolumeDetect);
bool IsTemporary = ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0);
bool IsPhantom = ((RootPart.Flags & PrimFlags.Phantom) != 0);
UpdatePrimFlags(RootPart.LocalId, UsePhysics, IsTemporary, IsPhantom, VDStatus);
/* /*
ScriptSetPhantomStatus(false); // What ever it was before, now it's not phantom anymore ScriptSetPhantomStatus(false); // What ever it was before, now it's not phantom anymore