diff options
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | 25 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 29 |
2 files changed, 28 insertions, 26 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs index 467eba0..019c78b 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | |||
| @@ -1,16 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Revised Aug, Sept 2009 by Kitto Flora. ODEDynamics.cs replaces | ||
| 3 | * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised: | ||
| 4 | * ODEPrim.cs contains methods dealing with Prim editing, Prim | ||
| 5 | * characteristics and Kinetic motion. | ||
| 6 | * ODEDynamics.cs contains methods dealing with Prim Physical motion | ||
| 7 | * (dynamics) and the associated settings. Old Linear and angular | ||
| 8 | * motors for dynamic motion have been replace with MoveLinear() | ||
| 9 | * and MoveAngular(); 'Physical' is used only to switch ODE dynamic | ||
| 10 | * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to | ||
| 11 | * switch between 'VEHICLE' parameter use and general dynamics | ||
| 12 | * settings use. | ||
| 13 | * | ||
| 14 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
| 15 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
| 16 | * | 4 | * |
| @@ -37,6 +25,19 @@ | |||
| 37 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 38 | */ | 26 | */ |
| 39 | 27 | ||
| 28 | /* Revised Aug, Sept 2009 by Kitto Flora. ODEDynamics.cs replaces | ||
| 29 | * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised: | ||
| 30 | * ODEPrim.cs contains methods dealing with Prim editing, Prim | ||
| 31 | * characteristics and Kinetic motion. | ||
| 32 | * ODEDynamics.cs contains methods dealing with Prim Physical motion | ||
| 33 | * (dynamics) and the associated settings. Old Linear and angular | ||
| 34 | * motors for dynamic motion have been replace with MoveLinear() | ||
| 35 | * and MoveAngular(); 'Physical' is used only to switch ODE dynamic | ||
| 36 | * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to | ||
| 37 | * switch between 'VEHICLE' parameter use and general dynamics | ||
| 38 | * settings use. | ||
| 39 | */ | ||
| 40 | |||
| 40 | using System; | 41 | using System; |
| 41 | using System.Collections.Generic; | 42 | using System.Collections.Generic; |
| 42 | using System.Reflection; | 43 | using System.Reflection; |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index f59f0ae..412f84d 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -1,18 +1,5 @@ | |||
| 1 | /* | 1 | /* Copyright (c) Contributors, http://opensimulator.org/ |
| 2 | * Revised August 26 2009 by Kitto Flora. ODEDynamics.cs replaces | ||
| 3 | * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised: | ||
| 4 | * ODEPrim.cs contains methods dealing with Prim editing, Prim | ||
| 5 | * characteristics and Kinetic motion. | ||
| 6 | * ODEDynamics.cs contains methods dealing with Prim Physical motion | ||
| 7 | * (dynamics) and the associated settings. Old Linear and angular | ||
| 8 | * motors for dynamic motion have been replace with MoveLinear() | ||
| 9 | * and MoveAngular(); 'Physical' is used only to switch ODE dynamic | ||
| 10 | * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to | ||
| 11 | * switch between 'VEHICLE' parameter use and general dynamics | ||
| 12 | * settings use. | ||
| 13 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
| 14 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 2 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
| 15 | * | ||
| 16 | * Redistribution and use in source and binary forms, with or without | 3 | * Redistribution and use in source and binary forms, with or without |
| 17 | * modification, are permitted provided that the following conditions are met: | 4 | * modification, are permitted provided that the following conditions are met: |
| 18 | * * Redistributions of source code must retain the above copyright | 5 | * * Redistributions of source code must retain the above copyright |
| @@ -35,6 +22,20 @@ | |||
| 35 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
| 36 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 37 | */ | 24 | */ |
| 25 | |||
| 26 | /* | ||
| 27 | * Revised August 26 2009 by Kitto Flora. ODEDynamics.cs replaces | ||
| 28 | * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised: | ||
| 29 | * ODEPrim.cs contains methods dealing with Prim editing, Prim | ||
| 30 | * characteristics and Kinetic motion. | ||
| 31 | * ODEDynamics.cs contains methods dealing with Prim Physical motion | ||
| 32 | * (dynamics) and the associated settings. Old Linear and angular | ||
| 33 | * motors for dynamic motion have been replace with MoveLinear() | ||
| 34 | * and MoveAngular(); 'Physical' is used only to switch ODE dynamic | ||
| 35 | * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to | ||
| 36 | * switch between 'VEHICLE' parameter use and general dynamics | ||
| 37 | * settings use. | ||
| 38 | */ | ||
| 38 | using System; | 39 | using System; |
| 39 | using System.Collections.Generic; | 40 | using System.Collections.Generic; |
| 40 | using System.Reflection; | 41 | using System.Reflection; |