diff options
author | Teravus Ovares | 2008-03-14 05:22:52 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-03-14 05:22:52 +0000 |
commit | abacfba287efe89ead9bff529d62f65a253eceb8 (patch) | |
tree | a6562417f9bdfa499bfae9f50caffbf11e713ea4 /OpenSim/Region/Physics/Manager | |
parent | Update svn properties. (diff) | |
download | opensim-SC-abacfba287efe89ead9bff529d62f65a253eceb8.zip opensim-SC-abacfba287efe89ead9bff529d62f65a253eceb8.tar.gz opensim-SC-abacfba287efe89ead9bff529d62f65a253eceb8.tar.bz2 opensim-SC-abacfba287efe89ead9bff529d62f65a253eceb8.tar.xz |
* Preliminary work with the ODEPlugin to collect collision data.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 2a35d43..9b8e1e1 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -52,28 +52,28 @@ namespace OpenSim.Region.Physics.Manager | |||
52 | 52 | ||
53 | 53 | ||
54 | public int m_colliderType; | 54 | public int m_colliderType; |
55 | public bool m_startOrEnd; | 55 | public int m_GenericStartEnd; |
56 | //public uint m_LocalID; | 56 | //public uint m_LocalID; |
57 | public List<uint> m_objCollisionList; | 57 | public List<uint> m_objCollisionList; |
58 | 58 | ||
59 | public CollisionEventUpdate(uint localID, int colliderType, bool startOrEnd, List<uint> objCollisionList) | 59 | public CollisionEventUpdate(uint localID, int colliderType, int GenericStartEnd, List<uint> objCollisionList) |
60 | { | 60 | { |
61 | m_colliderType = colliderType; | 61 | m_colliderType = colliderType; |
62 | m_startOrEnd = startOrEnd; | 62 | m_GenericStartEnd = GenericStartEnd; |
63 | m_objCollisionList = objCollisionList; | 63 | m_objCollisionList = objCollisionList; |
64 | } | 64 | } |
65 | 65 | ||
66 | public CollisionEventUpdate(bool startOrEnd) | 66 | public CollisionEventUpdate(bool startOrEnd) |
67 | { | 67 | { |
68 | m_colliderType = (int) ActorTypes.Unknown; | 68 | m_colliderType = (int) ActorTypes.Unknown; |
69 | m_startOrEnd = startOrEnd; | 69 | m_GenericStartEnd = m_GenericStartEnd; |
70 | m_objCollisionList = null; | 70 | m_objCollisionList = null; |
71 | } | 71 | } |
72 | 72 | ||
73 | public CollisionEventUpdate() | 73 | public CollisionEventUpdate() |
74 | { | 74 | { |
75 | m_colliderType = (int) ActorTypes.Unknown; | 75 | m_colliderType = (int) ActorTypes.Unknown; |
76 | m_startOrEnd = false; | 76 | m_GenericStartEnd = 1; |
77 | m_objCollisionList = null; | 77 | m_objCollisionList = null; |
78 | } | 78 | } |
79 | 79 | ||
@@ -83,10 +83,10 @@ namespace OpenSim.Region.Physics.Manager | |||
83 | set { m_colliderType = value; } | 83 | set { m_colliderType = value; } |
84 | } | 84 | } |
85 | 85 | ||
86 | public bool startOrEnd | 86 | public int GenericStartEnd |
87 | { | 87 | { |
88 | get { return m_startOrEnd; } | 88 | get { return m_GenericStartEnd; } |
89 | set { m_startOrEnd = value; } | 89 | set { m_GenericStartEnd = value; } |
90 | } | 90 | } |
91 | 91 | ||
92 | public void addCollider(uint localID) | 92 | public void addCollider(uint localID) |