diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 8f5abde..362f997 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -66,47 +66,29 @@ namespace OpenSim.Region.Physics.Manager | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | /// <summary> | ||
70 | /// Used to pass collision information to OnCollisionUpdate listeners. | ||
71 | /// </summary> | ||
69 | public class CollisionEventUpdate : EventArgs | 72 | public class CollisionEventUpdate : EventArgs |
70 | { | 73 | { |
71 | // Raising the event on the object, so don't need to provide location.. further up the tree knows that info. | ||
72 | |||
73 | /// <summary> | 74 | /// <summary> |
74 | /// Number of collision events in this update. | 75 | /// Number of collision events in this update. |
75 | /// </summary> | 76 | /// </summary> |
76 | public int Count { get { return m_objCollisionList.Count; } } | 77 | public int Count { get { return m_objCollisionList.Count; } } |
77 | 78 | ||
78 | public int m_colliderType; | 79 | public Dictionary<uint, ContactPoint> m_objCollisionList; |
79 | public int m_GenericStartEnd; | ||
80 | //public uint m_LocalID; | ||
81 | public Dictionary<uint, ContactPoint> m_objCollisionList = new Dictionary<uint, ContactPoint>(); | ||
82 | 80 | ||
83 | public CollisionEventUpdate(uint localID, int colliderType, int GenericStartEnd, Dictionary<uint, ContactPoint> objCollisionList) | 81 | public CollisionEventUpdate(Dictionary<uint, ContactPoint> objCollisionList) |
84 | { | 82 | { |
85 | m_colliderType = colliderType; | ||
86 | m_GenericStartEnd = GenericStartEnd; | ||
87 | m_objCollisionList = objCollisionList; | 83 | m_objCollisionList = objCollisionList; |
88 | } | 84 | } |
89 | 85 | ||
90 | public CollisionEventUpdate() | 86 | public CollisionEventUpdate() |
91 | { | 87 | { |
92 | m_colliderType = (int) ActorTypes.Unknown; | ||
93 | m_GenericStartEnd = 1; | ||
94 | m_objCollisionList = new Dictionary<uint, ContactPoint>(); | 88 | m_objCollisionList = new Dictionary<uint, ContactPoint>(); |
95 | } | 89 | } |
96 | 90 | ||
97 | public int collidertype | 91 | public void AddCollider(uint localID, ContactPoint contact) |
98 | { | ||
99 | get { return m_colliderType; } | ||
100 | set { m_colliderType = value; } | ||
101 | } | ||
102 | |||
103 | public int GenericStartEnd | ||
104 | { | ||
105 | get { return m_GenericStartEnd; } | ||
106 | set { m_GenericStartEnd = value; } | ||
107 | } | ||
108 | |||
109 | public void addCollider(uint localID, ContactPoint contact) | ||
110 | { | 92 | { |
111 | if (!m_objCollisionList.ContainsKey(localID)) | 93 | if (!m_objCollisionList.ContainsKey(localID)) |
112 | { | 94 | { |