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/Manager | |
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 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index e1a68be..eb0228a 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -214,6 +214,11 @@ namespace OpenSim.Region.Physics.Manager | |||
214 | } | 214 | } |
215 | } | 215 | } |
216 | 216 | ||
217 | public virtual byte[] Serialize(bool PhysIsRunning) | ||
218 | { | ||
219 | return new byte[0]; | ||
220 | } | ||
221 | |||
217 | public virtual void RaiseOutOfBounds(Vector3 pos) | 222 | public virtual void RaiseOutOfBounds(Vector3 pos) |
218 | { | 223 | { |
219 | // Make a temporary copy of the event to avoid possibility of | 224 | // Make a temporary copy of the event to avoid possibility of |
@@ -573,5 +578,6 @@ namespace OpenSim.Region.Physics.Manager | |||
573 | { | 578 | { |
574 | return false; | 579 | return false; |
575 | } | 580 | } |
581 | |||
576 | } | 582 | } |
577 | } | 583 | } |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 3db71e5..0346d4e 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -128,6 +128,12 @@ namespace OpenSim.Region.Physics.Manager | |||
128 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 128 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
129 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); | 129 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); |
130 | 130 | ||
131 | public virtual PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position, | ||
132 | uint localid, byte[] sdata) | ||
133 | { | ||
134 | return null; | ||
135 | } | ||
136 | |||
131 | public virtual float TimeDilation | 137 | public virtual float TimeDilation |
132 | { | 138 | { |
133 | get { return 1.0f; } | 139 | get { return 1.0f; } |