aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorRobert Adams2013-07-06 08:22:59 -0700
committerRobert Adams2013-07-06 08:25:15 -0700
commita65cec3986431f5a2f4f9eb2424157def0d035c8 (patch)
tree5e8ea300f4d9042c52f0cc89367cb0e9dc7e3dee /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentBulletSim: More tweaking on center-of-mass. Almost there. Changes have no eff... (diff)
downloadopensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.zip
opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.tar.gz
opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.tar.bz2
opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.tar.xz
BulletSim: implementation of linkset center-of-mass.
Default off, for the moment, until more testing. Add separate thread and center-of-mass flags to OpenSimDefaults.ini. Clean up comments in OpenSimDefaults.ini.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index f0858ca..ce4c3da 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -802,6 +802,7 @@ public class BSPrim : BSPhysObject
802 // isSolid: other objects bounce off of this object 802 // isSolid: other objects bounce off of this object
803 // isVolumeDetect: other objects pass through but can generate collisions 803 // isVolumeDetect: other objects pass through but can generate collisions
804 // collisionEvents: whether this object returns collision events 804 // collisionEvents: whether this object returns collision events
805 // NOTE: overloaded by BSPrimLinkable to also update linkset physical parameters.
805 public virtual void UpdatePhysicalParameters() 806 public virtual void UpdatePhysicalParameters()
806 { 807 {
807 if (!PhysBody.HasPhysicalBody) 808 if (!PhysBody.HasPhysicalBody)
@@ -1532,6 +1533,8 @@ public class BSPrim : BSPhysObject
1532 1533
1533 // The physics engine says that properties have updated. Update same and inform 1534 // The physics engine says that properties have updated. Update same and inform
1534 // the world that things have changed. 1535 // the world that things have changed.
1536 // NOTE: BSPrim.UpdateProperties is overloaded by BSPrimLinkable which modifies updates from root and children prims.
1537 // NOTE: BSPrim.UpdateProperties is overloaded by BSPrimDisplaced which handles mapping physical position to simulator position.
1535 public override void UpdateProperties(EntityProperties entprop) 1538 public override void UpdateProperties(EntityProperties entprop)
1536 { 1539 {
1537 // Let anyone (like the actors) modify the updated properties before they are pushed into the object and the simulator. 1540 // Let anyone (like the actors) modify the updated properties before they are pushed into the object and the simulator.
@@ -1567,8 +1570,6 @@ public class BSPrim : BSPhysObject
1567 LastEntityProperties = CurrentEntityProperties; 1570 LastEntityProperties = CurrentEntityProperties;
1568 CurrentEntityProperties = entprop; 1571 CurrentEntityProperties = entprop;
1569 1572
1570 // Note that BSPrim can be overloaded by BSPrimLinkable which controls updates from root and children prims.
1571
1572 PhysScene.PostUpdate(this); 1573 PhysScene.PostUpdate(this);
1573 } 1574 }
1574} 1575}