diff options
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs b/OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs index 214205d..f882e6c 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs | |||
@@ -27,13 +27,7 @@ | |||
27 | // Ubit Umarov 2012 | 27 | // Ubit Umarov 2012 |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
31 | using System.Runtime.InteropServices; | ||
32 | using System.Text; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Region.PhysicsModules.SharedBase; | 30 | using OpenSim.Region.PhysicsModules.SharedBase; |
35 | using OdeAPI; | ||
36 | using log4net; | ||
37 | using OpenMetaverse; | 31 | using OpenMetaverse; |
38 | 32 | ||
39 | namespace OpenSim.Region.PhysicsModule.ubOde | 33 | namespace OpenSim.Region.PhysicsModule.ubOde |
@@ -78,8 +72,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
78 | 72 | ||
79 | IntPtr geom = ((OdePrim)actor).prim_geom; | 73 | IntPtr geom = ((OdePrim)actor).prim_geom; |
80 | 74 | ||
81 | Vector3 geopos = d.GeomGetPositionOMV(geom); | 75 | Vector3 geopos = SafeNativeMethods.GeomGetPositionOMV(geom); |
82 | Quaternion geomOri = d.GeomGetQuaternionOMV(geom); | 76 | Quaternion geomOri = SafeNativeMethods.GeomGetQuaternionOMV(geom); |
83 | 77 | ||
84 | // Vector3 geopos = actor.Position; | 78 | // Vector3 geopos = actor.Position; |
85 | // Quaternion geomOri = actor.Orientation; | 79 | // Quaternion geomOri = actor.Orientation; |
@@ -123,11 +117,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
123 | 117 | ||
124 | offset = rayResults[0].Pos - geopos; | 118 | offset = rayResults[0].Pos - geopos; |
125 | 119 | ||
126 | d.GeomClassID geoclass = d.GeomGetClass(geom); | 120 | SafeNativeMethods.GeomClassID geoclass = SafeNativeMethods.GeomGetClass(geom); |
127 | 121 | ||
128 | if (geoclass == d.GeomClassID.SphereClass) | 122 | if (geoclass == SafeNativeMethods.GeomClassID.SphereClass) |
129 | { | 123 | { |
130 | float r = d.GeomSphereGetRadius(geom); | 124 | float r = SafeNativeMethods.GeomSphereGetRadius(geom); |
131 | 125 | ||
132 | offset.Normalize(); | 126 | offset.Normalize(); |
133 | offset *= r; | 127 | offset *= r; |