aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsScene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-011-0/+5
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Create the ability for physics modules to request assets on demand byMelanie2012-08-011-0/+5
| | | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class.
* | Merge branch 'master' into careminsterMelanie2012-05-311-0/+14
|\ \ | |/
| * Add an optional mechanism for physics modules to collect and return ↵Justin Clark-Casey (justincc)2012-05-311-0/+14
| | | | | | | | | | | | | | | | | | | | | | 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.
* | ubitODE + physmanager: - Revised use of ODE collisions categories and ↵UbitUmarov2012-04-161-0/+40
| | | | | | | | bits(flags) for better use as filters together with top spaces (for example physical prims are on topactivespace and not physical are on topstaticspace) - Added new world raycast with filters. This blocks calling thread with a timeout of 500ms waiting for heartbeat ode thread signal job done. - Don't let ode bodies being disabled for 2 long except for vehicles. This is necessary to detect when the object is at rest at top of other and that is removed. Assume that vehicles can be enabled by used action.
* | Tell physics about physics shape when creating. Added some virtual methods ↵UbitUmarov2012-03-211-0/+7
| | | | | | | | to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc )
* | initial steps to support physical phantomsUbitUmarov2012-03-111-3/+6
| |
* | Added simple binary serializer/deserializer to chODE. 100% untested and most ↵UbitUmarov2012-02-171-0/+6
| | | | | | | | like still broken
* | changes in physics manager, needed for UbitODEUbitUmarov2012-02-081-1/+9
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-251-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-241-8/+2
|\ \ | |/
| * Comment out uncalled OdeScene.UnCombine()Justin Clark-Casey (justincc)2011-11-221-8/+2
| |
* | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmergeMelanie2011-10-251-0/+5
|\ \ | |/
| * Store scene identifier passed in to OdeScene for later debug messagesJustin Clark-Casey (justincc)2011-10-181-0/+5
| |
* | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmergeMelanie2011-10-251-1/+0
|\ \ | |/
| * refactor: make methods that do not need to be public in ODE private or ↵Justin Clark-Casey (justincc)2011-10-151-1/+0
| | | | | | | | internal to aid code reading/analysis. Remove some unused method arguments
* | Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmergeMelanie2011-10-251-88/+4
|\ \ | |/
| * Extract NullPhysicsScene from PhysicsScene to improve code readabilityJustin Clark-Casey (justincc)2011-10-141-88/+4
| |
* | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmergeMelanie2011-10-251-1/+22
|\ \ | |/
| * refactor: move 3x copy/pasted ode structure removal code in ODECharacter ↵Justin Clark-Casey (justincc)2011-10-131-1/+22
| | | | | | | | | | | | into a DestroyOdeStructures() method also adds some method doc
* | Resolve merge commits, stage 1Tom2011-09-041-12/+27
|\ \ | |/
| * refactor: centralize prim geom removal code from four places to oneJustin Clark-Casey (justincc)2011-08-011-0/+4
| |
| * Removed unused AddPrimShape methods in PhysicsScene caused by merge conflictsDan Lake2011-07-201-14/+0
| |
| * Fix some local id issues in physics glueroot2011-07-151-12/+7
| |
| * Port implementation of llCastRay() from Aurora.Justin Clark-Casey (justincc)2011-07-121-1/+23
| | | | | | | | I haven't been able to test this since the viewer won't parse the llCastRay() function. Maybe some activation cap is missing. Could wait until it is activated by default in the viewer.
* | Fox some local id issues in physics glueMelanie2011-07-151-12/+7
| |
* | Revert "Add localid support to ch0de properly"Melanie2011-07-151-7/+12
| | | | | | | | This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d.
* | Add localid support to ch0de properlyTom2011-07-151-12/+7
|/
* minor: commented out log lines for future use and very small code tidyJustin Clark-Casey (justincc)2011-07-081-1/+4
|
* Add localID to physical object creation functions.Mic Bowman2011-06-151-0/+15
|
* * Adds Normal to the fields returned by the Physics RaycasterTeravus Ovares (Dan Olivares)2009-12-051-2/+2
| | | | | | | | * Fixes recognizing when a sit target is and isn't set. * * 1. Vector3.Zero. * * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION * * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion * * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it
* Move the calculation of time dilation from the scene to the physics engine. ↵John Hurliman2009-10-271-0/+5
| | | | The scene is still the one reporting dilation so this does not break the API or remove flexibility, but it gets the calculation happening in the right place for the normal OpenSim usage. The actual calculation of physics time dilation probably needs tweaking
* Experimental change of PhysicsVector to Vector3. UntestedJohn Hurliman2009-10-261-16/+16
|
* Formatting cleanup.Jeff Ames2009-10-011-2/+2
|
* * One last attempt to get the bordercrossing/primcrossing/attachmentcrossing ↵Teravus Ovares (Dan Olivares)2009-09-021-0/+5
| | | | | | right in the new border framework. * This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region.
* * Some Physics Scene Changes to prepare for larger regionsTeravus Ovares (Dan Olivares)2009-08-181-1/+1
|
* * part one of adding physics combiningTeravus Ovares (Dan Olivares)2009-08-151-0/+10
|
* Formatting cleanup.Jeff Ames2009-07-231-1/+1
|
* * Created a way that the OpenSimulator scene can ask the physics scene to do ↵Teravus Ovares2009-07-191-0/+36
| | | | | | | | | a raycast test safely. * Test for prim obstructions between the avatar and camera. If there are obstructions, inform the client to move the camera closer. This makes it so that walls and objects don't obstruct your view while you're moving around. Try walking inside a hollowed tori. You'll see how much easier it is now because your camera automatically moves closer so you can still see. * Created a way to know if the user's camera is alt + cammed or just following the avatar. * Changes IClientAPI interface by adding SendCameraConstraint(Vector4 CameraConstraint)
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* This started as way to correct Mantis #3158, which I believe should be fixed ↵diva2009-02-151-2/+2
| | | | now. The flying status was temporarily being ignored, which caused the avie to drop sometimes -- there was a race condition. In the process it also fixes that annoying bug in basic physics where the avie would drop half-way to the ground upon region crossings (SetAppearance was missing). Additionally, a lot of child-agent-related code has been cleaned up; namely child agents are now consistently not added to physical scenes, and they also don't have appearances. All of that happens in MakeRoot, consistently.
* Reverts patch from tuco/mikkopa/sempuki mantis #3072Teravus Ovares2009-02-081-6/+0
|
* Change access levels from private to protected to facilitateMike Mazur2009-02-031-0/+6
| | | | | | subclassing; also add new method signatures. Thanks tuco and mikkopa. Fix Mantis #3072.
* * Applying Nlin's NINJA Joint patch. v2. Mantis# 2874Teravus Ovares2008-12-261-0/+64
| | | | | | | | | | * Thanks nlin! * To try it out, set ninja joints active in the ODEPhysicsSettings and use the example at: * http://forge.opensimulator.org/gf/download/frsrelease/142/304/demo-playground.tgz. * Don't forget to change the .tgz to .oar and load it with load-oar.
* * refactor: as per a recent opensim-dev thread, rename InnerScene to ↵Justin Clarke Casey2008-11-121-1/+1
| | | | SceneGraph to make it more descriptive of its intended function
* * This is the fabled LibOMV update with all of the libOMV types from JHurlimanTeravus Ovares2008-09-061-1/+1
| | | | | | | * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
* * Adds Top Colliders when using ODE. Access it from the estate tools/debug tab.Teravus Ovares2008-05-251-0/+9
|
* * Refactored IConfigSource into Physics plug-ins and Scene. We can get rid ↵Teravus Ovares2008-05-141-2/+3
| | | | | | | of some of the parameters we pass to it's constructor now like, 'm_allowPhysicalPrim', 'seeIntoOtherRegions', etc.. so on * The main purpose of this is to provide configuration options for ODE and other physics plug-ins that are advanced enough to be able to be configured.
* * Optimised using statements and namespace references across entire project ↵Adam Frisby2008-04-211-3/+3
| | | | (this took a while to run).