Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
| * | | BulletSim: remove all the debug printing of pointer formatting ↵ | Robert Adams | 2012-12-31 | 7 | -25/+58 |
| | | | | | | | | | | | | (.ToString(X)) and replace it with a method on BulletBody, BulletShape, ... | ||||
| * | | BulletSim: another round of conversion: dynamics world and collision object ↵ | Robert Adams | 2012-12-31 | 15 | -1248/+1454 |
| | | | | | | | | | | | | functions. | ||||
| * | | BulletSim: add the implementation files for the two versions of Bullet: | Robert Adams | 2012-12-31 | 2 | -0/+1146 |
| | | | | | | | | | | | | unmanaged (C++) and managed (C#). | ||||
| * | | BulletSim: first round of conversion from direct BulletSimAPI interfacing by ↵ | Robert Adams | 2012-12-31 | 11 | -839/+234 |
| | | | | | | | | | | | | BulletSim core to using the BulletSimAPITemplate. Physical object creation and destruction first. | ||||
| * | | BulletSim: change physical data structures to classes. Add default | Robert Adams | 2012-12-31 | 5 | -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 careminster | Melanie | 2012-12-30 | 5 | -98/+150 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | BulletSim: remove check for small motor movement because, while it | Robert Adams | 2012-12-29 | 2 | -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 Adams | 2012-12-29 | 1 | -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 have | Robert Adams | 2012-12-29 | 4 | -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 setTargetVelocity | Robert Adams | 2012-12-28 | 2 | -3/+9 |
| | | | | | | | | | | | | to implement the 'always run' feature. | ||||
| * | | BulletSim: fix problem of avatars appearing to walk through walls | Robert Adams | 2012-12-28 | 1 | -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 careminster | Melanie | 2012-12-28 | 30 | -208/+342 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | BulletSim: correct collision mask definition for linkset children. | Robert Adams | 2012-12-27 | 4 | -35/+18 |
| | | | | | | | | | | | | Remove unused code. Add comments and TODOs. | ||||
| * | | BulletSim: fix physical object not interacting with static objects. | Robert Adams | 2012-12-27 | 1 | -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 Adams | 2012-12-27 | 4 | -5/+21 |
| | | | | | | | | | | | | dynamially turn on/off detailed, unmanaged data dumping of prims and vehicles. | ||||
| * | | BulletSim: move logic for IsColliding, CollidingGround and CollidingObj from ↵ | Robert Adams | 2012-12-27 | 4 | -39/+55 |
| | | | | | | | | | | | | individual sub-classes and up to parent BSPhysObject class. |