diff options
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 33 |
2 files changed, 24 insertions, 20 deletions
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 | |||
1530 | ) | 1530 | ) |
1531 | { | 1531 | { |
1532 | #if SPAM | 1532 | #if SPAM |
1533 | System.Console.WriteLine( "reverting to geodesic sphere for prim: " + primName ); | 1533 | System.Console.WriteLine("reverting to geodesic sphere for prim: " + primName); |
1534 | #endif | 1534 | #endif |
1535 | return CreateSphereMesh(primName, primShape, size); | 1535 | return CreateSphereMesh(primName, primShape, size); |
1536 | } | 1536 | } |
@@ -1802,10 +1802,13 @@ namespace OpenSim.Region.Physics.Meshing | |||
1802 | #if SPAM | 1802 | #if SPAM |
1803 | int vCount = 0; | 1803 | int vCount = 0; |
1804 | 1804 | ||
1805 | foreach ( Vertex v in result.vertices ) | 1805 | foreach (Vertex v in result.vertices) |
1806 | if ( v != null ) | 1806 | { |
1807 | if (v != null) | ||
1807 | vCount++; | 1808 | vCount++; |
1808 | System.Console.WriteLine( "Mesh vertex count: " + vCount.ToString()); | 1809 | } |
1810 | |||
1811 | System.Console.WriteLine("Mesh vertex count: " + vCount.ToString()); | ||
1809 | #endif | 1812 | #endif |
1810 | 1813 | ||
1811 | return result; | 1814 | 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 | |||
1773 | } | 1773 | } |
1774 | } | 1774 | } |
1775 | 1775 | ||
1776 | 1776 | // Finished with all sim stepping. If requested, dump world state to file for debugging. | |
1777 | // Finished with all sim stepping. If requested, dump world state to file for debugging. | 1777 | // TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed? |
1778 | // TODO: This call to the export function is already inside lock(OdeLock) - but is an extra lock needed? | 1778 | // TODO: This overwrites all dump files in-place. Should this be a growing logfile, or separate snapshots? |
1779 | // TODO: This overwrites all dump files in-place. Should this be a growing logfile, or separate snapshots? | 1779 | if (physics_logging && (physics_logging_interval>0) && (framecount % physics_logging_interval == 0)) |
1780 | if(physics_logging && (physics_logging_interval>0) && (framecount % physics_logging_interval == 0) ) { | 1780 | { |
1781 | string fname = "state-" + world.ToString() + ".DIF"; // give each physics world a separate filename | 1781 | string fname = "state-" + world.ToString() + ".DIF"; // give each physics world a separate filename |
1782 | string prefix = "world" + world.ToString(); // prefix for variable names in exported .DIF file | 1782 | string prefix = "world" + world.ToString(); // prefix for variable names in exported .DIF file |
1783 | 1783 | ||
1784 | if(physics_logging_append_existing_logfile) { | 1784 | if (physics_logging_append_existing_logfile) |
1785 | string header = "-------------- START OF PHYSICS FRAME " + framecount.ToString() + " --------------"; | 1785 | { |
1786 | TextWriter fwriter = File.AppendText(fname); | 1786 | string header = "-------------- START OF PHYSICS FRAME " + framecount.ToString() + " --------------"; |
1787 | fwriter.WriteLine(header); | 1787 | TextWriter fwriter = File.AppendText(fname); |
1788 | fwriter.Close(); | 1788 | fwriter.WriteLine(header); |
1789 | } | 1789 | fwriter.Close(); |
1790 | d.WorldExportDIF(world, fname, physics_logging_append_existing_logfile, prefix); | 1790 | } |
1791 | } | 1791 | d.WorldExportDIF(world, fname, physics_logging_append_existing_logfile, prefix); |
1792 | } | ||
1792 | } | 1793 | } |
1793 | 1794 | ||
1794 | return fps; | 1795 | return fps; |