aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Change the stair fudge factor so steps of 0.5m can be climbled to match ↵Melanie2012-07-271-2/+2
| | | | inworldz claims and SL's realities
* Update ubitMesh primMesher with new Dahlia version on core ( reckick gitUbitUmarov2012-07-191-143/+183
| | | | back)
* Merge branch 'avination' into ubitworkUbitUmarov2012-07-1712-570/+1267
|\
| * Merge branch 'avination' into careminsterMelanie2012-07-166-136/+84
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ Merge branch 'master' into careminsterMelanie2012-07-161-143/+183
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | update PrimMesher.cs to dll version r72 which fixes some path errors in ↵dahlia2012-07-131-143/+183
| | | | | | | | | | | | | | | | sliced linear prims. Addresses Mantis #6085
| * | | Merge branch 'avination' into careminsterMelanie2012-07-115-62/+140
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-07-114-58/+107
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * | | Clean up collision reporting code so they are properly passed toRobert Adams2012-07-064-58/+107
| | | | | | | | | | | | | | | | | | | | | | | | | the simulator in batches. More comments.
| * | | | Merge branch 'avination' into careminsterMelanie2012-07-061-11/+38
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-011-2/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-301-2/+3
| | | | | |
| * | | | | Merge branch 'master' into careminsterMelanie2012-06-292-16/+16
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * | | | Move update of the final optional ODE total frame stat inside the OdeLock ↵Justin Clark-Casey (justincc)2012-06-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | rather than outside to avoid a very occasional race condition with the stat collection thread
| | * | | | refactor: rename _collisionEventPrim to m_collisionEventActors and ↵Justin Clark-Casey (justincc)2012-06-291-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents. These dictionaries handle all actor types, not just physical prims.
| | * | | | Fix a regression where we stopped removing avatars from collision event ↵Justin Clark-Casey (justincc)2012-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reporting on logout, rather than stopping clearing their collision events. This occurred in b18c8c8 (Thu May 17 2012). This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region.
| * | | | | Merge branch 'avination' into careminsterMelanie2012-06-061-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-021-60/+256
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| | * | | | | Add optional total avatars, total prims and active prims stats to ODE plugin.Justin Clark-Casey (justincc)2012-06-011-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will act as a sanity check with the main scene stats, to show that physics scene entities are being managed properly. Total prims will not match scene total prims since physics total does not include phantom prims
| | * | | | | If OdeScene.Near() returns no collision contacts, then exit as early as ↵Justin Clark-Casey (justincc)2012-06-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | possible. All subsequent code is only relevant if there are contacts.
| | * | | | | Add optional stat for the other collision time per frame not spent in ODE ↵Justin Clark-Casey (justincc)2012-06-011-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | native spaces or geom collision code
| | * | | | | Add avatar forces calculation, prim force and raycasting per frame ↵Justin Clark-Casey (justincc)2012-06-011-7/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | millisecond optional stats
| | * | | | | Collection optional avatar and prim taint frame millisecond timesJustin Clark-Casey (justincc)2012-06-011-7/+36
| | | | | | |
| | * | | | | Remove recent optional native collision frame milliseconds statJustin Clark-Casey (justincc)2012-06-011-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unnecessary since this has now been broken down into space collisions and geom collisions
| | * | | | | Add optional stat that records milliseconds spent notifying collision ↵Justin Clark-Casey (justincc)2012-06-011-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | listeners in physics frames
| | * | | | | Add avatar and prim update milliseconds per frame optional statsJustin Clark-Casey (justincc)2012-06-011-7/+31
| | | | | | |
| | * | | | | Add option native step frame ms statJustin Clark-Casey (justincc)2012-06-011-9/+21
| | | | | | |
| | * | | | | Add total ODE frame time optional stat, as a sanity check on the main scene ↵Justin Clark-Casey (justincc)2012-06-011-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | physics stat
| | * | | | | Break down native ODE collision frame time stat into native space collision ↵Justin Clark-Casey (justincc)2012-06-011-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and geom collision stats
| | * | | | | Rename new collision stats to 'contacts' - there are/can be multiple ↵Justin Clark-Casey (justincc)2012-06-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | contacts per collision and this is what is actually being measured.
| | * | | | | Stop adding an unnecessary duplicate _perloopcontact if the avatar is ↵Justin Clark-Casey (justincc)2012-06-011-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standing on a prim. This has already been added earlier on in the method.
| | * | | | | minor: comment out currently unused OdeScene.sCollisionDataJustin Clark-Casey (justincc)2012-06-011-9/+9
| | | | | | |
| | * | | | | Add ODE avatar and prim collision numbers if extra stats collection is enabled.Justin Clark-Casey (justincc)2012-06-011-5/+34
| | | | | | |
| | * | | | | Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than ↵Justin Clark-Casey (justincc)2012-06-011-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the first 25 that had non-zero collision scores. Also zeros collisions scores on all prims after report collection, not just the top 25. As before, this collision scores are only reset after a report is requested, which may give unrealistic numbers on the first request. So to see more realistic scores, ignore the first report and then refresh the request after a couple of seconds or so.
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-05-312-4/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-312-10/+143
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Add an optional mechanism for physics modules to collect and return ↵Justin Clark-Casey (justincc)2012-05-312-10/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arbitrary stats. If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule (http://opensimulator.org/wiki/Monitoring_Module) This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings]. This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing. This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds. The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
| * | | | | | | Merge branch 'avination'Melanie2012-05-294-70/+134
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-274-154/+178
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-191-2/+8
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| | * | | | | | | | refactor: move EventQueueGet path generation into common method. Rename ↵Justin Clark-Casey (justincc)2012-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use.
| | * | | | | | | | Don't eagerly clear frame collision events when physics actors subscribe and ↵Justin Clark-Casey (justincc)2012-05-171-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unsubscribe from collisions, in order to avoid a race condition. Since this is done directly from ScenePresence, it can lead to a race condition with the simulator loop. There's no real point doing it anyway since the clear will be done very shortly afterwards by the simulate loop and either there are no events (for a new avatar) or events don't matter (for a departing avatar). This matches existing behaviour in OdePrim
| * | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-05-152-11/+68
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-133-24/+69
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-133-106/+163
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-081-11/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-072-21/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-051-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination'Melanie2012-05-031-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination'Melanie2012-05-023-112/+123
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-20 12:30:09 +0000