aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2012-12-21 09:56:31 -0800
committerRobert Adams2012-12-21 09:56:31 -0800
commitb4f8a05e9a30373942c3a0511e43dcce3df11184 (patch)
treed73e0ed7231349a0fd76b054db9df7544a846518
parentBulletSim: begin movement of parameters from pinned memory block to variables... (diff)
downloadopensim-SC_OLD-b4f8a05e9a30373942c3a0511e43dcce3df11184.zip
opensim-SC_OLD-b4f8a05e9a30373942c3a0511e43dcce3df11184.tar.gz
opensim-SC_OLD-b4f8a05e9a30373942c3a0511e43dcce3df11184.tar.bz2
opensim-SC_OLD-b4f8a05e9a30373942c3a0511e43dcce3df11184.tar.xz
BulletSim: Better detail logging of VMotor actions.
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSMotors.cs15
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
index a6af40d..34a87c6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
@@ -166,11 +166,13 @@ public class BSVMotor : BSMotor
166 CurrentValue *= (Vector3.One - frictionFactor); 166 CurrentValue *= (Vector3.One - frictionFactor);
167 } 167 }
168 168
169 MDetailLog("{0}, BSVMotor.Step,nonZero,{1},origCurr={2},origTarget={3},timeStep={4},error={5},corr={6},targetDecay={6},decayFact={7},frictFac{8},curr={9},target={10},ret={11}", 169 MDetailLog("{0}, BSVMotor.Step,nonZero,{1},origCurr={2},origTarget={3},timeStep={4},err={5},corr={6}",
170 BSScene.DetailLogZero, UseName, origCurrVal, origTarget, 170 BSScene.DetailLogZero, UseName, origCurrVal, origTarget,
171 timeStep, error, correction, 171 timeStep, error, correction);
172 TargetValueDecayTimeScale, decayFactor, frictionFactor, 172 MDetailLog("{0}, BSVMotor.Step,nonZero,{1},tgtDecayTS={2},decayFact={3},frictTS={4},frictFact={5},tgt={6},curr={7}",
173 CurrentValue, TargetValue, CurrentValue); 173 BSScene.DetailLogZero, UseName,
174 TargetValueDecayTimeScale, decayFactor, FrictionTimescale, frictionFactor,
175 TargetValue, CurrentValue);
174 } 176 }
175 else 177 else
176 { 178 {
@@ -196,9 +198,8 @@ public class BSVMotor : BSMotor
196 correctionAmount = error / TimeScale * timeStep; 198 correctionAmount = error / TimeScale * timeStep;
197 199
198 returnCorrection = correctionAmount; 200 returnCorrection = correctionAmount;
199 MDetailLog("{0}, BSVMotor.Step,nonZero,{1},timeStep={2},timeScale={3},err={4},corr={5},frictTS={6},ret={7}", 201 MDetailLog("{0}, BSVMotor.Step,nonZero,{1},timeStep={2},timeScale={3},err={4},corr={5}",
200 BSScene.DetailLogZero, UseName, timeStep, TimeScale, error, 202 BSScene.DetailLogZero, UseName, timeStep, TimeScale, error, correctionAmount);
201 correctionAmount, FrictionTimescale, returnCorrection);
202 } 203 }
203 return returnCorrection; 204 return returnCorrection;
204 } 205 }