diff options
author | UbitUmarov | 2012-12-07 20:06:35 +0000 |
---|---|---|
committer | UbitUmarov | 2012-12-07 20:06:35 +0000 |
commit | 2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2 (patch) | |
tree | b206c3b95b118718a62d8e1a8b81347e50a0ea80 /OpenSim/Region/Physics/UbitOdePlugin | |
parent | calculate avatar size on tps (diff) | |
download | opensim-SC-2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2.zip opensim-SC-2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2.tar.gz opensim-SC-2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2.tar.bz2 opensim-SC-2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2.tar.xz |
create a new ode character also with the new information
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 9c245e6..15bdc57 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
156 | 156 | ||
157 | 157 | ||
158 | 158 | ||
159 | public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, Vector3 pSize, float density, float walk_divisor, float rundivisor) | 159 | public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, Vector3 pSize, float pfeetOffset, float density, float walk_divisor, float rundivisor) |
160 | { | 160 | { |
161 | m_uuid = UUID.Random(); | 161 | m_uuid = UUID.Random(); |
162 | 162 | ||
@@ -192,6 +192,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
192 | if(m_size.Z <0.01f) | 192 | if(m_size.Z <0.01f) |
193 | m_size.Z = 0.01f; | 193 | m_size.Z = 0.01f; |
194 | 194 | ||
195 | m_feetOffset = pfeetOffset; | ||
195 | m_orientation = Quaternion.Identity; | 196 | m_orientation = Quaternion.Identity; |
196 | m_density = density; | 197 | m_density = density; |
197 | 198 | ||
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 7d1d2fe..2ba5940 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -1388,13 +1388,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1388 | 1388 | ||
1389 | #region Add/Remove Entities | 1389 | #region Add/Remove Entities |
1390 | 1390 | ||
1391 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) | 1391 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) |
1392 | { | 1392 | { |
1393 | Vector3 pos; | 1393 | Vector3 pos; |
1394 | pos.X = position.X; | 1394 | pos.X = position.X; |
1395 | pos.Y = position.Y; | 1395 | pos.Y = position.Y; |
1396 | pos.Z = position.Z; | 1396 | pos.Z = position.Z; |
1397 | OdeCharacter newAv = new OdeCharacter(avName, this, pos, size, avDensity, avMovementDivisorWalk, avMovementDivisorRun); | 1397 | OdeCharacter newAv = new OdeCharacter(avName, this, pos, size, feetOffset, avDensity, avMovementDivisorWalk, avMovementDivisorRun); |
1398 | newAv.Flying = isFlying; | 1398 | newAv.Flying = isFlying; |
1399 | newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset; | 1399 | newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset; |
1400 | 1400 | ||