aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminsterMelanie2012-08-1610-215/+430
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: add hinge constraint.Robert Adams2012-08-153-6/+126
| | | | | | | | | | | | | | Update BulletSimAPI with new constraint related function calls. Reorganize locking in BS6DofConstraint. Update BS6DofConstraint to do constraint reset correctly. Add new 'midpoint' construction of 6Dof constraint.
| * BulletSim: add locking to constraintCollection and rename some of the public ↵Robert Adams2012-08-152-147/+197
| | | | | | | | method variables to reduce confusion between a physics scene and the real scene.
| * BulletSim: clean up detail logging by adding many more debug log statements ↵Robert Adams2012-08-155-34/+44
| | | | | | | | and then commenting out most of the additions.
| * BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. ↵Robert Adams2012-08-151-15/+15
| | | | | | | | Make sure the collisionCollection is reallocated each tick to fix race condition of it being cleared while still in use.
| * BulletSim: fix problem of a null reference exception on shutdown if there ↵Robert Adams2012-08-151-12/+13
| | | | | | | | were linksets in the region.
| * BulletSim: Refactor BSConstraintCollection to add a new ↵Robert Adams2012-08-151-4/+12
| | | | | | | | RemoveAndDestroyConstraint(BSConstraint xx)
| * BulletSim: add BSConstraint.RecomputConstraintVariables for the ↵Robert Adams2012-08-151-0/+17
| | | | | | | | recomputation after linksets changed, etc
| * BulletSim: Add the class BSCharacter to the DetailLog outputRobert Adams2012-08-151-6/+10
| |
| * BulletSim: rework physics FPS calculation to make a more realistic number.Robert Adams2012-08-151-3/+8
| |
* | Merge branch 'careminster' into avinationMelanie2012-08-148-326/+501
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * \ Merge branch 'master' into careminsterMelanie2012-08-118-285/+377
| |\ \ | | |/
| | * BulletSim: many, many detailed logging messages for physical linksetRobert Adams2012-08-107-44/+78
| | | | | | | | | | | | | | | | | | | | | | | | debugging. Linkset bugs fixed where accounting of children would get lost. Moved scene based vehicle tracking logic from prim to the scene. Added GetCollisionFlags2 method to BulletSimAPI. Updated DLLs and SOs.
| | * BulletSim: Add module names to DetailLog output. Fix some problems with ↵Robert Adams2012-08-103-63/+71
| | | | | | | | | | | | linksets that were caused by checking data structures that are changed regularly from taint time code -- resulted in linksets not being unlinked properly.
| | * BulletSim: add an identifier to the TaintObject call so exceptions that ↵Robert Adams2012-08-094-52/+57
| | | | | | | | | | | | happen when the taint is invoked can be debugged
| | * BulletSim: separate out the constraints by type. The linksets useRobert Adams2012-08-096-94/+146
| | | | | | | | | | | | | | | | | | 6dof constraint but eventually others will be exposed so future features can use all the Bullet capabilities. Force children to generate a position update when unlinked.
| | * BulletSim: add avatar code to keep avatars from ending up trapped under the ↵Robert Adams2012-08-084-53/+46
| | | | | | | | | | | | terrain
| * | Merge branch 'master' into careminsterMelanie2012-08-094-14/+47
| |\ \ | | |/
| | * BulletSim: Added avatar capsule scaling for size of avatar.Robert Adams2012-08-074-14/+47
| | | | | | | | | | | | | | | | | | | | | | | | This also fixes computation of avatar mass. Added parameter MaxPersistantManifoldPoolSize. Fixed a parameter setting bug which caused crashes of there were more than 400 or so physical objects. I tested up to 5000. Updated BulletSim DLLs and SOs.
| * | Merge branch 'master' into careminsterMelanie2012-08-072-4/+7
| |\ \ | | |/
| | * BulletSim: update SOs and DLLs to run on more Linux versions. Correct ↵Robert Adams2012-08-062-4/+7
| | | | | | | | | | | | multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
| * | Merge branch 'master' into careminsterMelanie2012-08-043-36/+83
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * BulletSim: pass collision subscription information to the C++ code so ↵Robert Adams2012-08-033-16/+45
| | | | | | | | | | | | collisions on objects that don't care are not reported up.
| | * BulletSim: Add AddObjectForce to BulletSim API.Robert Adams2012-08-033-20/+38
| | | | | | | | | | | | | | | | | | Add interface 2 enhancements to BSCharacter. Modify AddForce and SetForce to use the new Bullet interface. More DetailLog statements for character.
* | | use a bit more complex mesh key identifier, plus a bug fixUbitUmarov2012-08-073-29/+96
| | |
* | | ** DANGER someone should stress test more ** release unused physics meshs, ↵UbitUmarov2012-08-067-55/+174
| | | | | | | | | | | | including unmanaged memory allocations (allocated by managed code)
* | | bug fix: keep sculpt bitmaps border pixels during resolution scaling.UbitUmarov2012-08-053-15/+78
| | | | | | | | | | | | let this eventually have diferent interpolator last steps on each direction as sl seems to do.
* | | ubitmeshing: mask out mirror and invert bits on sculpttype convertion.UbitUmarov2012-08-053-449/+12
| | | | | | | | | | | | Remove some unused
* | | *feature test* ubitode, let convex hull shape type work for prims otherUbitUmarov2012-08-041-6/+15
|/ / | | | | | | | | | | | | than uploaded meshs, making it change the mesh level of detail from high to low. This will work on all prims that get a internal mesh or sculpts. Mesh size reduction will depend on particular shape. This is not as SL. There prims do also get concave areas. Uploaded meshs work as before. A normal 10x10x10 torus gets 152 vertices in place of 900, and 198 faces in place of 1198.
* | Merge branch 'master' into careminsterMelanie2012-08-032-6/+27
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * BulletSim: Debugging log statements added. Reduced size of updata buffer ↵Robert Adams2012-08-022-6/+27
| | | | | | | | trying to find a corrupted memory problem. Update DLL and SO.
* | Merge branch 'master' into careminsterMelanie2012-08-014-12/+19
|\ \ | |/ | | | | | | | | 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.
| * BulletSim: fix problem where resizing a primary shape (cube or sphere) would ↵Robert Adams2012-07-312-5/+3
| | | | | | | | not rebuild the physics mesh. Update the DLLs and SOs to latest version.
| * BulletSim: change boolean parameters in the shape data from int's to float's ↵Robert Adams2012-07-312-7/+11
| | | | | | | | to be consistant with parameter data structure
* | Merge branch 'master' into careminsterMelanie2012-08-016-29/+164
|\ \ | |/
| * BulletSim: add parameters and API calls for setting ERP and CFM.Robert Adams2012-07-316-29/+164
| | | | | | | | | | | | Set ERP and CFM in linkset constraints. Reorder rebuilding of object bodies so they are not rebuilt everytime something is linked and unlinked.
* | Merge branch 'avination' into careminsterMelanie2012-07-291-2/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | 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
* | | Merge branch 'master' into careminsterMelanie2012-07-287-488/+1171
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * | Remove the LandGeom checks in OdeScene - these are pointless since LandGeom ↵Justin Clark-Casey (justincc)2012-07-271-4/+2
| | | | | | | | | | | | | | | | | | | | | is always IntPtr.Zero and contacts returned always have a valid geometry. Possibly this was for a feature that was never implemented or was otherwise removed. Thanks to SignpostMarv for the spot of the warning that shows this parameter was never changed.
| * | BulletSim: fix a recursive loop when fetching the mass of the root of a linkset.Robert Adams2012-07-262-4/+4
| | |
| * | BulletSim: refactor all the linkset logic out of the prim classRobert Adams2012-07-264-235/+409
| | | | | | | | | | | | | | | | | | and into its own class. The BulletSim data structures track individual prims as linksets of 1 so most of the prim code is not different between a linked and unlinked object.
| * | Add check so Ode does not try to simulate after it has been Dispose()'ed. ↵Robert Adams2012-07-261-0/+9
| | | | | | | | | | | | Fixes exception that happens when shutting down region (improvements from last patch)
| * | BulletSim: remove unused, commented out code in BSConstraintRobert Adams2012-07-251-8/+0
| | |
| * | BulletSim: fix line endings in newly added files (Is it DOS or is it UNIX? ↵Robert Adams2012-07-252-301/+301
| | | | | | | | | | | | Only it's hairdresser knows for sure)
| * | BulletSim: add parameters for setting linkset constraint factorsRobert Adams2012-07-252-17/+32
| | |
| * | BulletSim: small change to use the pointer to the bullet object for zeroing ↵Robert Adams2012-07-251-6/+5
| | | | | | | | | | | | forces.
| * | BulletSim: Redo parameter specification so only one place hasRobert Adams2012-07-251-248/+378
| | | | | | | | | | | | | | | to change to have a parameter show up in the ini file and command line. Will make it much easier for the next person.
| * | BulletSim: Add C# classes for storing and tracking constraints.Robert Adams2012-07-252-0/+301
| | |