diff options
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSPrim.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 20 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
10 files changed, 78 insertions, 33 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 302bda3..e76952a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -2337,11 +2337,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
2337 | } | 2337 | } |
2338 | } | 2338 | } |
2339 | 2339 | ||
2340 | public void SetVehicleFloatParam(float value) | 2340 | public void SetVehicleFloatParam(int param, float value) |
2341 | { | 2341 | { |
2342 | if (PhysActor != null) | 2342 | if (PhysActor != null) |
2343 | { | 2343 | { |
2344 | PhysActor.VehicleFloatParam = value; | 2344 | PhysActor.VehicleFloatParam(param, value); |
2345 | } | ||
2346 | } | ||
2347 | |||
2348 | public void SetVehicleVectorParam(int param, PhysicsVector value) | ||
2349 | { | ||
2350 | if (PhysActor != null) | ||
2351 | { | ||
2352 | PhysActor.VehicleVectorParam(param, value); | ||
2345 | } | 2353 | } |
2346 | } | 2354 | } |
2347 | 2355 | ||
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs index 23b7518..c75c40e 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | |||
@@ -335,12 +335,16 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
335 | set { return; } | 335 | set { return; } |
336 | } | 336 | } |
337 | 337 | ||
338 | public override float VehicleFloatParam | 338 | public override void VehicleFloatParam(int param, float value) |
339 | { | 339 | { |
340 | get { return 0f; } | 340 | |
341 | set { return; } | 341 | } |
342 | |||
343 | public override void VehicleVectorParam(int param, PhysicsVector value) | ||
344 | { | ||
345 | |||
342 | } | 346 | } |
343 | 347 | ||
344 | public override PhysicsVector CenterOfMass | 348 | public override PhysicsVector CenterOfMass |
345 | { | 349 | { |
346 | get { return PhysicsVector.Zero; } | 350 | get { return PhysicsVector.Zero; } |
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 39fab43..acd4cb1 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |||
@@ -950,12 +950,16 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
950 | set { return; } | 950 | set { return; } |
951 | } | 951 | } |
952 | 952 | ||
953 | public override float VehicleFloatParam | 953 | public override void VehicleFloatParam(int param, float value) |
954 | { | 954 | { |
955 | get { return 0f; } | 955 | |
956 | set { return; } | 956 | } |
957 | |||
958 | public override void VehicleVectorParam(int param, PhysicsVector value) | ||
959 | { | ||
960 | |||
957 | } | 961 | } |
958 | 962 | ||
959 | public override PhysicsVector CenterOfMass | 963 | public override PhysicsVector CenterOfMass |
960 | { | 964 | { |
961 | get { return PhysicsVector.Zero; } | 965 | get { return PhysicsVector.Zero; } |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 16825a9..c5e6c8b 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -175,7 +175,8 @@ namespace OpenSim.Region.Physics.Manager | |||
175 | public abstract float Mass { get; } | 175 | public abstract float Mass { get; } |
176 | public abstract PhysicsVector Force { get; set; } | 176 | public abstract PhysicsVector Force { get; set; } |
177 | 177 | ||
178 | public abstract float VehicleFloatParam { get; set; } | 178 | public abstract void VehicleFloatParam(int param, float value); |
179 | public abstract void VehicleVectorParam(int param, PhysicsVector value); | ||
179 | 180 | ||
180 | public abstract PhysicsVector GeometricCenter { get; } | 181 | public abstract PhysicsVector GeometricCenter { get; } |
181 | public abstract PhysicsVector CenterOfMass { get; } | 182 | public abstract PhysicsVector CenterOfMass { get; } |
@@ -279,10 +280,14 @@ namespace OpenSim.Region.Physics.Manager | |||
279 | set { return; } | 280 | set { return; } |
280 | } | 281 | } |
281 | 282 | ||
282 | public override float VehicleFloatParam | 283 | public override void VehicleFloatParam(int param, float value) |
283 | { | 284 | { |
284 | get { return 0f; } | 285 | |
285 | set { return; } | 286 | } |
287 | |||
288 | public override void VehicleVectorParam(int param, PhysicsVector value) | ||
289 | { | ||
290 | |||
286 | } | 291 | } |
287 | 292 | ||
288 | public override PhysicsVector CenterOfMass | 293 | public override PhysicsVector CenterOfMass |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 6c1c876..b6dbac0 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -537,10 +537,14 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
537 | set { return; } | 537 | set { return; } |
538 | } | 538 | } |
539 | 539 | ||
540 | public override float VehicleFloatParam | 540 | public override void VehicleFloatParam(int param, float value) |
541 | { | 541 | { |
542 | get { return 0f; } | 542 | |
543 | set { return; } | 543 | } |
544 | |||
545 | public override void VehicleVectorParam(int param, PhysicsVector value) | ||
546 | { | ||
547 | |||
544 | } | 548 | } |
545 | 549 | ||
546 | public override PhysicsVector CenterOfMass | 550 | public override PhysicsVector CenterOfMass |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index a6116de..3af73cd 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -1876,10 +1876,14 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1876 | set { m_force = value; } | 1876 | set { m_force = value; } |
1877 | } | 1877 | } |
1878 | 1878 | ||
1879 | public override float VehicleFloatParam | 1879 | public override void VehicleFloatParam(int param, float value) |
1880 | { | 1880 | { |
1881 | get { return 0f; } | 1881 | |
1882 | set { return; } | 1882 | } |
1883 | |||
1884 | public override void VehicleVectorParam(int param, PhysicsVector value) | ||
1885 | { | ||
1886 | |||
1883 | } | 1887 | } |
1884 | 1888 | ||
1885 | public override PhysicsVector CenterOfMass | 1889 | public override PhysicsVector CenterOfMass |
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs index 6ab5d88..719d4cf 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | |||
@@ -159,10 +159,14 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
159 | set { return; } | 159 | set { return; } |
160 | } | 160 | } |
161 | 161 | ||
162 | public override float VehicleFloatParam | 162 | public override void VehicleFloatParam(int param, float value) |
163 | { | 163 | { |
164 | get { return 0f; } | 164 | |
165 | set { return; } | 165 | } |
166 | |||
167 | public override void VehicleVectorParam(int param, PhysicsVector value) | ||
168 | { | ||
169 | |||
166 | } | 170 | } |
167 | 171 | ||
168 | public override PhysicsVector CenterOfMass | 172 | public override PhysicsVector CenterOfMass |
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs index c5cb91a..a674e77 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |||
@@ -121,10 +121,14 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
121 | set { return; } | 121 | set { return; } |
122 | } | 122 | } |
123 | 123 | ||
124 | public override float VehicleFloatParam | 124 | public override void VehicleFloatParam(int param, float value) |
125 | { | 125 | { |
126 | get { return 0f; } | 126 | |
127 | set { return; } | 127 | } |
128 | |||
129 | public override void VehicleVectorParam(int param, PhysicsVector value) | ||
130 | { | ||
131 | |||
128 | } | 132 | } |
129 | 133 | ||
130 | public override PhysicsVector CenterOfMass | 134 | public override PhysicsVector CenterOfMass |
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 4ce2130..c65ce1d 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -343,10 +343,14 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
343 | set { return; } | 343 | set { return; } |
344 | } | 344 | } |
345 | 345 | ||
346 | public override float VehicleFloatParam | 346 | public override void VehicleFloatParam(int param, float value) |
347 | { | 347 | { |
348 | get { return 0f; } | 348 | |
349 | set { return; } | 349 | } |
350 | |||
351 | public override void VehicleVectorParam(int param, PhysicsVector value) | ||
352 | { | ||
353 | |||
350 | } | 354 | } |
351 | 355 | ||
352 | public override PhysicsVector CenterOfMass | 356 | public override PhysicsVector CenterOfMass |
@@ -679,10 +683,14 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
679 | set { return; } | 683 | set { return; } |
680 | } | 684 | } |
681 | 685 | ||
682 | public override float VehicleFloatParam | 686 | public override void VehicleFloatParam(int param, float value) |
683 | { | 687 | { |
684 | get { return 0f; } | 688 | |
685 | set { return; } | 689 | } |
690 | |||
691 | public override void VehicleVectorParam(int param, PhysicsVector value) | ||
692 | { | ||
693 | |||
686 | } | 694 | } |
687 | 695 | ||
688 | public override PhysicsVector CenterOfMass | 696 | public override PhysicsVector CenterOfMass |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f8257c3..4da3360 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -5170,7 +5170,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5170 | { | 5170 | { |
5171 | if (m_host.ParentGroup.RootPart != null) | 5171 | if (m_host.ParentGroup.RootPart != null) |
5172 | { | 5172 | { |
5173 | m_host.ParentGroup.RootPart.SetVehicleFloatParam(value); | 5173 | m_host.ParentGroup.RootPart.SetVehicleFloatParam(param, value); |
5174 | } | 5174 | } |
5175 | } | 5175 | } |
5176 | } | 5176 | } |