aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorMW2007-08-23 17:21:08 +0000
committerMW2007-08-23 17:21:08 +0000
commit0d5311e49bf5700efcf779bfa4bc83a00585c424 (patch)
tree168ea226f01a7e486f4dd6f288ef00afdd67ff68 /OpenSim/Region/Physics/Manager
parentgrouping of functions to make the overall logic easier to grasp for people, (diff)
downloadopensim-SC-0d5311e49bf5700efcf779bfa4bc83a00585c424.zip
opensim-SC-0d5311e49bf5700efcf779bfa4bc83a00585c424.tar.gz
opensim-SC-0d5311e49bf5700efcf779bfa4bc83a00585c424.tar.bz2
opensim-SC-0d5311e49bf5700efcf779bfa4bc83a00585c424.tar.xz
Added RemovePrim method to the physics plugins interface.
Implemented that method in ODE plugin. Hooked it up so when deleting/taking prims into your inventory they will be removed from physics engine. Enabled the other physics hook ups in Scene.cs (and also added registering prims with physics plugin when they are rezzed from Inventory.) So now to get the avatar to prim collision testing working, just change to use the ODE plugin (in the OpenSim.ini file, physics = OpenDynamicsEngine). Remember though ODE only really works (without problems) when running with a single region.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 0e75b04..11789a2 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -44,6 +44,8 @@ namespace OpenSim.Physics.Manager
44 44
45 public abstract void RemoveAvatar(PhysicsActor actor); 45 public abstract void RemoveAvatar(PhysicsActor actor);
46 46
47 public abstract void RemovePrim(PhysicsActor prim);
48
47 public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation); 49 public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation);
48 50
49 public abstract void Simulate(float timeStep); 51 public abstract void Simulate(float timeStep);
@@ -74,6 +76,11 @@ namespace OpenSim.Physics.Manager
74 76
75 } 77 }
76 78
79 public override void RemovePrim(PhysicsActor prim)
80 {
81
82 }
83
77 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) 84 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
78 { 85 {
79 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); 86 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);