From a2b1a1787d620f70c10221545414b41ffdfe27da Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 25 Jun 2008 14:30:28 +0000 Subject: Minor formatting cleanup. --- OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 11 +++++---- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 33 ++++++++++++++------------- 2 files changed, 24 insertions(+), 20 deletions(-) (limited to 'OpenSim/Region/Physics') diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 72c5d7f..5a04a8e 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs @@ -1530,7 +1530,7 @@ namespace OpenSim.Region.Physics.Meshing ) { #if SPAM - System.Console.WriteLine( "reverting to geodesic sphere for prim: " + primName ); + System.Console.WriteLine("reverting to geodesic sphere for prim: " + primName); #endif return CreateSphereMesh(primName, primShape, size); } @@ -1802,10 +1802,13 @@ namespace OpenSim.Region.Physics.Meshing #if SPAM int vCount = 0; - foreach ( Vertex v in result.vertices ) - if ( v != null ) + foreach (Vertex v in result.vertices) + { + if (v != null) vCount++; - System.Console.WriteLine( "Mesh vertex count: " + vCount.ToString()); + } + + System.Console.WriteLine("Mesh vertex count: " + vCount.ToString()); #endif return result; diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index edb6375..876629e 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -1773,22 +1773,23 @@ 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); - } + // 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; -- cgit v1.1