diff options
author | Robert Adams | 2013-07-04 12:16:33 -0700 |
---|---|---|
committer | Robert Adams | 2013-07-06 08:25:13 -0700 |
commit | 5f97c6f8f06f0b90ab815a1d44358dc256ec5a50 (patch) | |
tree | 9f2d26cc4536c72864c3c1faa683c65569c60b06 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
parent | Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to be... (diff) | |
download | opensim-SC_OLD-5f97c6f8f06f0b90ab815a1d44358dc256ec5a50.zip opensim-SC_OLD-5f97c6f8f06f0b90ab815a1d44358dc256ec5a50.tar.gz opensim-SC_OLD-5f97c6f8f06f0b90ab815a1d44358dc256ec5a50.tar.bz2 opensim-SC_OLD-5f97c6f8f06f0b90ab815a1d44358dc256ec5a50.tar.xz |
BulletSim: non-functional updates. Comments and formatting.
Update TODO list.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index b2947c6..f0858ca 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -1125,7 +1125,9 @@ public class BSPrim : BSPhysObject | |||
1125 | OMV.Vector3 addForce = force; | 1125 | OMV.Vector3 addForce = force; |
1126 | PhysScene.TaintedObject(inTaintTime, "BSPrim.AddForce", delegate() | 1126 | PhysScene.TaintedObject(inTaintTime, "BSPrim.AddForce", delegate() |
1127 | { | 1127 | { |
1128 | // Bullet adds this central force to the total force for this tick | 1128 | // Bullet adds this central force to the total force for this tick. |
1129 | // Deep down in Bullet: | ||
1130 | // linearVelocity += totalForce / mass * timeStep; | ||
1129 | DetailLog("{0},BSPrim.addForce,taint,force={1}", LocalID, addForce); | 1131 | DetailLog("{0},BSPrim.addForce,taint,force={1}", LocalID, addForce); |
1130 | if (PhysBody.HasPhysicalBody) | 1132 | if (PhysBody.HasPhysicalBody) |
1131 | { | 1133 | { |
@@ -1493,6 +1495,8 @@ public class BSPrim : BSPhysObject | |||
1493 | 1495 | ||
1494 | returnMass = Util.Clamp(returnMass, BSParam.MinimumObjectMass, BSParam.MaximumObjectMass); | 1496 | returnMass = Util.Clamp(returnMass, BSParam.MinimumObjectMass, BSParam.MaximumObjectMass); |
1495 | // DetailLog("{0},BSPrim.CalculateMass,den={1},vol={2},mass={3}", LocalID, Density, volume, returnMass); | 1497 | // DetailLog("{0},BSPrim.CalculateMass,den={1},vol={2},mass={3}", LocalID, Density, volume, returnMass); |
1498 | DetailLog("{0},BSPrim.CalculateMass,den={1},vol={2},mass={3},pathB={4},pathE={5},profB={6},profE={7},siz={8}", | ||
1499 | LocalID, Density, volume, returnMass, pathBegin, pathEnd, profileBegin, profileEnd, _size); | ||
1496 | 1500 | ||
1497 | return returnMass; | 1501 | return returnMass; |
1498 | }// end CalculateMass | 1502 | }// end CalculateMass |