aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-12-17 22:34:21 +0000
committerUbitUmarov2015-12-17 22:34:21 +0000
commitb2acef8aad43307d92f2252a9d21e9b3b05dc0d7 (patch)
tree104842f43cb9483dbbb65181c86b7176c26e553e
parentfix silly bug: Dynamics are to apply to root prim not child (diff)
downloadopensim-SC_OLD-b2acef8aad43307d92f2252a9d21e9b3b05dc0d7.zip
opensim-SC_OLD-b2acef8aad43307d92f2252a9d21e9b3b05dc0d7.tar.gz
opensim-SC_OLD-b2acef8aad43307d92f2252a9d21e9b3b05dc0d7.tar.bz2
opensim-SC_OLD-b2acef8aad43307d92f2252a9d21e9b3b05dc0d7.tar.xz
remove the unused OBB physics parameters export, since they aren't actually usefull outside ubOde
-rw-r--r--OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs29
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs24
2 files changed, 0 insertions, 53 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
index ebd2185..393afae 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
@@ -351,35 +351,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
351 public abstract Vector3 GeometricCenter { get; } 351 public abstract Vector3 GeometricCenter { get; }
352 public abstract Vector3 CenterOfMass { get; } 352 public abstract Vector3 CenterOfMass { get; }
353 353
354 public virtual Vector3 OOBsize
355 {
356 get
357 {
358 Vector3 s=Size;
359 s.X *=0.5f;
360 s.Y *=0.5f;
361 s.Z *=0.5f;
362 return s;
363 }
364 }
365
366 public virtual Vector3 OOBoffset
367 {
368 get
369 {
370 return Vector3.Zero;
371 }
372 }
373
374 public virtual float OOBRadiusSQ
375 {
376 get
377 {
378 return Size.LengthSquared() * 0.25f; // ((0.5^2)
379 }
380 }
381
382
383 public virtual float PhysicsCost 354 public virtual float PhysicsCost
384 { 355 {
385 get 356 get
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index 24fceb9..6ed42d9 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -520,30 +520,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
520 } 520 }
521 } 521 }
522 522
523 public override Vector3 OOBsize
524 {
525 get
526 {
527 return m_OBB;
528 }
529 }
530
531 public override Vector3 OOBoffset
532 {
533 get
534 {
535 return m_OBBOffset;
536 }
537 }
538
539 public override float OOBRadiusSQ
540 {
541 get
542 {
543 return primOOBradiusSQ;
544 }
545 }
546
547 public override PrimitiveBaseShape Shape 523 public override PrimitiveBaseShape Shape
548 { 524 {
549 set 525 set