Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster | Melanie | 2013-01-16 | 21 | -213/+450 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| * | BulletSim: disable center-of-mass computation for linksets until debugged. ↵ | Robert Adams | 2013-01-14 | 2 | -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 Adams | 2013-01-11 | 10 | -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 update | Robert Adams | 2013-01-11 | 9 | -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 Adams | 2013-01-11 | 4 | -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 Adams | 2013-01-11 | 2 | -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 Adams | 2013-01-11 | 4 | -65/+59 |
| | | | | | | | | buoyancy. Add motor angular debugging controls. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-13 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | BulletSim: fix the 'No recognised physics mesh found ...' error spew by ↵ | Robert Adams | 2013-01-11 | 1 | -1/+1 |
| | | | | | | | | remembering that the last asset fetch failed until the simulator resets the shape parameters. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-10 | 10 | -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 Adams | 2013-01-08 | 2 | -8/+12 |
| | | | | | | | | Fix problem of vehicles going crazy when backing up. | ||||
| * | BulletSim: improve vehicle angular banking and deflection computation. ↵ | Robert Adams | 2013-01-07 | 1 | -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 Adams | 2013-01-07 | 5 | -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 file | Robert Adams | 2013-01-07 | 1 | -0/+2 |
| | | |||||
| * | BulletSim: comments and removing small compile errors introduced in last commit. | Robert Adams | 2013-01-06 | 3 | -9/+3 |
| | | |||||
| * | BulletSim: update DLLs and SOs with better debugging output. | Robert Adams | 2013-01-06 | 4 | -12/+151 |
| | | | | | | | | | | Add definition of hand crafted avatar mesh. Not used yet. Comments and cleanup. | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 3 | -25/+43 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | * DAnger, TEST * change camera plane collision detection. Still bounces on | UbitUmarov | 2013-01-08 | 1 | -12/+29 |
| | | | | | | | | | | | | * prim edges due to camera lag | ||||
| * | | also exclude land | UbitUmarov | 2013-01-07 | 1 | -3/+3 |
| | | | |||||
| * | | exclude avatars from unfiltered RaycastWorld | UbitUmarov | 2013-01-07 | 1 | -3/+3 |
| | | | |||||
| * | | don't try to read geom positions outside main ode thread :( | UbitUmarov | 2013-01-06 | 1 | -10/+11 |
| | | | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2013-01-06 | 6 | -359/+853 |
|\ \ \ | |/ / | |||||
| * | | bug fix, cleanup... | UbitUmarov | 2013-01-03 | 3 | -38/+34 |
| | | | |||||
| * | | i try to fix avatar orientation in some cases.. | UbitUmarov | 2013-01-02 | 1 | -2/+2 |
| | | | |||||
| * | | add a lock to CollisionEventsThisFrame | UbitUmarov | 2013-01-02 | 1 | -20/+29 |
| | | | |||||
| * | | *TEST* avatar unscripted sit. Some guessing/automation | UbitUmarov | 2013-01-02 | 5 | -330/+801 |
| | | | |||||
| * | | missing file | UbitUmarov | 2012-12-18 | 1 | -4/+3 |
| | | | |||||
| * | | fix | UbitUmarov | 2012-12-18 | 3 | -8/+27 |
| | | | |||||
| * | | some clean up/fix | UbitUmarov | 2012-12-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-06 | 10 | -96/+372 |
|\ \ \ | | |/ | |/| | |||||
| * | | BulletSim: fix problem where mesh shapes were physically just their bounding ↵ | Robert Adams | 2013-01-04 | 1 | -0/+1 |
| | | | | | | | | | | | | box and not the complete mesh. Fill mesh physical objects are back. | ||||
| * | | BulletSim: implement llMoveToTarget by adding PIDActive, etc. | Robert Adams | 2013-01-04 | 2 | -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 Adams | 2013-01-04 | 1 | -9/+18 |
| | | | |||||
| * | | BulletSim: convert avatar movement from a force to an impulse. Shouldn't | Robert Adams | 2013-01-04 | 1 | -2/+2 |
| | | | | | | | | | | | | change functionality but removes an oddity in computing the force. | ||||
| * | | BulletSim: add initial implementation of llMoveToTarget and hover height. | Robert Adams | 2013-01-04 | 1 | -10/+147 |
| | | | | | | | | | | | | Not all there yet. | ||||
| * | | BulletSim: reorganize motor code a little to pull together common functions. | Robert Adams | 2013-01-04 | 1 | -18/+129 |
| | | | | | | | | | | | | Add BSFMotor. | ||||
| * | | BulletSim: add comments to force and impulse setting functions | Robert Adams | 2013-01-04 | 1 | -0/+8 |
| | | | | | | | | | | | | so it is clear what Bullet is actually doing with the set values. | ||||
| * | | BulletSim: fix problem where pre-step actions would not replaced | Robert Adams | 2013-01-04 | 1 | -0/+4 |
| | | | | | | | | | | | | by new registrations thus causing multiple instances of an action. | ||||
| * | | BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnostic | Robert Adams | 2013-01-04 | 4 | -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 careminster | Melanie | 2013-01-02 | 25 | -1727/+4570 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | BulletSim: add parameter to have Bullet output performance statistics | Robert Adams | 2013-01-01 | 4 | -7/+11 |
| | | | | | | | | | | | | every so many frames. Default to off. | ||||
| * | | BulletSim: move selection of the unmanaged Bullet DLL from BSPlugin | Robert Adams | 2013-01-01 | 2 | -6/+8 |
| | | | | | | | | | | | | into the unmanaged Bullet interface class. | ||||
| * | | BulletSim: move over and port the interface for BulletXNA. | Robert Adams | 2013-01-01 | 7 | -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 Adams | 2013-01-01 | 2 | -52/+52 |
| | | | |||||
| * | | BulletSim: subclass Bullet[World|Body|Shape|Constraint] for unmanaged | Robert Adams | 2013-01-01 | 6 | -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 Adams | 2012-12-31 | 2 | -2/+4 |
| | | | | | | | | | | | | BSAPITemplate. | ||||
| * | | BulletSim: remove rigid body contruction functions from BSAPITemplate that ↵ | Robert Adams | 2012-12-31 | 2 | -61/+0 |
| | | | | | | | | | | | | relied on prebuilt construction info structures. | ||||
| * | | BulletSim: eliminate the use of the unmanaged HeightMapInfo structure. | Robert Adams | 2012-12-31 | 4 | -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 Adams | 2012-12-31 | 10 | -194/+311 |
| | | | | | | | | | | | | Update BulletSim DLLs and SOs with simplier step function interface. | ||||
| * | | BulletSim: nearly complete in conversion from BulletSimAPI to BSAPITemplate. ↵ | Robert Adams | 2012-12-31 | 15 | -201/+372 |
| | | | | | | | | | | | | Only initialization and debug fuctions left. |