* Patch from nlin to enable DIF state file writing from the ODEPlugin
* Rebuilt libode.so, ode.dll * If you roll your own ODE library, make sure to update your opensim-libs.0.6.0-stable
parent
20e4036853
commit
e02a2e31e0
|
@ -30,6 +30,7 @@ using System.Collections.Generic;
|
|||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Threading;
|
||||
using System.IO;
|
||||
using Axiom.Math;
|
||||
using log4net;
|
||||
using Nini.Config;
|
||||
|
@ -247,6 +248,11 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
|
||||
private IConfigSource m_config;
|
||||
|
||||
public bool physics_logging = false;
|
||||
public int physics_logging_interval = 0;
|
||||
public bool physics_logging_append_existing_logfile = false;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Initiailizes the scene
|
||||
/// Sets many properties that ODE requires to be stable
|
||||
|
@ -370,6 +376,10 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_win", 550000f);
|
||||
bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_win", 5f);
|
||||
}
|
||||
|
||||
physics_logging = physicsconfig.GetBoolean("physics_logging", false);
|
||||
physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0);
|
||||
physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1759,7 +1769,25 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Finished with all sim stepping. If requested, dump world state to file for debugging.
|
||||
// TODO: This call to the export function is already inside lock(OdeLock) - but is an extra lock needed?
|
||||
// TODO: This overwrites all dump files in-place. Should this be a growing logfile, or separate snapshots?
|
||||
if(physics_logging && (physics_logging_interval>0) && (framecount % physics_logging_interval == 0) ) {
|
||||
string fname = "state-" + world.ToString() + ".DIF"; // give each physics world a separate filename
|
||||
string prefix = "world" + world.ToString(); // prefix for variable names in exported .DIF file
|
||||
|
||||
if(physics_logging_append_existing_logfile) {
|
||||
string header = "-------------- START OF PHYSICS FRAME " + framecount.ToString() + " --------------";
|
||||
TextWriter fwriter = File.AppendText(fname);
|
||||
fwriter.WriteLine(header);
|
||||
fwriter.Close();
|
||||
}
|
||||
d.WorldExportDIF(world, fname, physics_logging_append_existing_logfile, prefix);
|
||||
}
|
||||
}
|
||||
|
||||
return fps;
|
||||
}
|
||||
|
||||
|
|
BIN
bin/Ode.NET.dll
BIN
bin/Ode.NET.dll
Binary file not shown.
|
@ -309,6 +309,15 @@ mesh_lod = 32
|
|||
; number^2 physical level of detail of the sculpt texture. 16x16 - 256 verticies
|
||||
mesh_physical_lod = 16
|
||||
|
||||
; ##
|
||||
; ## Physics logging settings - logfiles are saved to *.DIF files
|
||||
; ##
|
||||
|
||||
;physics_logging = true
|
||||
;; every n simulation iterations, the physics snapshot file is updated
|
||||
;physics_logging_interval = 50
|
||||
;; append to existing physics logfile, or overwrite existing logfiles?
|
||||
;physics_logging_append_existing_logfile = true
|
||||
|
||||
[RemoteAdmin]
|
||||
enabled = false
|
||||
|
@ -617,4 +626,4 @@ EventLimit = 30
|
|||
; If a script overruns it's event limit, kill the script?
|
||||
KillTimedOutScripts = false
|
||||
; Allow OS console command functionality (VERY DANGEROUS!!)
|
||||
AllowosConsoleCommand = false
|
||||
AllowosConsoleCommand = false
|
||||
|
|
BIN
bin/libode.so
BIN
bin/libode.so
Binary file not shown.
BIN
bin/ode.dll
BIN
bin/ode.dll
Binary file not shown.
Loading…
Reference in New Issue