OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused SetAcceleration and add set on Acceleration parameter

0.7.2-post-fixes
Dan Lake 2011-12-20 13:40:24 -08:00 committed by Justin Clark-Casey (justincc)
parent cd78f50632
commit 2b19a112d9
11 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -46,7 +46,7 @@ using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using OpenSim.Server.Base; using OpenSim.Server.Base;
using OpenSim.Services.Base; using OpenSim.Services.Base;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenSim.Services.UserAccountService; using OpenSim.Services.UserAccountService;

6
OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
View File

@ -233,6 +233,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
public override Vector3 Acceleration public override Vector3 Acceleration
{ {
get { return _acceleration; } get { return _acceleration; }
set { _acceleration = value; }
} }
public override bool Kinematic public override bool Kinematic
@ -253,11 +254,6 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
{ {
} }
public void SetAcceleration(Vector3 accel)
{
_acceleration = accel;
}
public override void AddForce(Vector3 force, bool pushforce) public override void AddForce(Vector3 force, bool pushforce)
{ {
} }

3
OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
View File

@ -231,7 +231,8 @@ public class BSCharacter : PhysicsActor
} }
} }
public override Vector3 Acceleration { public override Vector3 Acceleration {
get { return _acceleration; } get { return _acceleration; }
set { _acceleration = value; }
} }
public override Quaternion Orientation { public override Quaternion Orientation {
get { return _orientation; } get { return _orientation; }

3
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
View File

@ -417,7 +417,8 @@ public sealed class BSPrim : PhysicsActor
} }
} }
public override OMV.Vector3 Acceleration { public override OMV.Vector3 Acceleration {
get { return _acceleration; } get { return _acceleration; }
set { _acceleration = value; }
} }
public override OMV.Quaternion Orientation { public override OMV.Quaternion Orientation {
get { return _orientation; } get { return _orientation; }

3
OpenSim/Region/Physics/Manager/PhysicsActor.cs
View File

@ -257,7 +257,7 @@ namespace OpenSim.Region.Physics.Manager
public abstract Vector3 Torque { get; set; } public abstract Vector3 Torque { get; set; }
public abstract float CollisionScore { get; set;} public abstract float CollisionScore { get; set;}
public abstract Vector3 Acceleration { get; } public abstract Vector3 Acceleration { get; set; }
public abstract Quaternion Orientation { get; set; } public abstract Quaternion Orientation { get; set; }
public abstract int PhysicsActorType { get; set; } public abstract int PhysicsActorType { get; set; }
public abstract bool IsPhysical { get; set; } public abstract bool IsPhysical { get; set; }
@ -454,6 +454,7 @@ namespace OpenSim.Region.Physics.Manager
public override Vector3 Acceleration public override Vector3 Acceleration
{ {
get { return Vector3.Zero; } get { return Vector3.Zero; }
set { }
} }
public override bool IsPhysical public override bool IsPhysical

7
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -696,12 +696,7 @@ namespace OpenSim.Region.Physics.OdePlugin
public override Vector3 Acceleration public override Vector3 Acceleration
{ {
get { return _acceleration; } get { return _acceleration; }
} set { _acceleration = value; }
public void SetAcceleration(Vector3 accel)
{
m_pidControllerActive = true;
_acceleration = accel;
} }
/// <summary> /// <summary>

1
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -2503,6 +2503,7 @@ Console.WriteLine(" JointCreateFixed");
public override Vector3 Acceleration public override Vector3 Acceleration
{ {
get { return _acceleration; } get { return _acceleration; }
set { _acceleration = value; }
} }
public override void AddForce(Vector3 force, bool pushforce) public override void AddForce(Vector3 force, bool pushforce)

6
OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
View File

@ -231,6 +231,7 @@ namespace OpenSim.Region.Physics.POSPlugin
public override Vector3 Acceleration public override Vector3 Acceleration
{ {
get { return _acceleration; } get { return _acceleration; }
set { _acceleration = value; }
} }
public override bool Kinematic public override bool Kinematic
@ -251,11 +252,6 @@ namespace OpenSim.Region.Physics.POSPlugin
{ {
} }
public void SetAcceleration(Vector3 accel)
{
_acceleration = accel;
}
public override void AddForce(Vector3 force, bool pushforce) public override void AddForce(Vector3 force, bool pushforce)
{ {
} }

6
OpenSim/Region/Physics/POSPlugin/POSPrim.cs
View File

@ -193,6 +193,7 @@ namespace OpenSim.Region.Physics.POSPlugin
public override Vector3 Acceleration public override Vector3 Acceleration
{ {
get { return _acceleration; } get { return _acceleration; }
set { _acceleration = value; }
} }
public override bool Kinematic public override bool Kinematic
@ -201,11 +202,6 @@ namespace OpenSim.Region.Physics.POSPlugin
set { } set { }
} }
public void SetAcceleration(Vector3 accel)
{
_acceleration = accel;
}
public override void AddForce(Vector3 force, bool pushforce) public override void AddForce(Vector3 force, bool pushforce)
{ {
} }

6
OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
View File

@ -233,11 +233,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
public override Vector3 Acceleration public override Vector3 Acceleration
{ {
get { return _acceleration; } get { return _acceleration; }
} set { _acceleration = value; }
public void SetAcceleration(Vector3 accel)
{
_acceleration = accel;
} }
public override void AddForce(Vector3 force, bool pushforce) public override void AddForce(Vector3 force, bool pushforce)

6
OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
View File

@ -207,11 +207,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
public override Vector3 Acceleration public override Vector3 Acceleration
{ {
get { return _acceleration; } get { return _acceleration; }
} set { _acceleration = value; }
public void SetAcceleration(Vector3 accel)
{
_acceleration = accel;
} }
public override void AddForce(Vector3 force, bool pushforce) public override void AddForce(Vector3 force, bool pushforce)