diff options
author | Teravus Ovares | 2008-03-10 05:23:43 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-03-10 05:23:43 +0000 |
commit | 8bea3dbdb91dfb465338572e3dfb40a5adfb9bab (patch) | |
tree | d941528dbb7e5faba74037dfbc03a2edacede342 /OpenSim/Region/Physics/Manager | |
parent | * Fixed a few things and enabling Physical Prim border crossings again. (diff) | |
download | opensim-SC_OLD-8bea3dbdb91dfb465338572e3dfb40a5adfb9bab.zip opensim-SC_OLD-8bea3dbdb91dfb465338572e3dfb40a5adfb9bab.tar.gz opensim-SC_OLD-8bea3dbdb91dfb465338572e3dfb40a5adfb9bab.tar.bz2 opensim-SC_OLD-8bea3dbdb91dfb465338572e3dfb40a5adfb9bab.tar.xz |
* Added ODEPlugin Support for llSetBuoyancy. Set Buoyancy to 1 for space prim.
* Added WaterLevel support to the ODEPlugin. More on this later.
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 e31a08d..82b7450 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -208,6 +208,8 @@ namespace OpenSim.Region.Physics.Manager | |||
208 | 208 | ||
209 | public abstract bool Kinematic { get; set; } | 209 | public abstract bool Kinematic { get; set; } |
210 | 210 | ||
211 | public abstract float Buoyancy { get; set; } | ||
212 | |||
211 | public abstract void AddForce(PhysicsVector force); | 213 | public abstract void AddForce(PhysicsVector force); |
212 | 214 | ||
213 | public abstract void SetMomentum(PhysicsVector momentum); | 215 | public abstract void SetMomentum(PhysicsVector momentum); |
@@ -249,6 +251,10 @@ namespace OpenSim.Region.Physics.Manager | |||
249 | set { return; } | 251 | set { return; } |
250 | } | 252 | } |
251 | 253 | ||
254 | public override float Buoyancy { | ||
255 | get { return 0f; } | ||
256 | set { return; } | ||
257 | } | ||
252 | 258 | ||
253 | public override bool CollidingGround | 259 | public override bool CollidingGround |
254 | { | 260 | { |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 996aed6..a51b2df 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -79,6 +79,8 @@ namespace OpenSim.Region.Physics.Manager | |||
79 | 79 | ||
80 | public abstract void SetTerrain(float[] heightMap); | 80 | public abstract void SetTerrain(float[] heightMap); |
81 | 81 | ||
82 | public abstract void SetWaterLevel(float baseheight); | ||
83 | |||
82 | public abstract void DeleteTerrain(); | 84 | public abstract void DeleteTerrain(); |
83 | 85 | ||
84 | public abstract void Dispose(); | 86 | public abstract void Dispose(); |
@@ -108,6 +110,10 @@ namespace OpenSim.Region.Physics.Manager | |||
108 | public override void RemovePrim(PhysicsActor prim) | 110 | public override void RemovePrim(PhysicsActor prim) |
109 | { | 111 | { |
110 | } | 112 | } |
113 | public override void SetWaterLevel(float baseheight) | ||
114 | { | ||
115 | |||
116 | } | ||
111 | 117 | ||
112 | /* | 118 | /* |
113 | public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) | 119 | public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) |