diff options
author | UbitUmarov | 2012-02-17 21:09:00 +0000 |
---|---|---|
committer | UbitUmarov | 2012-02-17 21:09:00 +0000 |
commit | 7d77ccc6593c6c3ac9f66e2e593dfb8cc719cd04 (patch) | |
tree | 22b49c5533ed40f76d861f77c1b15a821606756a /OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |
parent | Now if chode prim.cs detects out of bounds it requests a update and blocks mo... (diff) | |
download | opensim-SC-7d77ccc6593c6c3ac9f66e2e593dfb8cc719cd04.zip opensim-SC-7d77ccc6593c6c3ac9f66e2e593dfb8cc719cd04.tar.gz opensim-SC-7d77ccc6593c6c3ac9f66e2e593dfb8cc719cd04.tar.bz2 opensim-SC-7d77ccc6593c6c3ac9f66e2e593dfb8cc719cd04.tar.xz |
Added simple binary serializer/deserializer to chODE. 100% untested and most like still broken
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs index cf7c1d7..03059f7 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |||
@@ -1736,6 +1736,23 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1736 | return newPrim; | 1736 | return newPrim; |
1737 | } | 1737 | } |
1738 | 1738 | ||
1739 | private PhysicsActor AddPrim(String name, Vector3 position, PhysicsActor parent, | ||
1740 | PrimitiveBaseShape pbs, uint localid, byte[] sdata) | ||
1741 | { | ||
1742 | Vector3 pos = position; | ||
1743 | |||
1744 | OdePrim newPrim; | ||
1745 | lock (OdeLock) | ||
1746 | { | ||
1747 | newPrim = new OdePrim(name, this, pos, parent, pbs, ode, localid, sdata); | ||
1748 | lock (_prims) | ||
1749 | _prims.Add(newPrim); | ||
1750 | } | ||
1751 | |||
1752 | return newPrim; | ||
1753 | } | ||
1754 | |||
1755 | |||
1739 | public void addActivePrim(OdePrim activatePrim) | 1756 | public void addActivePrim(OdePrim activatePrim) |
1740 | { | 1757 | { |
1741 | // adds active prim.. (ones that should be iterated over in collisions_optimized | 1758 | // adds active prim.. (ones that should be iterated over in collisions_optimized |
@@ -1762,6 +1779,17 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1762 | return result; | 1779 | return result; |
1763 | } | 1780 | } |
1764 | 1781 | ||
1782 | public override PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position, | ||
1783 | uint localid, byte[] sdata) | ||
1784 | { | ||
1785 | PhysicsActor result; | ||
1786 | |||
1787 | result = AddPrim(primName, position, parent, | ||
1788 | pbs, localid, sdata); | ||
1789 | |||
1790 | return result; | ||
1791 | } | ||
1792 | |||
1765 | public override float TimeDilation | 1793 | public override float TimeDilation |
1766 | { | 1794 | { |
1767 | get { return m_timeDilation; } | 1795 | get { return m_timeDilation; } |