aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-1621-213/+450
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * BulletSim: disable center-of-mass computation for linksets until debugged. ↵Robert Adams2013-01-142-25/+36
| | | | | | | | Move physical prim above ground if it is underground. Previously tried to correct by applying and up force but the prim would never go through the ground.
| * BulletSim: move center of gravity of linkset to its geometric center.Robert Adams2013-01-1110-32/+106
| | | | | | | | | | | | | | Necessitated allowing simulator and physical position of a body to get out of sync since Bullet assumes that <0,0,0> is the center of mass. Update DLLs and SOs for the UpdateChildTransform so positions of individual prim in a linkset can be implemented.
| * BulletSim: add osGetPhysicsEngineType() LSL function and updateRobert Adams2013-01-119-11/+28
| | | | | | | | | | | | | | | | the physics engines to return the name that is specified in the INI file ("physics = XXX") as the type of engine. This os function is a little different than the others in that it does not throw an exception of one is not privilaged to use it. It merely returns an empty string.
| * BulletSim: Add IsSelected attribute to physical objects. Have vehicles check ↵Robert Adams2013-01-114-50/+162
| | | | | | | | to see if physical before trying to step. Replace vehicle gravity application. Previously relying on Bullet to apply gravity but since vehicles over-ride the velocity calculation, gravity never had a chance to accelerate the body down. Added AddForceImpulse as well as AddForce for those who need to apply immediate velocity updates. Use the impulse to apply the linear motion.
| * BulletSim: Redo linear function coding so they can better interact. New ↵Robert Adams2013-01-112-62/+91
| | | | | | | | algorithm for limitMotorUp that relies on going up when not colliding rather than distance from ground. Add parameter for turning on and off embedded source vehicle debugging.
| * BulletSim: remove double application of buoyancy. Centralize computation of ↵Robert Adams2013-01-114-65/+59
| | | | | | | | buoyancy. Add motor angular debugging controls.
* | Merge branch 'master' into careminsterMelanie2013-01-131-1/+1
|\ \ | |/
| * BulletSim: fix the 'No recognised physics mesh found ...' error spew by ↵Robert Adams2013-01-111-1/+1
| | | | | | | | remembering that the last asset fetch failed until the simulator resets the shape parameters.
* | Merge branch 'master' into careminsterMelanie2013-01-1010-74/+304
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * BulletSim: Fix hover height (boats float at the correct level).Robert Adams2013-01-082-8/+12
| | | | | | | | Fix problem of vehicles going crazy when backing up.
| * BulletSim: improve vehicle angular banking and deflection computation. ↵Robert Adams2013-01-071-19/+18
| | | | | | | | Rotate angular correction forces to be world relative rather than vehicle relative.
| * BulletSim: add function to push avatar up when hitting stairs.Robert Adams2013-01-075-27/+119
| | | | | | | | | | | | | | | | | | | | It looks like BulletSim and ODE rely on penetration correction to cause the avatar to move up and thus allowing walking up stairs. Object penetration was minimized for walking and flying (so one doesn't go through walls) and this stopped stairs from working. This commit introduces avatar movement code to check for collisions at the feet while walking and attempts to raise the avatar for the steps. Not yet perfect but movement is better.
| * BulletSim: fix exception when re-creating the terrain when loading an OAR fileRobert Adams2013-01-071-0/+2
| |
| * BulletSim: comments and removing small compile errors introduced in last commit.Robert Adams2013-01-063-9/+3
| |
| * BulletSim: update DLLs and SOs with better debugging output.Robert Adams2013-01-064-12/+151
| | | | | | | | | | Add definition of hand crafted avatar mesh. Not used yet. Comments and cleanup.
* | Merge branch 'avination' into careminsterMelanie2013-01-103-25/+43
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | * DAnger, TEST * change camera plane collision detection. Still bounces onUbitUmarov2013-01-081-12/+29
| | | | | | | | | | | | * prim edges due to camera lag
| * | also exclude landUbitUmarov2013-01-071-3/+3
| | |
| * | exclude avatars from unfiltered RaycastWorldUbitUmarov2013-01-071-3/+3
| | |
| * | don't try to read geom positions outside main ode thread :(UbitUmarov2013-01-061-10/+11
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-066-359/+853
|\ \ \ | |/ /
| * | bug fix, cleanup...UbitUmarov2013-01-033-38/+34
| | |
| * | i try to fix avatar orientation in some cases..UbitUmarov2013-01-021-2/+2
| | |
| * | add a lock to CollisionEventsThisFrameUbitUmarov2013-01-021-20/+29
| | |
| * | *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-025-330/+801
| | |
| * | missing fileUbitUmarov2012-12-181-4/+3
| | |
| * | fixUbitUmarov2012-12-183-8/+27
| | |
| * | some clean up/fixUbitUmarov2012-12-171-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-0610-96/+372
|\ \ \ | | |/ | |/|
| * | BulletSim: fix problem where mesh shapes were physically just their bounding ↵Robert Adams2013-01-041-0/+1
| | | | | | | | | | | | box and not the complete mesh. Fill mesh physical objects are back.
| * | BulletSim: implement llMoveToTarget by adding PIDActive, etc.Robert Adams2013-01-042-50/+33
| | | | | | | | | | | | | | | Implementation of non-vehicle hover but haven't tested it a lot. Update TODO list.
| * | BulletSim: add some features to the PID motor to make it more flexible.Robert Adams2013-01-041-9/+18
| | |
| * | BulletSim: convert avatar movement from a force to an impulse. Shouldn'tRobert Adams2013-01-041-2/+2
| | | | | | | | | | | | change functionality but removes an oddity in computing the force.
| * | BulletSim: add initial implementation of llMoveToTarget and hover height.Robert Adams2013-01-041-10/+147
| | | | | | | | | | | | Not all there yet.
| * | BulletSim: reorganize motor code a little to pull together common functions.Robert Adams2013-01-041-18/+129
| | | | | | | | | | | | Add BSFMotor.
| * | BulletSim: add comments to force and impulse setting functionsRobert Adams2013-01-041-0/+8
| | | | | | | | | | | | so it is clear what Bullet is actually doing with the set values.
| * | BulletSim: fix problem where pre-step actions would not replacedRobert Adams2013-01-041-0/+4
| | | | | | | | | | | | by new registrations thus causing multiple instances of an action.
| * | BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnosticRobert Adams2013-01-044-50/+73
| | | | | | | | | | | | | | | functions. If values set from console, the functions are called. Looking for why the collision pools fill up with unnecessary stuff.
* | | Merge branch 'master' into careminsterMelanie2013-01-0225-1727/+4570
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | BulletSim: add parameter to have Bullet output performance statisticsRobert Adams2013-01-014-7/+11
| | | | | | | | | | | | every so many frames. Default to off.
| * | BulletSim: move selection of the unmanaged Bullet DLL from BSPluginRobert Adams2013-01-012-6/+8
| | | | | | | | | | | | into the unmanaged Bullet interface class.
| * | BulletSim: move over and port the interface for BulletXNA.Robert Adams2013-01-017-315/+623
| | | | | | | | | | | | | | | | | | | | | | | | Copied BulletSNPlugin.BulletSimAPI to a new BulletSPlugin.BSAPIXNA.cs and then modifyed the latter to comply with the BSAPITemplate definition. Not totally debugged but the code is all there for an INI variable to select either unmanaged C++ Bullet or the C# version of Bullet.
| * | BulletSim: fix line endings.Robert Adams2013-01-012-52/+52
| | |
| * | BulletSim: subclass Bullet[World|Body|Shape|Constraint] for unmanagedRobert Adams2013-01-016-278/+1806
| | | | | | | | | | | | | | | to have pointers and managed to have objects. Initial paste of XNA code. Commented out.
| * | BulletSim: remove unused unmanaged memory reference functions from ↵Robert Adams2012-12-312-2/+4
| | | | | | | | | | | | BSAPITemplate.
| * | BulletSim: remove rigid body contruction functions from BSAPITemplate that ↵Robert Adams2012-12-312-61/+0
| | | | | | | | | | | | relied on prebuilt construction info structures.
| * | BulletSim: eliminate the use of the unmanaged HeightMapInfo structure.Robert Adams2012-12-314-42/+20
| | | | | | | | | | | | | | | Remove all related calls from the unmanaged and BSAPITemplate interfaces. Update DLLs and SOs to include the version without HeightMapInfo structures.
| * | BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.Robert Adams2012-12-3110-194/+311
| | | | | | | | | | | | Update BulletSim DLLs and SOs with simplier step function interface.
| * | BulletSim: nearly complete in conversion from BulletSimAPI to BSAPITemplate. ↵Robert Adams2012-12-3115-201/+372
| | | | | | | | | | | | Only initialization and debug fuctions left.