add get method on physics actors PIDHoverActive

avinationmerge
UbitUmarov 2015-09-30 20:13:31 +01:00
parent f87e284ec2
commit aa3303e3af
11 changed files with 21 additions and 5 deletions

View File

@ -254,6 +254,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
public override bool PIDHoverActive public override bool PIDHoverActive
{ {
get { return false; }
set { return; } set { return; }
} }

View File

@ -267,6 +267,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
public override bool PIDHoverActive public override bool PIDHoverActive
{ {
get { return false; }
set { return; } set { return; }
} }

View File

@ -268,7 +268,7 @@ public abstract class BSPhysObject : PhysicsActor
public float MoveToTargetTau { get; set; } public float MoveToTargetTau { get; set; }
// Used for llSetHoverHeight and maybe vehicle height. Hover Height will override MoveTo target's Z // Used for llSetHoverHeight and maybe vehicle height. Hover Height will override MoveTo target's Z
public override bool PIDHoverActive { set { HoverActive = value; } } public override bool PIDHoverActive {get {return HoverActive;} set { HoverActive = value; } }
public override float PIDHoverHeight { set { HoverHeight = value; } } public override float PIDHoverHeight { set { HoverHeight = value; } }
public override PIDHoverType PIDHoverType { set { HoverType = value; } } public override PIDHoverType PIDHoverType { set { HoverType = value; } }
public override float PIDHoverTau { set { HoverTau = value; } } public override float PIDHoverTau { set { HoverTau = value; } }

View File

@ -1173,6 +1173,10 @@ public class BSPrim : BSPhysObject
// Used for llSetHoverHeight and maybe vehicle height // Used for llSetHoverHeight and maybe vehicle height
// Hover Height will override MoveTo target's Z // Hover Height will override MoveTo target's Z
public override bool PIDHoverActive { public override bool PIDHoverActive {
get
{
return base.HoverActive;
}
set { set {
base.HoverActive = value; base.HoverActive = value;
EnableActor(HoverActive, HoverActorName, delegate() EnableActor(HoverActive, HoverActorName, delegate()

View File

@ -1257,7 +1257,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
public override float PIDTau { set { return; } } public override float PIDTau { set { return; } }
public override float PIDHoverHeight { set { return; } } public override float PIDHoverHeight { set { return; } }
public override bool PIDHoverActive { set { return; } } public override bool PIDHoverActive {get {return false;} set { return; } }
public override PIDHoverType PIDHoverType { set { return; } } public override PIDHoverType PIDHoverType { set { return; } }
public override float PIDHoverTau { set { return; } } public override float PIDHoverTau { set { return; } }

View File

@ -3007,7 +3007,7 @@ Console.WriteLine(" JointCreateFixed");
public override float PIDTau { set { m_PIDTau = value; } } public override float PIDTau { set { m_PIDTau = value; } }
public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
public override bool PIDHoverActive { set { m_useHoverPID = value; } } public override bool PIDHoverActive { get { return m_useHoverPID;} set { m_useHoverPID = value; } }
public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
public override float PIDHoverTau { set { m_PIDHoverTau = value; } } public override float PIDHoverTau { set { m_PIDHoverTau = value; } }

View File

@ -291,6 +291,7 @@ namespace OpenSim.Region.PhysicsModule.POS
public override bool PIDHoverActive public override bool PIDHoverActive
{ {
get { return false; }
set { return; } set { return; }
} }

View File

@ -286,6 +286,7 @@ namespace OpenSim.Region.PhysicsModule.POS
public override bool PIDHoverActive public override bool PIDHoverActive
{ {
get { return false; }
set { return; } set { return; }
} }

View File

@ -391,7 +391,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
// Used for llSetHoverHeight and maybe vehicle height // Used for llSetHoverHeight and maybe vehicle height
// Hover Height will override MoveTo target's Z // Hover Height will override MoveTo target's Z
public abstract bool PIDHoverActive { set;} public abstract bool PIDHoverActive {get; set;}
public abstract float PIDHoverHeight { set;} public abstract float PIDHoverHeight { set;}
public abstract PIDHoverType PIDHoverType { set;} public abstract PIDHoverType PIDHoverType { set;}
public abstract float PIDHoverTau { set;} public abstract float PIDHoverTau { set;}
@ -621,7 +621,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
public override float PIDTau { set { return; } } public override float PIDTau { set { return; } }
public override float PIDHoverHeight { set { return; } } public override float PIDHoverHeight { set { return; } }
public override bool PIDHoverActive { set { return; } } public override bool PIDHoverActive {get {return false;} set { return; } }
public override PIDHoverType PIDHoverType { set { return; } } public override PIDHoverType PIDHoverType { set { return; } }
public override float PIDHoverTau { set { return; } } public override float PIDHoverTau { set { return; } }

View File

@ -1480,6 +1480,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
} }
public override bool PIDHoverActive public override bool PIDHoverActive
{ {
get
{
return m_useHoverPID;
}
set set
{ {
AddChange(changes.PIDHoverActive, value); AddChange(changes.PIDHoverActive, value);

View File

@ -747,6 +747,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
} }
public override bool PIDHoverActive public override bool PIDHoverActive
{ {
get
{
return m_useHoverPID;
}
set set
{ {
AddChange(changes.PIDHoverActive, value); AddChange(changes.PIDHoverActive, value);