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/POSPlugin/POSCharacter.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 '')
-rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs index 35fc616..26cd1dd 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | |||
@@ -36,20 +36,17 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
36 | { | 36 | { |
37 | public class POSCharacter : PhysicsActor | 37 | public class POSCharacter : PhysicsActor |
38 | { | 38 | { |
39 | private PhysicsVector _position; | 39 | private Vector3 _position; |
40 | public PhysicsVector _velocity; | 40 | public Vector3 _velocity; |
41 | public PhysicsVector _target_velocity = PhysicsVector.Zero; | 41 | public Vector3 _target_velocity = Vector3.Zero; |
42 | public PhysicsVector _size = PhysicsVector.Zero; | 42 | public Vector3 _size = Vector3.Zero; |
43 | private PhysicsVector _acceleration; | 43 | private Vector3 _acceleration; |
44 | private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; | 44 | private Vector3 m_rotationalVelocity = Vector3.Zero; |
45 | private bool flying; | 45 | private bool flying; |
46 | private bool isColliding; | 46 | private bool isColliding; |
47 | 47 | ||
48 | public POSCharacter() | 48 | public POSCharacter() |
49 | { | 49 | { |
50 | _velocity = new PhysicsVector(); | ||
51 | _position = new PhysicsVector(); | ||
52 | _acceleration = new PhysicsVector(); | ||
53 | } | 50 | } |
54 | 51 | ||
55 | public override int PhysicsActorType | 52 | public override int PhysicsActorType |
@@ -58,7 +55,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
58 | set { return; } | 55 | set { return; } |
59 | } | 56 | } |
60 | 57 | ||
61 | public override PhysicsVector RotationalVelocity | 58 | public override Vector3 RotationalVelocity |
62 | { | 59 | { |
63 | get { return m_rotationalVelocity; } | 60 | get { return m_rotationalVelocity; } |
64 | set { m_rotationalVelocity = value; } | 61 | set { m_rotationalVelocity = value; } |
@@ -137,13 +134,13 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
137 | get { return false; } | 134 | get { return false; } |
138 | } | 135 | } |
139 | 136 | ||
140 | public override PhysicsVector Position | 137 | public override Vector3 Position |
141 | { | 138 | { |
142 | get { return _position; } | 139 | get { return _position; } |
143 | set { _position = value; } | 140 | set { _position = value; } |
144 | } | 141 | } |
145 | 142 | ||
146 | public override PhysicsVector Size | 143 | public override Vector3 Size |
147 | { | 144 | { |
148 | get { return _size; } | 145 | get { return _size; } |
149 | set | 146 | set |
@@ -158,9 +155,9 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
158 | get { return 0f; } | 155 | get { return 0f; } |
159 | } | 156 | } |
160 | 157 | ||
161 | public override PhysicsVector Force | 158 | public override Vector3 Force |
162 | { | 159 | { |
163 | get { return PhysicsVector.Zero; } | 160 | get { return Vector3.Zero; } |
164 | set { return; } | 161 | set { return; } |
165 | } | 162 | } |
166 | 163 | ||
@@ -175,7 +172,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
175 | 172 | ||
176 | } | 173 | } |
177 | 174 | ||
178 | public override void VehicleVectorParam(int param, PhysicsVector value) | 175 | public override void VehicleVectorParam(int param, Vector3 value) |
179 | { | 176 | { |
180 | 177 | ||
181 | } | 178 | } |
@@ -190,14 +187,14 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
190 | 187 | ||
191 | } | 188 | } |
192 | 189 | ||
193 | public override PhysicsVector CenterOfMass | 190 | public override Vector3 CenterOfMass |
194 | { | 191 | { |
195 | get { return PhysicsVector.Zero; } | 192 | get { return Vector3.Zero; } |
196 | } | 193 | } |
197 | 194 | ||
198 | public override PhysicsVector GeometricCenter | 195 | public override Vector3 GeometricCenter |
199 | { | 196 | { |
200 | get { return PhysicsVector.Zero; } | 197 | get { return Vector3.Zero; } |
201 | } | 198 | } |
202 | 199 | ||
203 | public override PrimitiveBaseShape Shape | 200 | public override PrimitiveBaseShape Shape |
@@ -205,15 +202,15 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
205 | set { return; } | 202 | set { return; } |
206 | } | 203 | } |
207 | 204 | ||
208 | public override PhysicsVector Velocity | 205 | public override Vector3 Velocity |
209 | { | 206 | { |
210 | get { return _velocity; } | 207 | get { return _velocity; } |
211 | set { _target_velocity = value; } | 208 | set { _target_velocity = value; } |
212 | } | 209 | } |
213 | 210 | ||
214 | public override PhysicsVector Torque | 211 | public override Vector3 Torque |
215 | { | 212 | { |
216 | get { return PhysicsVector.Zero; } | 213 | get { return Vector3.Zero; } |
217 | set { return; } | 214 | set { return; } |
218 | } | 215 | } |
219 | 216 | ||
@@ -229,7 +226,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
229 | set { } | 226 | set { } |
230 | } | 227 | } |
231 | 228 | ||
232 | public override PhysicsVector Acceleration | 229 | public override Vector3 Acceleration |
233 | { | 230 | { |
234 | get { return _acceleration; } | 231 | get { return _acceleration; } |
235 | } | 232 | } |
@@ -248,24 +245,24 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
248 | { | 245 | { |
249 | } | 246 | } |
250 | 247 | ||
251 | public override void LockAngularMotion(PhysicsVector axis) | 248 | public override void LockAngularMotion(Vector3 axis) |
252 | { | 249 | { |
253 | } | 250 | } |
254 | 251 | ||
255 | public void SetAcceleration(PhysicsVector accel) | 252 | public void SetAcceleration(Vector3 accel) |
256 | { | 253 | { |
257 | _acceleration = accel; | 254 | _acceleration = accel; |
258 | } | 255 | } |
259 | 256 | ||
260 | public override void AddForce(PhysicsVector force, bool pushforce) | 257 | public override void AddForce(Vector3 force, bool pushforce) |
261 | { | 258 | { |
262 | } | 259 | } |
263 | 260 | ||
264 | public override void AddAngularForce(PhysicsVector force, bool pushforce) | 261 | public override void AddAngularForce(Vector3 force, bool pushforce) |
265 | { | 262 | { |
266 | } | 263 | } |
267 | 264 | ||
268 | public override void SetMomentum(PhysicsVector momentum) | 265 | public override void SetMomentum(Vector3 momentum) |
269 | { | 266 | { |
270 | } | 267 | } |
271 | 268 | ||
@@ -273,7 +270,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
273 | { | 270 | { |
274 | } | 271 | } |
275 | 272 | ||
276 | public override PhysicsVector PIDTarget | 273 | public override Vector3 PIDTarget |
277 | { | 274 | { |
278 | set { return; } | 275 | set { return; } |
279 | } | 276 | } |