diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 793e281..9a22331 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
@@ -136,7 +136,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
136 | public UUID m_uuid; | 136 | public UUID m_uuid; |
137 | public bool bad = false; | 137 | public bool bad = false; |
138 | 138 | ||
139 | public ContactData AvatarContactData = new ContactData(10f, 0.3f); | 139 | float mu; |
140 | float bounce; | ||
140 | 141 | ||
141 | public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, float capsule_radius, float density, float walk_divisor, float rundivisor) | 142 | public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, float capsule_radius, float density, float walk_divisor, float rundivisor) |
142 | { | 143 | { |
@@ -168,8 +169,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
168 | m_density = density; | 169 | m_density = density; |
169 | m_mass = 80f; // sure we have a default | 170 | m_mass = 80f; // sure we have a default |
170 | 171 | ||
171 | AvatarContactData.mu = parent_scene.AvatarFriction; | 172 | mu = parent_scene.AvatarFriction; |
172 | AvatarContactData.bounce = parent_scene.AvatarBounce; | 173 | bounce = parent_scene.AvatarBounce; |
173 | 174 | ||
174 | walkDivisor = walk_divisor; | 175 | walkDivisor = walk_divisor; |
175 | runDivisor = rundivisor; | 176 | runDivisor = rundivisor; |
@@ -190,9 +191,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
190 | set { return; } | 191 | set { return; } |
191 | } | 192 | } |
192 | 193 | ||
193 | public override ContactData ContactData | 194 | public override void getContactData(ref ContactData cdata) |
194 | { | 195 | { |
195 | get { return AvatarContactData; } | 196 | cdata.mu = mu; |
197 | cdata.bounce = bounce; | ||
198 | cdata.softcolide = false; | ||
196 | } | 199 | } |
197 | 200 | ||
198 | public override bool Building { get; set; } | 201 | public override bool Building { get; set; } |