diff options
author | Melanie | 2012-08-01 22:36:24 +0100 |
---|---|---|
committer | Melanie | 2012-08-01 22:37:38 +0100 |
commit | cf16ca9bdaad75d42213089e18c0ee8f8422bbd6 (patch) | |
tree | 95535b154bbb2eda07d217d2c3ac82f8a08cecb8 /OpenSim/Region/Physics | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-cf16ca9bdaad75d42213089e18c0ee8f8422bbd6.zip opensim-SC_OLD-cf16ca9bdaad75d42213089e18c0ee8f8422bbd6.tar.gz opensim-SC_OLD-cf16ca9bdaad75d42213089e18c0ee8f8422bbd6.tar.bz2 opensim-SC_OLD-cf16ca9bdaad75d42213089e18c0ee8f8422bbd6.tar.xz |
Create the ability for physics modules to request assets on demand by
themselves. For that, the physics module simply calls RequestAssetMethod, which
in turn points to Scene.PhysicsRequestAsset. This gives physics access to
the asset system without introducing unwanted knowledge of the scene class.
Diffstat (limited to '')
-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 b32cd30..6a0558a 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -43,6 +43,9 @@ namespace OpenSim.Region.Physics.Manager | |||
43 | public delegate void JointDeactivated(PhysicsJoint joint); | 43 | public delegate void JointDeactivated(PhysicsJoint joint); |
44 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" | 44 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" |
45 | 45 | ||
46 | public delegate void RequestAssetDelegate(UUID assetID, AssetReceivedDelegate callback); | ||
47 | public delegate void AssetReceivedDelegate(AssetBase asset); | ||
48 | |||
46 | /// <summary> | 49 | /// <summary> |
47 | /// Contact result from a raycast. | 50 | /// Contact result from a raycast. |
48 | /// </summary> | 51 | /// </summary> |
@@ -73,6 +76,8 @@ namespace OpenSim.Region.Physics.Manager | |||
73 | get { return new NullPhysicsScene(); } | 76 | get { return new NullPhysicsScene(); } |
74 | } | 77 | } |
75 | 78 | ||
79 | public RequestAssetDelegate RequestAssetMethod { private get; set; } | ||
80 | |||
76 | public virtual void TriggerPhysicsBasedRestart() | 81 | public virtual void TriggerPhysicsBasedRestart() |
77 | { | 82 | { |
78 | physicsCrash handler = OnPhysicsCrash; | 83 | physicsCrash handler = OnPhysicsCrash; |