aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-151-6/+0
| | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
* Merge branch 'master' into careminsterMelanie2012-11-011-0/+6
|\
| * Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵Dan Lake2012-10-311-0/+6
| | | | | | | | No change to existing functions.
| * missing changed fileUbitUmarov2012-10-181-1/+1
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | add mesh cache expire on region startup. Expires will be relative toUbitUmarov2012-10-132-0/+2
| | | | | | | | | | | | previus expire (assumed done only once at startup). File 'cntr' on cache folder stores time. Deleting it will force a skip on expire. Default time is 48hours before previus startup to account for failed ones etc.
* | retouch mesh idsUbitUmarov2012-10-131-1/+1
| |
* | longer meshs identification keys, so first part on disk cache is it's asset idUbitUmarov2012-10-131-1/+3
| |
* | missing fileUbitUmarov2012-10-121-0/+6
| |
* | force allocation of mesh data on creation ( messy code version )UbitUmarov2012-10-092-2/+2
| |
* | move terrain geom to own ode space. Limit range on raycast if includesUbitUmarov2012-10-091-0/+3
| | | | | | | | | | | | terrain until ode doesn't eat all stack. Add a pre-simulation method to do pending actors changes (except mesh assets still not ready to use), to be optionaly called before firing heartbeat. [UNTESTED]
* | bug fix + make costs visible for testingUbitUmarov2012-10-071-0/+17
| |
* | more changes. Most code not in useUbitUmarov2012-10-041-0/+1
| |
* | missing changed fileUbitUmarov2012-10-031-1/+1
| |
* | introduce a ODEMeshWorker class, should be pure cosmetic changes for nowUbitUmarov2012-10-032-1/+8
| |
* | use a bit more complex mesh key identifier, plus a bug fixUbitUmarov2012-08-071-0/+12
| |
* | ** DANGER someone should stress test more ** release unused physics meshs, ↵UbitUmarov2012-08-062-0/+4
| | | | | | | | including unmanaged memory allocations (allocated by managed code)
* | 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 'avination' into ubitworkUbitUmarov2012-07-171-0/+14
|\ \
| * \ 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.
* | | messing around... Let terrain and water have nullphysicsactors, letUbitUmarov2012-07-151-95/+48
|/ / | | | | | | | | | | | | nullphyscisactors have a type water, ground or unknown (default). having this removed geom to name mapping no longer needed. Made some more methods comum to prims and characters acessible via PhysActor allowing for a more uniform access. ...
* | Let OOB information usable outside ubitodeUbitUmarov2012-05-271-1/+28
| |
* | add colliders relative velocity projected in collision direction to ↵UbitUmarov2012-05-191-0/+2
| | | | | | | | collisions report information.
* | ubitODE + physmanager: - Revised use of ODE collisions categories and ↵UbitUmarov2012-04-162-0/+46
| | | | | | | | 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-212-0/+14
| | | | | | | | 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 )
* | let convex be a parameter to createMesh so it can be used. Was forced to add ↵UbitUmarov2012-03-212-0/+6
| | | | | | | | it also to original mesher code and zeromesher
* | more phantom physics ( chODE and a fix in manager physicsactorUbitUmarov2012-03-111-1/+1
| |
* | initial steps to support physical phantomsUbitUmarov2012-03-112-3/+8
| |
* | update ubitOdeUbitUmarov2012-03-051-1/+3
| |
* | update UbitOdeUbitUmarov2012-03-041-2/+3
| |
* | Merge branch 'ubitwork'Melanie2012-02-194-2/+86
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
| * | changed how vehicle data is stored and passed to physics. use unsafe in ↵UbitUmarov2012-02-182-3/+47
| | | | | | | | | | | | serializer, tried to control m_dupeInProgress
| * | Added simple binary serializer/deserializer to chODE. 100% untested and most ↵UbitUmarov2012-02-172-0/+12
| | | | | | | | | | | | like still broken
| * | Use mesh to estimate real center of prims if avaiable. Let sculpt map ↵UbitUmarov2012-02-111-0/+1
| | | | | | | | | | | | textures with alpha channel work. On linux J2DecodeCache folder must be deleted to remove bad entries. Corrently this can't be cached on linux (mono/ cairo/? problem)
| * | changes in physics manager, needed for UbitODEUbitUmarov2012-02-082-1/+28
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-181-1/+2
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-181-1/+2
| | | | | | | | | | | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.
| * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-1/+2
| |
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-1/+2
| |/
* | 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-242-9/+14
|\ \ | |/
| * Comment out uncalled OdeScene.UnCombine()Justin Clark-Casey (justincc)2011-11-221-8/+2
| |
| * Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of ↵Justin Clark-Casey (justincc)2011-11-211-0/+9
| | | | | | | | maintaining their own properties
| * Actually remove PhysicsActor.SOPDescription this timeJustin Clark-Casey (justincc)2011-11-211-1/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-171-6/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ↵Justin Clark-Casey (justincc)2011-11-161-6/+10
| | | | | | | | | | | | | | own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId! Instead, just have both subclasses use the PhysicsActor.LocalID property. This restores collision functionality that fell away in 45c7789 yesterday
* | Merge branch 'master' into bigmergeMelanie2011-10-271-0/+2
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
generated by cgit v1.1 at 2024-12-27 17:39:53 +0000