diff options
author | Melanie | 2009-12-22 00:26:12 +0000 |
---|---|---|
committer | Melanie | 2009-12-22 00:26:12 +0000 |
commit | e530180c1e8e9758df7cb9a72ad0715fd7c8a0e7 (patch) | |
tree | 4dd38866eae8bd8e989273ed2cccf3c9dd11deb4 /OpenSim/Region/Physics/BulletDotNETPlugin | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-e530180c1e8e9758df7cb9a72ad0715fd7c8a0e7.zip opensim-SC-e530180c1e8e9758df7cb9a72ad0715fd7c8a0e7.tar.gz opensim-SC-e530180c1e8e9758df7cb9a72ad0715fd7c8a0e7.tar.bz2 opensim-SC-e530180c1e8e9758df7cb9a72ad0715fd7c8a0e7.tar.xz |
Glue code for a couple of new LSL function implementations
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | 21 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | 6 |
2 files changed, 26 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs index 5ed3b14..02328b5 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | |||
@@ -620,6 +620,27 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
620 | set { return; } | 620 | set { return; } |
621 | } | 621 | } |
622 | 622 | ||
623 | |||
624 | public override Quaternion APIDTarget | ||
625 | { | ||
626 | set { return; } | ||
627 | } | ||
628 | |||
629 | public override bool APIDActive | ||
630 | { | ||
631 | set { return; } | ||
632 | } | ||
633 | |||
634 | public override float APIDStrength | ||
635 | { | ||
636 | set { return; } | ||
637 | } | ||
638 | |||
639 | public override float APIDDamping | ||
640 | { | ||
641 | set { return; } | ||
642 | } | ||
643 | |||
623 | /// <summary> | 644 | /// <summary> |
624 | /// Adds the force supplied to the Target Velocity | 645 | /// Adds the force supplied to the Target Velocity |
625 | /// The PID controller takes this target velocity and tries to make it a reality | 646 | /// The PID controller takes this target velocity and tries to make it a reality |
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs index 5b542db..9603ea4 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |||
@@ -565,7 +565,11 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
565 | public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } | 565 | public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } |
566 | public override float PIDHoverTau { set { m_PIDHoverTau = value; } } | 566 | public override float PIDHoverTau { set { m_PIDHoverTau = value; } } |
567 | 567 | ||
568 | 568 | public override Quaternion APIDTarget { set { return; } } | |
569 | public override bool APIDActive { set { return; } } | ||
570 | public override float APIDStrength { set { return; } } | ||
571 | public override float APIDDamping { set { return; } } | ||
572 | |||
569 | public override void AddForce(Vector3 force, bool pushforce) | 573 | public override void AddForce(Vector3 force, bool pushforce) |
570 | { | 574 | { |
571 | m_forcelist.Add(force); | 575 | m_forcelist.Add(force); |