aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs27
1 files changed, 14 insertions, 13 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index 9867bfd..5f63a7b 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -1575,7 +1575,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1575 double maxChangestime = (int)(reqTimeStep * 500f); // half the time 1575 double maxChangestime = (int)(reqTimeStep * 500f); // half the time
1576 double maxLoopTime = (int)(reqTimeStep * 1200f); // 1.2 the time 1576 double maxLoopTime = (int)(reqTimeStep * 1200f); // 1.2 the time
1577 1577
1578 1578/*
1579 double collisionTime = 0; 1579 double collisionTime = 0;
1580 double qstepTIme = 0; 1580 double qstepTIme = 0;
1581 double tmpTime = 0; 1581 double tmpTime = 0;
@@ -1584,7 +1584,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1584 double updatesTime = 0; 1584 double updatesTime = 0;
1585 double moveTime = 0; 1585 double moveTime = 0;
1586 double rayTime = 0; 1586 double rayTime = 0;
1587 1587*/
1588 d.AllocateODEDataForThread(~0U); 1588 d.AllocateODEDataForThread(~0U);
1589 1589
1590 if (ChangesQueue.Count > 0) 1590 if (ChangesQueue.Count > 0)
@@ -1621,7 +1621,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1621 m_global_contactcount = 0; 1621 m_global_contactcount = 0;
1622 1622
1623 1623
1624 tmpTime = Util.GetTimeStampMS(); 1624// tmpTime = Util.GetTimeStampMS();
1625 1625
1626 // Move characters 1626 // Move characters
1627 lock (_characters) 1627 lock (_characters)
@@ -1650,17 +1650,17 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1650 aprim.Move(); 1650 aprim.Move();
1651 } 1651 }
1652 } 1652 }
1653 moveTime += Util.GetTimeStampMS() - tmpTime; 1653// moveTime += Util.GetTimeStampMS() - tmpTime;
1654 1654
1655 tmpTime = Util.GetTimeStampMS(); 1655// tmpTime = Util.GetTimeStampMS();
1656 m_rayCastManager.ProcessQueuedRequests(); 1656 m_rayCastManager.ProcessQueuedRequests();
1657 rayTime += Util.GetTimeStampMS() - tmpTime; 1657// rayTime += Util.GetTimeStampMS() - tmpTime;
1658 1658
1659 tmpTime = Util.GetTimeStampMS(); 1659// tmpTime = Util.GetTimeStampMS();
1660 collision_optimized(); 1660 collision_optimized();
1661 collisionTime += Util.GetTimeStampMS() - tmpTime; 1661// collisionTime += Util.GetTimeStampMS() - tmpTime;
1662 1662
1663 tmpTime = Util.GetTimeStampMS(); 1663// tmpTime = Util.GetTimeStampMS();
1664 lock(_collisionEventPrimRemove) 1664 lock(_collisionEventPrimRemove)
1665 { 1665 {
1666 foreach (PhysicsActor obj in _collisionEventPrimRemove) 1666 foreach (PhysicsActor obj in _collisionEventPrimRemove)
@@ -1699,14 +1699,14 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1699 foreach(OdePrim prm in sleepers) 1699 foreach(OdePrim prm in sleepers)
1700 prm.SleeperAddCollisionEvents(); 1700 prm.SleeperAddCollisionEvents();
1701 sleepers.Clear(); 1701 sleepers.Clear();
1702 collisonRepo += Util.GetTimeStampMS() - tmpTime; 1702// collisonRepo += Util.GetTimeStampMS() - tmpTime;
1703 1703
1704 1704
1705 // do a ode simulation step 1705 // do a ode simulation step
1706 tmpTime = Util.GetTimeStampMS(); 1706// tmpTime = Util.GetTimeStampMS();
1707 d.WorldQuickStep(world, ODE_STEPSIZE); 1707 d.WorldQuickStep(world, ODE_STEPSIZE);
1708 d.JointGroupEmpty(contactgroup); 1708 d.JointGroupEmpty(contactgroup);
1709 qstepTIme += Util.GetTimeStampMS() - tmpTime; 1709// qstepTIme += Util.GetTimeStampMS() - tmpTime;
1710 1710
1711 // update managed ideia of physical data and do updates to core 1711 // update managed ideia of physical data and do updates to core
1712 /* 1712 /*
@@ -1812,7 +1812,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1812 int ngeoms = d.NTotalGeoms; 1812 int ngeoms = d.NTotalGeoms;
1813*/ 1813*/
1814 1814
1815 1815/*
1816 looptimeMS /= nodeframes; 1816 looptimeMS /= nodeframes;
1817 collisionTime /= nodeframes; 1817 collisionTime /= nodeframes;
1818 qstepTIme /= nodeframes; 1818 qstepTIme /= nodeframes;
@@ -1827,6 +1827,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1827 1827
1828 1828
1829 } 1829 }
1830*/
1830/* 1831/*
1831 // Finished with all sim stepping. If requested, dump world state to file for debugging. 1832 // Finished with all sim stepping. If requested, dump world state to file for debugging.
1832 // TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed? 1833 // TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed?