diff options
author | Teravus Ovares | 2009-04-20 03:07:53 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-04-20 03:07:53 +0000 |
commit | 21d44230305903d4702fb1809a43611d2ef60a2a (patch) | |
tree | 6b1bf5c34f6285b2018468daf7570414fba8ba28 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | turn back on fail on error, otherwise we don't end up knowing that we (diff) | |
download | opensim-SC-21d44230305903d4702fb1809a43611d2ef60a2a.zip opensim-SC-21d44230305903d4702fb1809a43611d2ef60a2a.tar.gz opensim-SC-21d44230305903d4702fb1809a43611d2ef60a2a.tar.bz2 opensim-SC-21d44230305903d4702fb1809a43611d2ef60a2a.tar.xz |
* Allow passing of material type to physics engine
* Define low friction and medium bounce for Glass
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index adb559a..7b3d18f 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -169,6 +169,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
169 | 169 | ||
170 | private ODEVehicleSettings m_vehicle; | 170 | private ODEVehicleSettings m_vehicle; |
171 | 171 | ||
172 | internal int m_material = (int)Material.Wood; | ||
173 | |||
172 | public OdePrim(String primName, OdeScene parent_scene, PhysicsVector pos, PhysicsVector size, | 174 | public OdePrim(String primName, OdeScene parent_scene, PhysicsVector pos, PhysicsVector size, |
173 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) | 175 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) |
174 | { | 176 | { |
@@ -3096,5 +3098,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3096 | dst.I.M22 = src.I.M22; | 3098 | dst.I.M22 = src.I.M22; |
3097 | } | 3099 | } |
3098 | 3100 | ||
3101 | public override void SetMaterial(int pMaterial) | ||
3102 | { | ||
3103 | m_material = pMaterial; | ||
3104 | } | ||
3105 | |||
3099 | } | 3106 | } |
3100 | } | 3107 | } |