aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
diff options
context:
space:
mode:
authorTeravus Ovares2009-04-07 00:13:08 +0000
committerTeravus Ovares2009-04-07 00:13:08 +0000
commit9459b16cc268ec39c05615ffdb86f6186a3105e7 (patch)
tree155dddb73bc1be302c28ef7d25d243bb5f864e6c /OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
parentAdded some null-checks to Intimidated's patch in r9024. (diff)
downloadopensim-SC_OLD-9459b16cc268ec39c05615ffdb86f6186a3105e7.zip
opensim-SC_OLD-9459b16cc268ec39c05615ffdb86f6186a3105e7.tar.gz
opensim-SC_OLD-9459b16cc268ec39c05615ffdb86f6186a3105e7.tar.bz2
opensim-SC_OLD-9459b16cc268ec39c05615ffdb86f6186a3105e7.tar.xz
* BulletDotNET Updates.
* Should react somewhat normally to editing, and setting physics now.
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs')
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
index 0158dfc..15c6798 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
@@ -187,8 +187,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
187 187
188 newPrim = new BulletDotNETPrim(name, this, pos, siz, rot, mesh, pbs, isphysical); 188 newPrim = new BulletDotNETPrim(name, this, pos, siz, rot, mesh, pbs, isphysical);
189 189
190 lock (m_prims) 190 //lock (m_prims)
191 m_prims.Add(newPrim); 191 // m_prims.Add(newPrim);
192 192
193 193
194 return newPrim; 194 return newPrim;
@@ -267,6 +267,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
267 { 267 {
268 foreach (BulletDotNETPrim prim in m_prims) 268 foreach (BulletDotNETPrim prim in m_prims)
269 { 269 {
270 if (prim != null)
270 prim.Move(timeStep); 271 prim.Move(timeStep);
271 } 272 }
272 } 273 }
@@ -279,6 +280,10 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
279 280
280 foreach (BulletDotNETPrim prm in m_activePrims) 281 foreach (BulletDotNETPrim prm in m_activePrims)
281 { 282 {
283 /*
284 if (prm != null)
285 if (prm.Body != null)
286 */
282 prm.UpdatePositionAndVelocity(); 287 prm.UpdatePositionAndVelocity();
283 } 288 }
284 289
@@ -487,6 +492,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
487 { 492 {
488 m_world.removeRigidBody(body); 493 m_world.removeRigidBody(body);
489 } 494 }
495 remActivePrim(prm);
490 m_prims.Remove(prm); 496 m_prims.Remove(prm);
491 } 497 }
492 498
@@ -662,6 +668,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
662 { 668 {
663 m_prims.Add(pPrim); 669 m_prims.Add(pPrim);
664 m_world.addRigidBody(pPrim.Body); 670 m_world.addRigidBody(pPrim.Body);
671 m_log.Debug("ADDED");
665 } 672 }
666 } 673 }
667 } 674 }