diff options
author | John Hurliman | 2009-10-27 16:24:43 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-27 16:24:43 -0700 |
commit | 0c466b28bbfeac8a4e0c3c61038290621c4f9f4f (patch) | |
tree | 1647b1d98633d0f0e1aad4963522d5ed250e04ef /OpenSim/Region/Physics/Manager | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-0c466b28bbfeac8a4e0c3c61038290621c4f9f4f.zip opensim-SC_OLD-0c466b28bbfeac8a4e0c3c61038290621c4f9f4f.tar.gz opensim-SC_OLD-0c466b28bbfeac8a4e0c3c61038290621c4f9f4f.tar.bz2 opensim-SC_OLD-0c466b28bbfeac8a4e0c3c61038290621c4f9f4f.tar.xz |
Move the calculation of time dilation from the scene to the physics engine. The scene is still the one reporting dilation so this does not break the API or remove flexibility, but it gets the calculation happening in the right place for the normal OpenSim usage. The actual calculation of physics time dilation probably needs tweaking
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index bb0d18e..6d515e9 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -75,6 +75,11 @@ namespace OpenSim.Region.Physics.Manager | |||
75 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 75 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
76 | Vector3 size, Quaternion rotation, bool isPhysical); | 76 | Vector3 size, Quaternion rotation, bool isPhysical); |
77 | 77 | ||
78 | public virtual float TimeDilation | ||
79 | { | ||
80 | get { return 1.0f; } | ||
81 | } | ||
82 | |||
78 | public virtual bool SupportsNINJAJoints | 83 | public virtual bool SupportsNINJAJoints |
79 | { | 84 | { |
80 | get { return false; } | 85 | get { return false; } |