aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | BulletSim: remove all the debug printing of pointer formatting ↵Robert Adams2012-12-317-25/+58
| | | | | | | | | | | | (.ToString(X)) and replace it with a method on BulletBody, BulletShape, ...
| * | BulletSim: another round of conversion: dynamics world and collision object ↵Robert Adams2012-12-3115-1248/+1454
| | | | | | | | | | | | functions.
| * | BulletSim: add the implementation files for the two versions of Bullet:Robert Adams2012-12-312-0/+1146
| | | | | | | | | | | | unmanaged (C++) and managed (C#).
| * | BulletSim: first round of conversion from direct BulletSimAPI interfacing by ↵Robert Adams2012-12-3111-839/+234
| | | | | | | | | | | | BulletSim core to using the BulletSimAPITemplate. Physical object creation and destruction first.
| * | BulletSim: change physical data structures to classes. Add defaultRobert Adams2012-12-315-15/+29
| | | | | | | | | | | | | | | | | | instantiations for PhysBody and PhysShape when BSPhysObject is created to account for them being classes and not structures. Update TODO list.
* | | Merge branch 'master' into careminsterMelanie2012-12-305-98/+150
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | BulletSim: remove check for small motor movement because, while itRobert Adams2012-12-292-3/+6
| | | | | | | | | | | | | | | | | | did the right thing for stopping (speed reducing to zero), it prevented movement from starting (speed increasing from zero). Will revisit when the generalize PID motor is debugged.
| * | BulletSim: an 'if' to suppress multiple setting of avatar orientation.Robert Adams2012-12-291-5/+9
| | | | | | | | | | | | | | | | | | | | | Looks like the viewer bombards the server with avatar orientation information (we're talking several hundred a second) when the avatar is being turned or when walking. This change just reduces the number of 'set' calls into unmanaged code.
| * | BulletSim: tweeking avatar capsule code in an attempt to haveRobert Adams2012-12-294-46/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | asymmetrical avatar capsule work now that rotation is being passed from the simulator. Turns out the Bullet capsule is just not very functional: it doesn't scale properly, the implementation only half does asymmetry and, in general, is hard to work with. Avatar shape is about what it was before these changes. Added initial data structures for avatar shape mesh.
| * | BulletSim: add 'AvatarAlwaysRunFactor' parameter and use in setTargetVelocityRobert Adams2012-12-282-3/+9
| | | | | | | | | | | | to implement the 'always run' feature.
| * | BulletSim: fix problem of avatars appearing to walk through wallsRobert Adams2012-12-281-51/+55
| | | | | | | | | | | | | | | by moving the movement motor to a pre-step action and out of its questionable previous home in UpdateProperties.
* | | Merge branch 'master' into careminsterMelanie2012-12-2830-208/+342
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | BulletSim: correct collision mask definition for linkset children.Robert Adams2012-12-274-35/+18
| | | | | | | | | | | | Remove unused code. Add comments and TODOs.
| * | BulletSim: fix physical object not interacting with static objects.Robert Adams2012-12-271-9/+24
| | | | | | | | | | | | | | | Another instance of the underlying Bullet doing, ah, helpful things when items are added to the world.
| * | BulletSim: Parameterize nominal frame rate (55) and add parameters to ↵Robert Adams2012-12-274-5/+21
| | | | | | | | | | | | dynamially turn on/off detailed, unmanaged data dumping of prims and vehicles.
| * | BulletSim: move logic for IsColliding, CollidingGround and CollidingObj from ↵Robert Adams2012-12-274-39/+55
| | | | | | | | | | | | individual sub-classes and up to parent BSPhysObject class.