aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
authorTeravus Ovares2008-12-09 11:11:16 +0000
committerTeravus Ovares2008-12-09 11:11:16 +0000
commit3844e73d2742f4dee633bd2b5a8eb7e1a0d524f9 (patch)
tree11762c8bd9aa512d52de004e46e83a1e8e51e8a9 /OpenSim/Region/Physics/OdePlugin
parentclean up some old debugging code (diff)
downloadopensim-SC_OLD-3844e73d2742f4dee633bd2b5a8eb7e1a0d524f9.zip
opensim-SC_OLD-3844e73d2742f4dee633bd2b5a8eb7e1a0d524f9.tar.gz
opensim-SC_OLD-3844e73d2742f4dee633bd2b5a8eb7e1a0d524f9.tar.bz2
opensim-SC_OLD-3844e73d2742f4dee633bd2b5a8eb7e1a0d524f9.tar.xz
* Gerhard's patch m2781. Does some initial work for setting up llVolumeDetect.
* Warning! Physics API change. This means that the NBodySimulation needs to be updated! * PhysicsActor -> void SetVolumeDetect(int) needs to go into classes that use PhysicsActor as their base class.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs4
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs5
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs2
3 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index ed95886..6957cca 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -560,6 +560,10 @@ namespace OpenSim.Region.Physics.OdePlugin
560 560
561 } 561 }
562 562
563 public override void SetVolumeDetect(int param)
564 {
565
566 }
563 567
564 public override PhysicsVector CenterOfMass 568 public override PhysicsVector CenterOfMass
565 { 569 {
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 0a461e9..b7e4302 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2099,6 +2099,11 @@ namespace OpenSim.Region.Physics.OdePlugin
2099 2099
2100 } 2100 }
2101 2101
2102 public override void SetVolumeDetect(int param)
2103 {
2104
2105 }
2106
2102 public override PhysicsVector CenterOfMass 2107 public override PhysicsVector CenterOfMass
2103 { 2108 {
2104 get { return PhysicsVector.Zero; } 2109 get { return PhysicsVector.Zero; }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 031848c..a875d84 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Physics.OdePlugin
261 public int physics_logging_interval = 0; 261 public int physics_logging_interval = 0;
262 public bool physics_logging_append_existing_logfile = false; 262 public bool physics_logging_append_existing_logfile = false;
263 263
264 public d.Vector3 xyz = new d.Vector3(2.1640f, -1.3079f, 1.7600f); 264 public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f);
265 public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); 265 public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f);
266 266
267 /// <summary> 267 /// <summary>