diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 2db7a54..b51f024 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |||
@@ -705,6 +705,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
705 | protected AxiomQuaternion _orientation; | 705 | protected AxiomQuaternion _orientation; |
706 | protected PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; | 706 | protected PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; |
707 | protected RigidBody rigidBody; | 707 | protected RigidBody rigidBody; |
708 | protected int m_PhysicsActorType; | ||
708 | private Boolean iscolliding = false; | 709 | private Boolean iscolliding = false; |
709 | internal string _name; | 710 | internal string _name; |
710 | 711 | ||
@@ -784,6 +785,12 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
784 | { | 785 | { |
785 | get { return 0; } | 786 | get { return 0; } |
786 | } | 787 | } |
788 | public override int PhysicsActorType | ||
789 | { | ||
790 | get { return (int) m_PhysicsActorType; } | ||
791 | set { m_PhysicsActorType = value; } | ||
792 | } | ||
793 | |||
787 | public RigidBody RigidBody | 794 | public RigidBody RigidBody |
788 | { | 795 | { |
789 | get { return rigidBody; } | 796 | get { return rigidBody; } |
@@ -814,6 +821,16 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
814 | get { return iscolliding; } | 821 | get { return iscolliding; } |
815 | set { iscolliding = value; } | 822 | set { iscolliding = value; } |
816 | } | 823 | } |
824 | public override bool CollidingGround | ||
825 | { | ||
826 | get { return false; } | ||
827 | set { return; } | ||
828 | } | ||
829 | public override bool CollidingObj | ||
830 | { | ||
831 | get { return false; } | ||
832 | set { return; } | ||
833 | } | ||
817 | public virtual void SetAcceleration(PhysicsVector accel) | 834 | public virtual void SetAcceleration(PhysicsVector accel) |
818 | { | 835 | { |
819 | lock (BulletXScene.BulletXLock) | 836 | lock (BulletXScene.BulletXLock) |
@@ -956,7 +973,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
956 | parent_scene.ddWorld.AddRigidBody(rigidBody); | 973 | parent_scene.ddWorld.AddRigidBody(rigidBody); |
957 | } | 974 | } |
958 | } | 975 | } |
959 | 976 | public override int PhysicsActorType | |
977 | { | ||
978 | get { return (int)ActorTypes.Agent; } | ||
979 | set { return; } | ||
980 | } | ||
960 | public override PhysicsVector Position | 981 | public override PhysicsVector Position |
961 | { | 982 | { |
962 | get { return base.Position; } | 983 | get { return base.Position; } |
@@ -1103,7 +1124,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
1103 | 1124 | ||
1104 | CreateRigidBody(parent_scene, mesh, pos, size); | 1125 | CreateRigidBody(parent_scene, mesh, pos, size); |
1105 | } | 1126 | } |
1106 | 1127 | public override int PhysicsActorType | |
1128 | { | ||
1129 | get { return (int)ActorTypes.Prim; } | ||
1130 | set { return; } | ||
1131 | } | ||
1107 | public override PhysicsVector Position | 1132 | public override PhysicsVector Position |
1108 | { | 1133 | { |
1109 | get { return base.Position; } | 1134 | get { return base.Position; } |