diff options
author | Robert Adams | 2012-10-12 16:03:03 -0700 |
---|---|---|
committer | Robert Adams | 2012-10-19 10:51:58 -0700 |
commit | fd7a097849b8a405bdd62cfe6d4ee2bbf0a3961c (patch) | |
tree | 93606a507aa16538a73e10956735a66f4306fe18 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
parent | minor: Increase attachment name field from 36 to 50 chars in "attachments sho... (diff) | |
download | opensim-SC_OLD-fd7a097849b8a405bdd62cfe6d4ee2bbf0a3961c.zip opensim-SC_OLD-fd7a097849b8a405bdd62cfe6d4ee2bbf0a3961c.tar.gz opensim-SC_OLD-fd7a097849b8a405bdd62cfe6d4ee2bbf0a3961c.tar.bz2 opensim-SC_OLD-fd7a097849b8a405bdd62cfe6d4ee2bbf0a3961c.tar.xz |
BulletSim: Update BSCharacter to use API2 interface.
Add capsule shape to BSShapeCollection().
Remember last updated values so inter frame diffs can be computed.
Parameterize avatarStandingFriction and reduce to 10 from 999.
The latter high value made avatars very hard to push.
Set CCD parameters for prims and characters of specified.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index cae599c..34dec26 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -69,6 +69,16 @@ public abstract class BSPhysObject : PhysicsActor | |||
69 | // Reference to the physical shape (btCollisionShape) of this object | 69 | // Reference to the physical shape (btCollisionShape) of this object |
70 | public BulletShape BSShape; | 70 | public BulletShape BSShape; |
71 | 71 | ||
72 | // When the physical properties are updated, an EntityProperty holds the update values. | ||
73 | // Keep the current and last EntityProperties to enable computation of differences | ||
74 | // between the current update and the previous values. | ||
75 | public EntityProperties CurrentEntityProperties { get; set; } | ||
76 | public EntityProperties LastEntityProperties { get; set; } | ||
77 | |||
78 | public abstract OMV.Vector3 Scale { get; set; } | ||
79 | public abstract bool IsSolid { get; } | ||
80 | public abstract bool IsStatic { get; } | ||
81 | |||
72 | // Stop all physical motion. | 82 | // Stop all physical motion. |
73 | public abstract void ZeroMotion(); | 83 | public abstract void ZeroMotion(); |
74 | 84 | ||
@@ -89,6 +99,8 @@ public abstract class BSPhysObject : PhysicsActor | |||
89 | 99 | ||
90 | public abstract OMV.Vector3 ForceRotationalVelocity { get; set; } | 100 | public abstract OMV.Vector3 ForceRotationalVelocity { get; set; } |
91 | 101 | ||
102 | public abstract float ForceBuoyancy { get; set; } | ||
103 | |||
92 | #region Collisions | 104 | #region Collisions |
93 | 105 | ||
94 | // Requested number of milliseconds between collision events. Zero means disabled. | 106 | // Requested number of milliseconds between collision events. Zero means disabled. |