diff options
author | Teravus Ovares | 2007-12-19 22:42:06 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-19 22:42:06 +0000 |
commit | 27e028752600921deac57e281f1df6d8c7310c5d (patch) | |
tree | f94a99a6e7ad4d4325d336561f0e6365ec44f6d3 /OpenSim/Region/Physics/Manager | |
parent | Thank you very much, CharlieO for: (diff) | |
download | opensim-SC-27e028752600921deac57e281f1df6d8c7310c5d.zip opensim-SC-27e028752600921deac57e281f1df6d8c7310c5d.tar.gz opensim-SC-27e028752600921deac57e281f1df6d8c7310c5d.tar.bz2 opensim-SC-27e028752600921deac57e281f1df6d8c7310c5d.tar.xz |
* Re-did the mass calculations in ODE for Prim
* Exposed the mass as a PhysicsActor read only property (so scripts can get at it - hint hint -)
* Hollow and Path Cuts affect the prim mass (all Hollow Types are supported in this calculation (sphere,square,triangle))
* Prim no longer sink into the ground.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 7e8d160..5894ab0 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -157,6 +157,14 @@ namespace OpenSim.Region.Physics.Manager | |||
157 | 157 | ||
158 | public abstract PhysicsVector Position { get; set; } | 158 | public abstract PhysicsVector Position { get; set; } |
159 | 159 | ||
160 | public abstract float Mass { get; } | ||
161 | |||
162 | public abstract PhysicsVector Force { get;} | ||
163 | |||
164 | public abstract PhysicsVector GeometricCenter { get; } | ||
165 | |||
166 | public abstract PhysicsVector CenterOfMass { get; } | ||
167 | |||
160 | public abstract PhysicsVector Velocity { get; set; } | 168 | public abstract PhysicsVector Velocity { get; set; } |
161 | 169 | ||
162 | public abstract PhysicsVector Acceleration { get; } | 170 | public abstract PhysicsVector Acceleration { get; } |
@@ -210,7 +218,22 @@ namespace OpenSim.Region.Physics.Manager | |||
210 | get { return PhysicsVector.Zero; } | 218 | get { return PhysicsVector.Zero; } |
211 | set { return; } | 219 | set { return; } |
212 | } | 220 | } |
213 | 221 | public override float Mass | |
222 | { | ||
223 | get { return 0f; } | ||
224 | } | ||
225 | public override PhysicsVector Force | ||
226 | { | ||
227 | get { return PhysicsVector.Zero; } | ||
228 | } | ||
229 | public override PhysicsVector CenterOfMass | ||
230 | { | ||
231 | get { return PhysicsVector.Zero; } | ||
232 | } | ||
233 | public override PhysicsVector GeometricCenter | ||
234 | { | ||
235 | get { return PhysicsVector.Zero; } | ||
236 | } | ||
214 | public override PrimitiveBaseShape Shape | 237 | public override PrimitiveBaseShape Shape |
215 | { | 238 | { |
216 | set | 239 | set |