diff options
author | Robert Adams | 2013-05-09 22:16:26 -0700 |
---|---|---|
committer | Robert Adams | 2013-05-09 22:16:26 -0700 |
commit | 43f3459c3a04bbb00989afa38b8b04d6711d6165 (patch) | |
tree | 2e54efb2239ea5aa9f11f2b515f5b0910e8b91f6 | |
parent | vh: make a vertex fetching method in Mesher public for BulletSim reference. (diff) | |
download | opensim-SC_OLD-43f3459c3a04bbb00989afa38b8b04d6711d6165.zip opensim-SC_OLD-43f3459c3a04bbb00989afa38b8b04d6711d6165.tar.gz opensim-SC_OLD-43f3459c3a04bbb00989afa38b8b04d6711d6165.tar.bz2 opensim-SC_OLD-43f3459c3a04bbb00989afa38b8b04d6711d6165.tar.xz |
vh: add material physical property definitions to PhysicsActor
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index d119791..bd806eb 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -147,6 +147,8 @@ namespace OpenSim.Region.Physics.Manager | |||
147 | 147 | ||
148 | public abstract Vector3 Size { get; set; } | 148 | public abstract Vector3 Size { get; set; } |
149 | 149 | ||
150 | public virtual byte PhysicsShapeType { get; set; } | ||
151 | |||
150 | public abstract PrimitiveBaseShape Shape { set; } | 152 | public abstract PrimitiveBaseShape Shape { set; } |
151 | 153 | ||
152 | uint m_baseLocalID; | 154 | uint m_baseLocalID; |
@@ -218,9 +220,11 @@ namespace OpenSim.Region.Physics.Manager | |||
218 | handler(e); | 220 | handler(e); |
219 | } | 221 | } |
220 | 222 | ||
221 | public virtual void SetMaterial (int material) | 223 | public virtual void SetMaterial (int material) { } |
222 | { | 224 | public virtual float Density { get; set; } |
223 | } | 225 | public virtual float GravModifier { get; set; } |
226 | public virtual float Friction { get; set; } | ||
227 | public virtual float Restitution { get; set; } | ||
224 | 228 | ||
225 | /// <summary> | 229 | /// <summary> |
226 | /// Position of this actor. | 230 | /// Position of this actor. |