ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Pass 2 of collidable (non physical) linksets

Browse Source 
* Linkset status is now persistent
* Tweaked a physics child prim positioning hack to generate less database saves
* Re-factored physics object creation calls into ApplyPhysics.  To create a new physics representation of an object or linkset, it's only necessary to call *group*.ApplyPhysics(bool m_physicalPrim).  *lbsa has been waiting for this refactoring*
* We have collidable linksets now. (they don't become phantom anymore)
This commit is contained in:
Teravus Ovares
2008-01-15 04:14:27 +00:00
parent b25f9f322c
commit 45e945616b
4 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes
AttachToBackup();
ApplyPhysics();
ApplyPhysics(scene.m_physicalPrim);
ScheduleGroupForFullUpdate();
}
@@ -302,7 +302,7 @@ namespace OpenSim.Region.Environment.Scenes
AttachToBackup();
ApplyPhysics();
ApplyPhysics(scene.m_physicalPrim);
ScheduleGroupForFullUpdate();
}
@@ -426,7 +426,7 @@ namespace OpenSim.Region.Environment.Scenes
AttachToBackup();
ApplyPhysics();
//ApplyPhysics(scene.m_physicalPrim);
}
/// <summary>
@@ -1577,6 +1577,12 @@ namespace OpenSim.Region.Environment.Scenes
}
}
public void ResetChildPrimPhysicsPositions()
{
AbsolutePosition = AbsolutePosition;
HasChanged = false;
}
public LLUUID GetPartsFullID(uint localID)
{
SceneObjectPart part = GetChildPart(localID);
@@ -1649,18 +1655,22 @@ namespace OpenSim.Region.Environment.Scenes
Text = text;
}
public void ApplyPhysics()
public void ApplyPhysics(bool m_physicalPrim)
{
if (m_parts.Count > 1)
{
foreach (SceneObjectPart parts in m_parts.Values)
{
parts.ApplyPhysics();
parts.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
// Hack to get the physics scene geometries in the right spot
ResetChildPrimPhysicsPositions();
}
}
else
{
m_rootPart.ApplyPhysics();
m_rootPart.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
}
}
}