diff options
author | John Hurliman | 2009-10-25 23:16:12 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-26 18:23:43 -0700 |
commit | d199767e6991d6f368661fce9c5a072e564b8a4b (patch) | |
tree | d9347b8a424c0164e208f908613aa8fe1511444b /OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | |
parent | * Double the priority on avatar bake texture requests to get avatars rezzing ... (diff) | |
download | opensim-SC-d199767e6991d6f368661fce9c5a072e564b8a4b.zip opensim-SC-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.gz opensim-SC-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.bz2 opensim-SC-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.xz |
Experimental change of PhysicsVector to Vector3. Untested
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs index 18d4bab..9e048ab 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | |||
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
139 | 139 | ||
140 | } | 140 | } |
141 | 141 | ||
142 | public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size, bool isFlying) | 142 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) |
143 | { | 143 | { |
144 | BulletDotNETCharacter chr = new BulletDotNETCharacter(avName, this, position, size, avPIDD, avPIDP, | 144 | BulletDotNETCharacter chr = new BulletDotNETCharacter(avName, this, position, size, avPIDD, avPIDP, |
145 | avCapRadius, avStandupTensor, avDensity, | 145 | avCapRadius, avStandupTensor, avDensity, |
@@ -177,14 +177,14 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
177 | } | 177 | } |
178 | } | 178 | } |
179 | 179 | ||
180 | private PhysicsActor AddPrim(String name, PhysicsVector position, PhysicsVector size, Quaternion rotation, | 180 | private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation, |
181 | IMesh mesh, PrimitiveBaseShape pbs, bool isphysical) | 181 | IMesh mesh, PrimitiveBaseShape pbs, bool isphysical) |
182 | { | 182 | { |
183 | PhysicsVector pos = new PhysicsVector(position.X, position.Y, position.Z); | 183 | Vector3 pos = position; |
184 | //pos.X = position.X; | 184 | //pos.X = position.X; |
185 | //pos.Y = position.Y; | 185 | //pos.Y = position.Y; |
186 | //pos.Z = position.Z; | 186 | //pos.Z = position.Z; |
187 | PhysicsVector siz = new PhysicsVector(); | 187 | Vector3 siz = Vector3.Zero; |
188 | siz.X = size.X; | 188 | siz.X = size.X; |
189 | siz.Y = size.Y; | 189 | siz.Y = size.Y; |
190 | siz.Z = size.Z; | 190 | siz.Z = size.Z; |
@@ -201,12 +201,12 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
201 | return newPrim; | 201 | return newPrim; |
202 | } | 202 | } |
203 | 203 | ||
204 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation) | 204 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, Vector3 size, Quaternion rotation) |
205 | { | 205 | { |
206 | return AddPrimShape(primName, pbs, position, size, rotation, false); | 206 | return AddPrimShape(primName, pbs, position, size, rotation, false); |
207 | } | 207 | } |
208 | 208 | ||
209 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation, bool isPhysical) | 209 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, Vector3 size, Quaternion rotation, bool isPhysical) |
210 | { | 210 | { |
211 | PhysicsActor result; | 211 | PhysicsActor result; |
212 | IMesh mesh = null; | 212 | IMesh mesh = null; |