diff options
author | UbitUmarov | 2015-09-30 20:13:31 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-30 20:13:31 +0100 |
commit | aa3303e3af2df9511b947902482409308198ce64 (patch) | |
tree | 35ea683b9a918a09763b87aa2916d58a2ba9f199 | |
parent | first steps adding suport for llSetHoverHeight() called from attachments on ... (diff) | |
download | opensim-SC_OLD-aa3303e3af2df9511b947902482409308198ce64.zip opensim-SC_OLD-aa3303e3af2df9511b947902482409308198ce64.tar.gz opensim-SC_OLD-aa3303e3af2df9511b947902482409308198ce64.tar.bz2 opensim-SC_OLD-aa3303e3af2df9511b947902482409308198ce64.tar.xz |
add get method on physics actors PIDHoverActive
11 files changed, 21 insertions, 5 deletions
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs index e7b30ba..7ad7f6b 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs | |||
@@ -254,6 +254,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
254 | 254 | ||
255 | public override bool PIDHoverActive | 255 | public override bool PIDHoverActive |
256 | { | 256 | { |
257 | get { return false; } | ||
257 | set { return; } | 258 | set { return; } |
258 | } | 259 | } |
259 | 260 | ||
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs index 5383f1b..b94f170 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs | |||
@@ -267,6 +267,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
267 | 267 | ||
268 | public override bool PIDHoverActive | 268 | public override bool PIDHoverActive |
269 | { | 269 | { |
270 | get { return false; } | ||
270 | set { return; } | 271 | set { return; } |
271 | } | 272 | } |
272 | 273 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs index da3fc18..c3eb776 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | |||
@@ -268,7 +268,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
268 | public float MoveToTargetTau { get; set; } | 268 | public float MoveToTargetTau { get; set; } |
269 | 269 | ||
270 | // Used for llSetHoverHeight and maybe vehicle height. Hover Height will override MoveTo target's Z | 270 | // Used for llSetHoverHeight and maybe vehicle height. Hover Height will override MoveTo target's Z |
271 | public override bool PIDHoverActive { set { HoverActive = value; } } | 271 | public override bool PIDHoverActive {get {return HoverActive;} set { HoverActive = value; } } |
272 | public override float PIDHoverHeight { set { HoverHeight = value; } } | 272 | public override float PIDHoverHeight { set { HoverHeight = value; } } |
273 | public override PIDHoverType PIDHoverType { set { HoverType = value; } } | 273 | public override PIDHoverType PIDHoverType { set { HoverType = value; } } |
274 | public override float PIDHoverTau { set { HoverTau = value; } } | 274 | public override float PIDHoverTau { set { HoverTau = value; } } |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index 436ea75..c8ac5c5 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |||
@@ -1173,6 +1173,10 @@ public class BSPrim : BSPhysObject | |||
1173 | // Used for llSetHoverHeight and maybe vehicle height | 1173 | // Used for llSetHoverHeight and maybe vehicle height |
1174 | // Hover Height will override MoveTo target's Z | 1174 | // Hover Height will override MoveTo target's Z |
1175 | public override bool PIDHoverActive { | 1175 | public override bool PIDHoverActive { |
1176 | get | ||
1177 | { | ||
1178 | return base.HoverActive; | ||
1179 | } | ||
1176 | set { | 1180 | set { |
1177 | base.HoverActive = value; | 1181 | base.HoverActive = value; |
1178 | EnableActor(HoverActive, HoverActorName, delegate() | 1182 | EnableActor(HoverActive, HoverActorName, delegate() |
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs index b35c299..8048e26 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs | |||
@@ -1257,7 +1257,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
1257 | public override float PIDTau { set { return; } } | 1257 | public override float PIDTau { set { return; } } |
1258 | 1258 | ||
1259 | public override float PIDHoverHeight { set { return; } } | 1259 | public override float PIDHoverHeight { set { return; } } |
1260 | public override bool PIDHoverActive { set { return; } } | 1260 | public override bool PIDHoverActive {get {return false;} set { return; } } |
1261 | public override PIDHoverType PIDHoverType { set { return; } } | 1261 | public override PIDHoverType PIDHoverType { set { return; } } |
1262 | public override float PIDHoverTau { set { return; } } | 1262 | public override float PIDHoverTau { set { return; } } |
1263 | 1263 | ||
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs index 54a2033..d22f912 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs | |||
@@ -3007,7 +3007,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
3007 | public override float PIDTau { set { m_PIDTau = value; } } | 3007 | public override float PIDTau { set { m_PIDTau = value; } } |
3008 | 3008 | ||
3009 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } | 3009 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } |
3010 | public override bool PIDHoverActive { set { m_useHoverPID = value; } } | 3010 | public override bool PIDHoverActive { get { return m_useHoverPID;} set { m_useHoverPID = value; } } |
3011 | public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } | 3011 | public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } |
3012 | public override float PIDHoverTau { set { m_PIDHoverTau = value; } } | 3012 | public override float PIDHoverTau { set { m_PIDHoverTau = value; } } |
3013 | 3013 | ||
diff --git a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs index 32469d9..b81ecfb 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | |||
@@ -291,6 +291,7 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
291 | 291 | ||
292 | public override bool PIDHoverActive | 292 | public override bool PIDHoverActive |
293 | { | 293 | { |
294 | get { return false; } | ||
294 | set { return; } | 295 | set { return; } |
295 | } | 296 | } |
296 | 297 | ||
diff --git a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs index c190fab..d1bbbae 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs | |||
@@ -286,6 +286,7 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
286 | 286 | ||
287 | public override bool PIDHoverActive | 287 | public override bool PIDHoverActive |
288 | { | 288 | { |
289 | get { return false; } | ||
289 | set { return; } | 290 | set { return; } |
290 | } | 291 | } |
291 | 292 | ||
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs index edc41e4..1965dc2 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs | |||
@@ -391,7 +391,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
391 | 391 | ||
392 | // Used for llSetHoverHeight and maybe vehicle height | 392 | // Used for llSetHoverHeight and maybe vehicle height |
393 | // Hover Height will override MoveTo target's Z | 393 | // Hover Height will override MoveTo target's Z |
394 | public abstract bool PIDHoverActive { set;} | 394 | public abstract bool PIDHoverActive {get; set;} |
395 | public abstract float PIDHoverHeight { set;} | 395 | public abstract float PIDHoverHeight { set;} |
396 | public abstract PIDHoverType PIDHoverType { set;} | 396 | public abstract PIDHoverType PIDHoverType { set;} |
397 | public abstract float PIDHoverTau { set;} | 397 | public abstract float PIDHoverTau { set;} |
@@ -621,7 +621,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
621 | public override float PIDTau { set { return; } } | 621 | public override float PIDTau { set { return; } } |
622 | 622 | ||
623 | public override float PIDHoverHeight { set { return; } } | 623 | public override float PIDHoverHeight { set { return; } } |
624 | public override bool PIDHoverActive { set { return; } } | 624 | public override bool PIDHoverActive {get {return false;} set { return; } } |
625 | public override PIDHoverType PIDHoverType { set { return; } } | 625 | public override PIDHoverType PIDHoverType { set { return; } } |
626 | public override float PIDHoverTau { set { return; } } | 626 | public override float PIDHoverTau { set { return; } } |
627 | 627 | ||
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs index 1cebacf..0d9f974 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs | |||
@@ -1480,6 +1480,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
1480 | } | 1480 | } |
1481 | public override bool PIDHoverActive | 1481 | public override bool PIDHoverActive |
1482 | { | 1482 | { |
1483 | get | ||
1484 | { | ||
1485 | return m_useHoverPID; | ||
1486 | } | ||
1483 | set | 1487 | set |
1484 | { | 1488 | { |
1485 | AddChange(changes.PIDHoverActive, value); | 1489 | AddChange(changes.PIDHoverActive, value); |
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs index 91aca26..229782b 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs | |||
@@ -747,6 +747,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
747 | } | 747 | } |
748 | public override bool PIDHoverActive | 748 | public override bool PIDHoverActive |
749 | { | 749 | { |
750 | get | ||
751 | { | ||
752 | return m_useHoverPID; | ||
753 | } | ||
750 | set | 754 | set |
751 | { | 755 | { |
752 | AddChange(changes.PIDHoverActive, value); | 756 | AddChange(changes.PIDHoverActive, value); |