aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-08-20 14:18:17 +0100
committerUbitUmarov2015-08-20 14:18:17 +0100
commite312a0bc902f11f42faecce275d52dc388a1debb (patch)
tree390841c4fa159da1d26349cf457a6e6cdb02d883 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
parent update old git to os core version (diff)
downloadopensim-SC-e312a0bc902f11f42faecce275d52dc388a1debb.zip
opensim-SC-e312a0bc902f11f42faecce275d52dc388a1debb.tar.gz
opensim-SC-e312a0bc902f11f42faecce275d52dc388a1debb.tar.bz2
opensim-SC-e312a0bc902f11f42faecce275d52dc388a1debb.tar.xz
make it compatible with avn, no point making avn compatible with it
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs17
1 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index f934b8a..218ccda 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -114,6 +114,7 @@ namespace OpenSim.Region.Physics.OdePlugin
114 private float m_PIDTau; 114 private float m_PIDTau;
115 private float PID_D = 35f; 115 private float PID_D = 35f;
116 private float PID_G = 25f; 116 private float PID_G = 25f;
117 private bool m_usePID;
117 118
118 // KF: These next 7 params apply to llSetHoverHeight(float height, integer water, float tau), 119 // KF: These next 7 params apply to llSetHoverHeight(float height, integer water, float tau),
119 // and are for non-VEHICLES only. 120 // and are for non-VEHICLES only.
@@ -1730,7 +1731,7 @@ Console.WriteLine(" JointCreateFixed");
1730 // gravityz multiplier = 1 - m_buoyancy 1731 // gravityz multiplier = 1 - m_buoyancy
1731 fz = _parent_scene.gravityz * (1.0f - m_buoyancy) * m_mass; 1732 fz = _parent_scene.gravityz * (1.0f - m_buoyancy) * m_mass;
1732 1733
1733 if (PIDActive) 1734 if (m_usePID)
1734 { 1735 {
1735//Console.WriteLine("PID " + Name); 1736//Console.WriteLine("PID " + Name);
1736 // KF - this is for object move? eg. llSetPos() ? 1737 // KF - this is for object move? eg. llSetPos() ?
@@ -1802,7 +1803,7 @@ Console.WriteLine(" JointCreateFixed");
1802 } // end if (PIDActive) 1803 } // end if (PIDActive)
1803 1804
1804 // Hover PID Controller needs to be mutually exlusive to MoveTo PID controller 1805 // Hover PID Controller needs to be mutually exlusive to MoveTo PID controller
1805 if (m_useHoverPID && !PIDActive) 1806 if (m_useHoverPID && !m_usePID)
1806 { 1807 {
1807//Console.WriteLine("Hover " + Name); 1808//Console.WriteLine("Hover " + Name);
1808 1809
@@ -2874,7 +2875,7 @@ Console.WriteLine(" JointCreateFixed");
2874 // it does make sense to do this for tiny little instabilities with physical prim, however 0.5m/frame is fairly large. 2875 // it does make sense to do this for tiny little instabilities with physical prim, however 0.5m/frame is fairly large.
2875 // reducing this to 0.02m/frame seems to help the angular rubberbanding quite a bit, however, to make sure it doesn't affect elevators and vehicles 2876 // reducing this to 0.02m/frame seems to help the angular rubberbanding quite a bit, however, to make sure it doesn't affect elevators and vehicles
2876 // adding these logical exclusion situations to maintain this where I think it was intended to be. 2877 // adding these logical exclusion situations to maintain this where I think it was intended to be.
2877 if (m_throttleUpdates || PIDActive || (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE) || (Amotor != IntPtr.Zero)) 2878 if (m_throttleUpdates || m_usePID || (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE) || (Amotor != IntPtr.Zero))
2878 { 2879 {
2879 m_minvelocity = 0.5f; 2880 m_minvelocity = 0.5f;
2880 } 2881 }
@@ -2955,7 +2956,10 @@ Console.WriteLine(" JointCreateFixed");
2955 m_log.WarnFormat("[PHYSICS]: Got NaN PIDTarget from Scene on Object {0}", Name); 2956 m_log.WarnFormat("[PHYSICS]: Got NaN PIDTarget from Scene on Object {0}", Name);
2956 } 2957 }
2957 } 2958 }
2958 public override bool PIDActive { get; set; } 2959 // os version
2960 //public override bool PIDActive {get { return m_usePID; } set { m_usePID = value; } }
2961 public override bool PIDActive { set { m_usePID = value; } }
2962
2959 public override float PIDTau { set { m_PIDTau = value; } } 2963 public override float PIDTau { set { m_PIDTau = value; } }
2960 2964
2961 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } 2965 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
@@ -3352,7 +3356,10 @@ Console.WriteLine(" JointCreateFixed");
3352 RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; 3356 RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod;
3353 if (assetProvider != null) 3357 if (assetProvider != null)
3354 assetProvider(_pbs.SculptTexture, MeshAssetReceived); 3358 assetProvider(_pbs.SculptTexture, MeshAssetReceived);
3355 }, null, "ODEPrim.CheckMeshAsset"); 3359 // os version
3360 //}, null, "ODEPrim.CheckMeshAsset");
3361 // avn
3362 });
3356 } 3363 }
3357 } 3364 }
3358 3365