aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorMW2007-08-23 11:38:50 +0000
committerMW2007-08-23 11:38:50 +0000
commitedd50f2e8ea384e1fe9f9dc0ed5903477cb383f3 (patch)
treed2444c1588b98d28fbedb43dbac8772b01a53762 /OpenSim/Region/Physics
parentAdded a PhysicsActor PhysActor member to SceneObjectPart, and made it so this... (diff)
downloadopensim-SC-edd50f2e8ea384e1fe9f9dc0ed5903477cb383f3.zip
opensim-SC-edd50f2e8ea384e1fe9f9dc0ed5903477cb383f3.tar.gz
opensim-SC-edd50f2e8ea384e1fe9f9dc0ed5903477cb383f3.tar.bz2
opensim-SC-edd50f2e8ea384e1fe9f9dc0ed5903477cb383f3.tar.xz
Implemented Resize Method in OdePrim.
attached the links to that from SceneObject, so now resizing works (as much as resizing currently works in opensim, fixing resizing in general is on my todo list for today). Rotation of a root prim also now updates the physics engine. So think there really is only deleteprim left, then it should be usable (Different shapes (other than boxes that it currently uses) can wait a little bit longer). [of course there are still the other issues of ODE not really working when there is more than one region in a instance of opensim].
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index ae46feb..f168340 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Physics.OdePlugin
148 148
149 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) 149 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
150 { 150 {
151 Console.WriteLine("+++++++++++++++++++++++++++++++++AddPrim pos: " + position + " size: " + size + " quat: " + rotation); 151 //Console.WriteLine("+++++++++++++++++++++++++++++++++AddPrim pos: " + position + " size: " + size + " quat: " + rotation);
152 PhysicsVector pos = new PhysicsVector(); 152 PhysicsVector pos = new PhysicsVector();
153 pos.X = position.X; 153 pos.X = position.X;
154 pos.Y = position.Y; 154 pos.Y = position.Y;
@@ -437,7 +437,7 @@ namespace OpenSim.Region.Physics.OdePlugin
437 } 437 }
438 set 438 set
439 { 439 {
440 Console.WriteLine("+++++++++++++++++++++++++++++++++++++++++++ setting pos: " + value); 440 //Console.WriteLine("+++++++++++++++++++++++++++++++++++++++++++ setting pos: " + value);
441 _position = value; 441 _position = value;
442 Monitor.Enter(typeof(OdeScene)); 442 Monitor.Enter(typeof(OdeScene));
443 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 443 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
@@ -454,8 +454,11 @@ namespace OpenSim.Region.Physics.OdePlugin
454 } 454 }
455 set 455 set
456 { 456 {
457 Console.WriteLine("+++++++++++++++++++++++++++++++++++++++++++ setting size: " + value); 457 //Console.WriteLine("+++++++++++++++++++++++++++++++++++++++++++ setting size: " + value);
458 _size = value; 458 _size = value;
459 Monitor.Enter(typeof(OdeScene));
460 d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
461 Monitor.Exit(typeof(OdeScene));
459 } 462 }
460 } 463 }
461 464
@@ -490,6 +493,7 @@ namespace OpenSim.Region.Physics.OdePlugin
490 } 493 }
491 set 494 set
492 { 495 {
496 //Console.WriteLine("+++++++++++++++++++++++++++++++++++++++++++ setting Orientation");
493 _orientation = value; 497 _orientation = value;
494 Monitor.Enter(typeof(OdeScene)); 498 Monitor.Enter(typeof(OdeScene));
495 d.Quaternion myrot = new d.Quaternion(); 499 d.Quaternion myrot = new d.Quaternion();