diff options
author | Charles Krinke | 2007-10-31 04:18:34 +0000 |
---|---|---|
committer | Charles Krinke | 2007-10-31 04:18:34 +0000 |
commit | 33d6222e8dc40331e98c3549a040d3d206eed338 (patch) | |
tree | d5481827758cdfc7a9f44faf016706ed75bd9ca4 /OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |
parent | set svn:eol-style (diff) | |
download | opensim-SC-33d6222e8dc40331e98c3549a040d3d206eed338.zip opensim-SC-33d6222e8dc40331e98c3549a040d3d206eed338.tar.gz opensim-SC-33d6222e8dc40331e98c3549a040d3d206eed338.tar.bz2 opensim-SC-33d6222e8dc40331e98c3549a040d3d206eed338.tar.xz |
Thank you Teravus, very much, for a 'jump', 'crouch' and 'inertia' patch for all three physics plugins.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 1658e2d..8b05295 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |||
@@ -643,6 +643,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
643 | private PhysicsVector _acceleration; | 643 | private PhysicsVector _acceleration; |
644 | private AxiomQuaternion _orientation; | 644 | private AxiomQuaternion _orientation; |
645 | private bool flying; | 645 | private bool flying; |
646 | private bool iscolliding = false; | ||
646 | private RigidBody rigidBody; | 647 | private RigidBody rigidBody; |
647 | 648 | ||
648 | public Vector3 RigidBodyPosition | 649 | public Vector3 RigidBodyPosition |
@@ -773,6 +774,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
773 | get { return flying; } | 774 | get { return flying; } |
774 | set { flying = value; } | 775 | set { flying = value; } |
775 | } | 776 | } |
777 | public override bool IsColliding | ||
778 | { | ||
779 | get { return iscolliding; } | ||
780 | set { iscolliding = value; } | ||
781 | } | ||
776 | 782 | ||
777 | public void SetAcceleration(PhysicsVector accel) | 783 | public void SetAcceleration(PhysicsVector accel) |
778 | { | 784 | { |
@@ -913,6 +919,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
913 | private BulletXScene _parent_scene; | 919 | private BulletXScene _parent_scene; |
914 | //_physical value will be linked with the prim object value | 920 | //_physical value will be linked with the prim object value |
915 | private Boolean _physical = false; | 921 | private Boolean _physical = false; |
922 | private Boolean iscolliding = false; | ||
916 | 923 | ||
917 | public Vector3 RigidBodyPosition | 924 | public Vector3 RigidBodyPosition |
918 | { | 925 | { |
@@ -1060,6 +1067,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
1060 | set { } | 1067 | set { } |
1061 | } | 1068 | } |
1062 | 1069 | ||
1070 | public override bool IsColliding | ||
1071 | { | ||
1072 | get { return iscolliding; } | ||
1073 | set { iscolliding = value; } | ||
1074 | } | ||
1063 | public Boolean Physical | 1075 | public Boolean Physical |
1064 | { | 1076 | { |
1065 | get { return _physical; } | 1077 | get { return _physical; } |
@@ -1304,4 +1316,4 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
1304 | return height; | 1316 | return height; |
1305 | } | 1317 | } |
1306 | } | 1318 | } |
1307 | } \ No newline at end of file | 1319 | } |