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/OptionalModules | |
parent | * Double the priority on avatar bake texture requests to get avatars rezzing ... (diff) | |
download | opensim-SC_OLD-d199767e6991d6f368661fce9c5a072e564b8a4b.zip opensim-SC_OLD-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.gz opensim-SC_OLD-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.bz2 opensim-SC_OLD-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.xz |
Experimental change of PhysicsVector to Vector3. Untested
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index 292e345..1f1ebae 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |||
@@ -525,8 +525,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
525 | { | 525 | { |
526 | get | 526 | get |
527 | { | 527 | { |
528 | PhysicsVector tmp = GetSOP().PhysActor.GeometricCenter; | 528 | Vector3 tmp = GetSOP().PhysActor.GeometricCenter; |
529 | return new Vector3(tmp.X, tmp.Y, tmp.Z); | 529 | return tmp; |
530 | } | 530 | } |
531 | } | 531 | } |
532 | 532 | ||
@@ -534,8 +534,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
534 | { | 534 | { |
535 | get | 535 | get |
536 | { | 536 | { |
537 | PhysicsVector tmp = GetSOP().PhysActor.CenterOfMass; | 537 | Vector3 tmp = GetSOP().PhysActor.CenterOfMass; |
538 | return new Vector3(tmp.X, tmp.Y, tmp.Z); | 538 | return tmp; |
539 | } | 539 | } |
540 | } | 540 | } |
541 | 541 | ||
@@ -543,15 +543,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
543 | { | 543 | { |
544 | get | 544 | get |
545 | { | 545 | { |
546 | PhysicsVector tmp = GetSOP().PhysActor.RotationalVelocity; | 546 | Vector3 tmp = GetSOP().PhysActor.RotationalVelocity; |
547 | return new Vector3(tmp.X, tmp.Y, tmp.Z); | 547 | return tmp; |
548 | } | 548 | } |
549 | set | 549 | set |
550 | { | 550 | { |
551 | if (!CanEdit()) | 551 | if (!CanEdit()) |
552 | return; | 552 | return; |
553 | 553 | ||
554 | GetSOP().PhysActor.RotationalVelocity = new PhysicsVector(value.X, value.Y, value.Z); | 554 | GetSOP().PhysActor.RotationalVelocity = value; |
555 | } | 555 | } |
556 | } | 556 | } |
557 | 557 | ||
@@ -559,15 +559,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
559 | { | 559 | { |
560 | get | 560 | get |
561 | { | 561 | { |
562 | PhysicsVector tmp = GetSOP().PhysActor.Velocity; | 562 | Vector3 tmp = GetSOP().PhysActor.Velocity; |
563 | return new Vector3(tmp.X, tmp.Y, tmp.Z); | 563 | return tmp; |
564 | } | 564 | } |
565 | set | 565 | set |
566 | { | 566 | { |
567 | if (!CanEdit()) | 567 | if (!CanEdit()) |
568 | return; | 568 | return; |
569 | 569 | ||
570 | GetSOP().PhysActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z); | 570 | GetSOP().PhysActor.Velocity = value; |
571 | } | 571 | } |
572 | } | 572 | } |
573 | 573 | ||
@@ -575,15 +575,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
575 | { | 575 | { |
576 | get | 576 | get |
577 | { | 577 | { |
578 | PhysicsVector tmp = GetSOP().PhysActor.Torque; | 578 | Vector3 tmp = GetSOP().PhysActor.Torque; |
579 | return new Vector3(tmp.X, tmp.Y, tmp.Z); | 579 | return tmp; |
580 | } | 580 | } |
581 | set | 581 | set |
582 | { | 582 | { |
583 | if (!CanEdit()) | 583 | if (!CanEdit()) |
584 | return; | 584 | return; |
585 | 585 | ||
586 | GetSOP().PhysActor.Torque = new PhysicsVector(value.X, value.Y, value.Z); | 586 | GetSOP().PhysActor.Torque = value; |
587 | } | 587 | } |
588 | } | 588 | } |
589 | 589 | ||
@@ -591,8 +591,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
591 | { | 591 | { |
592 | get | 592 | get |
593 | { | 593 | { |
594 | PhysicsVector tmp = GetSOP().PhysActor.Acceleration; | 594 | Vector3 tmp = GetSOP().PhysActor.Acceleration; |
595 | return new Vector3(tmp.X, tmp.Y, tmp.Z); | 595 | return tmp; |
596 | } | 596 | } |
597 | } | 597 | } |
598 | 598 | ||
@@ -600,15 +600,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
600 | { | 600 | { |
601 | get | 601 | get |
602 | { | 602 | { |
603 | PhysicsVector tmp = GetSOP().PhysActor.Force; | 603 | Vector3 tmp = GetSOP().PhysActor.Force; |
604 | return new Vector3(tmp.X, tmp.Y, tmp.Z); | 604 | return tmp; |
605 | } | 605 | } |
606 | set | 606 | set |
607 | { | 607 | { |
608 | if (!CanEdit()) | 608 | if (!CanEdit()) |
609 | return; | 609 | return; |
610 | 610 | ||
611 | GetSOP().PhysActor.Force = new PhysicsVector(value.X, value.Y, value.Z); | 611 | GetSOP().PhysActor.Force = value; |
612 | } | 612 | } |
613 | } | 613 | } |
614 | 614 | ||
@@ -627,7 +627,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
627 | if (!CanEdit()) | 627 | if (!CanEdit()) |
628 | return; | 628 | return; |
629 | 629 | ||
630 | GetSOP().PhysActor.AddForce(new PhysicsVector(force.X, force.Y, force.Z), pushforce); | 630 | GetSOP().PhysActor.AddForce(force, pushforce); |
631 | } | 631 | } |
632 | 632 | ||
633 | public void AddAngularForce(Vector3 force, bool pushforce) | 633 | public void AddAngularForce(Vector3 force, bool pushforce) |
@@ -635,7 +635,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
635 | if (!CanEdit()) | 635 | if (!CanEdit()) |
636 | return; | 636 | return; |
637 | 637 | ||
638 | GetSOP().PhysActor.AddAngularForce(new PhysicsVector(force.X, force.Y, force.Z), pushforce); | 638 | GetSOP().PhysActor.AddAngularForce(force, pushforce); |
639 | } | 639 | } |
640 | 640 | ||
641 | public void SetMomentum(Vector3 momentum) | 641 | public void SetMomentum(Vector3 momentum) |
@@ -643,7 +643,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
643 | if (!CanEdit()) | 643 | if (!CanEdit()) |
644 | return; | 644 | return; |
645 | 645 | ||
646 | GetSOP().PhysActor.SetMomentum(new PhysicsVector(momentum.X, momentum.Y, momentum.Z)); | 646 | GetSOP().PhysActor.SetMomentum(momentum); |
647 | } | 647 | } |
648 | 648 | ||
649 | #endregion | 649 | #endregion |