aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-038-143/+276
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * BulletSim: Make parameter value defaults match what should be the default ↵Robert Adams2012-10-022-14/+14
| | | | | | | | and what is in OpenSimDefaults.ini. Comment and debug printout changes.
| * BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its ↵Robert Adams2012-10-023-5/+64
| | | | | | | | children of BSPrim and BSCharacter.
| * BulletSim: Fix problem where box shapes were not being rebuilt if the shape ↵Robert Adams2012-10-021-4/+6
| | | | | | | | type changed.
| * BulletSim: Fix linkset problem where delayed manipulations of child objects ↵Robert Adams2012-10-021-10/+8
| | | | | | | | was using the child shape address at call time rather than the one created at taint time.
| * BulletSim: call ForcePosition and ForceOrientation in BSDynamics so there is ↵Robert Adams2012-10-021-39/+57
| | | | | | | | no lag between what the vehicle code sees and what the physics engine is using.
| * BulletSim: fix the FloatOnWater code so avatars can normally go underwater.Robert Adams2012-10-021-1/+1
| |
| * BulletSim: impliment FloatOnWater OS function.Robert Adams2012-10-023-22/+104
| |
| * Correct my name in CONTRIBUTORS.txtRobert Adams2012-10-021-35/+16
| |
| * BulletSim: remove warnings for unused variables.Robert Adams2012-10-023-14/+7
| |
* | Merge branch 'avination' into careminsterMelanie2012-09-292-34/+126
|\ \
| * | make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-2913-1372/+2150
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | BulletSim: remember to release the physical body and shape when a prim is ↵Robert Adams2012-09-282-16/+16
| | | | | | | | | | | | destroyed. This fixes many problems with physical linksets.
| * | BulletSim: add separate runtime and taint-time linkset children lists to ↵Robert Adams2012-09-273-80/+93
| | | | | | | | | | | | keep the creation of constraints separate from runtime.
| * | BulletSim: rename some constraint variables to be consistant with other name ↵Robert Adams2012-09-277-116/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | use. Added callbacks for shape and body changes in GetBodyAndShape() so the linkset constraints can be picked up and restored. A better design might be to have a "prim shape changed" event. Think about that. Added constraint types to general constraint class.
| * | BulletSim: remove the trailing spaces from lines to make git happierRobert Adams2012-09-2710-276/+275
| | |
| * | BulletSim: remove the unused body management code from BSPrim. There is no ↵Robert Adams2012-09-271-374/+0
| | | | | | | | | | | | going back now.
| * | BulletSim: Fix linkset crash. Caused by the different body and shapeRobert Adams2012-09-279-94/+182
| | | | | | | | | | | | | | | | | | | | | pointers at runtime and at taint-time. Now passes the body into the taint. Vehicles zero inertia when active to eliminate Bullet's contribution to vehicle motion.
| * | BulletSim: Terrain sets proper collision flags on creation.Robert Adams2012-09-274-52/+56
| | | | | | | | | | | | | | | | | | Static objects are set to ISLAND_SLEEPING rather than DISABLE_SIMULATION. Might reconsider this and, alternatively, have dynamic objects force activation. Clean up use of DetailLog().
| * | BulletSim: btGhostObjects working to make 'volume detect' work.Robert Adams2012-09-277-191/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrangement and cleanup of shape collection code. Much more readable. Enabling and use of collision filters and masks. Addition of ID to body creation BulletSimAPI calls so always set in shape for collision reporting. Change default of ShouldSplitSimulationIslands and ShouldRandomizeSolverOrder from 'false' to 'true'. When 'false', this suppresses NO_CONTACT_RESPONSE which makes volume detect fail.
| * | BulletSim: renamed members of BulletShape, BulletSim and BulletBodyRobert Adams2012-09-2711-270/+482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so the members case is consistant. Caused modifications everywhere. New logic in BSShapeCollection to track use and sharing of shapes. I just reslized, though, that shapes cannot be shared because the shape's UserPointer is the localID of the prim and is required for tracking collisions. More changes coming. Added DuplicateCollisionShape2() to API and changed BuildNativeShape2 to take a ShapeData structure so don't have to pass so many parameters. This matches the latest version of BulletSim.dll. Additions and removal of DetailLog() statements for debugging.
| * | BulletSim: fix regression that caused cylindar shapes to have a box ↵Robert Adams2012-09-271-1/+9
| | | | | | | | | | | | collision shape
| * | BulletSim: complete code for managed code shape and body tracking. Not debugged.Robert Adams2012-09-275-130/+675
| | | | | | | | | | | | | | | Eliminate some null exceptions created adding the above code. Add and remove some detailed logging statements.
| * | BulletSim: add class and infrastructure for shape and objectRobert Adams2012-09-275-39/+192
| | | | | | | | | | | | | | | tracking in the C# code. Needed for the changing body type (to and from GhostObjects) for volumeDetect.
| * | BulletSim: Convert BSCharacter to use common BSPhysObject code and variables.Robert Adams2012-09-275-117/+113
| | | | | | | | | | | | | | | | | | | | | Fix avatar height calculation to properly account for the capsule ends. Rearrange some locking in TerrainManager to eliminate possible race conditions. Move DetailLog() definition into common BSPhysObject class. Some variable renaming to make usage clearer (refactor.rename makes this so easy).
| * | BulletSim: move a bunch of common logic out of BSPrim and BSCharacterRobert Adams2012-09-277-416/+361
| | | | | | | | | | | | | | | | | | and into the parent class BSPhysObject. Rework collision logic to enable extra collision after done colliding. Rename 'Scene' to 'PhysicsScene' to differentiate it from the simulator 'Scene'.
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Remove spammy "axislock" debug.Melanie2012-09-171-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-169-464/+446
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | BulletSim: update DLLs and SOs and remove some debugging code.Robert Adams2012-09-151-1/+1
| | |
| * | BulletSim: some debugging prints in BSPrim for tracking changes in linkset ↵Robert Adams2012-09-151-1/+3
| | | | | | | | | | | | children.
| * | BulletSim: add the debugging routine DumpRigidBody2() to API2.Robert Adams2012-09-151-3/+6
| | |
| * | BulletSim: another attempt at computing physics FPS correctly.Robert Adams2012-09-151-23/+6
| | |
| * | BulletSim: remove timeStep parameter from calls for vehicle parameter ↵Robert Adams2012-09-152-9/+6
| | | | | | | | | | | | setting. There is no reason these should be using the simulation time interval for parameter calculation.
| * | BulletSim: Remove calculation and passing of unused collied object type.Robert Adams2012-09-154-28/+36
| | | | | | | | | | | | | | | Fix collision code to properly sense mega-region children regions as terrain. When setting an object physical, reset all the physical properties (friction, ...).
| * | BulletSim: set all linkset objects center of mass to the whole linkset's ↵Robert Adams2012-09-151-2/+15
| | | | | | | | | | | | center of mass
| * | BulletSim: Add calls to linkset class when object going static or dynamic.Robert Adams2012-09-152-8/+32
| | | | | | | | | | | | Reset center of mass on an object when going dynamic.
| * | BulletSim: remove unused NeedsMeshing() code from BSScene.Robert Adams2012-09-151-116/+0
| | |
| * | BulletSim: Add 'IsNativeShape2' callRobert Adams2012-09-151-4/+7
| | |
| * | BulletSim: Way too many changes in one commit.Robert Adams2012-09-159-286/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many changes to BSDynamic for readability and commentary. Linkset hacking for vehicles: don't over mass the root prim. Add parameter for link constraint solver iterations. Correct uses of timestep in timescale calculations for vehicles. Reorganize code/logic for making objects static and dynamic for readability and use of API2. Changed most calls in BSPrim to use API2 calls (the new way). Avatars do not generate default Bullet collision events but do call up to the simulator for every avatar. Reduces overhead. Objects added to collision list only if they are processing collisions. Reduces overhead especially for large numbers of avatars. Generalize call for water height to GetWaterHeightAtXYZ(). Catch and correct exception getting terrain height when out of bounds. Correct race condition in Terrain Manager where creation wasn't at taint-time. Add API calls for constructing compound shapes. Move NeedsMeshing() logic into object class. Reorganize logic for object meshing to reduce rebuilding of meshs/hulls.
* | | Merge branch 'master' into careminsterMelanie2012-09-097-64/+528
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | BulletSim: Add Bullet body and shape to BSPhysObject and renameRobert Adams2012-09-076-62/+505
| | | | | | | | | | | | | | | | | | | | | | | | | | | 'Body' to 'BSBody' for disambiguation when reading code. Complete the API2 interface so nearly all methods on bullet classes are available to the managed code. The efficient single call simulation step is kept in place while all other creation/destruction/parameterization can be done in the managed code.
| * | BulletSim: Add some comments (gasp) and log messages.Robert Adams2012-09-074-4/+13
| | |
| * | BulletSim: PhysicsActorType() now returns the correct value rather than ↵Robert Adams2012-09-072-2/+3
| | | | | | | | | | | | 'unknown'.
| * | BulletSim: Modify collision flag calls to return the current flags.Robert Adams2012-09-072-7/+18
| | | | | | | | | | | | | | | | | | Track current collision flags in BSPrim. Add BulletSimAPI calls for saving and restoring rigidBodies using construction information structure.
* | | Merge branch 'master' into careminsterMelanie2012-09-029-321/+961
|\ \ \ | |/ /
| * | BulletSim: Update BulletSimAPI to match the DLL interface.Robert Adams2012-08-314-137/+231
| | | | | | | | | | | | | | | | | | | | | | | | Major rework of terrain management which finally makes mega-regions work. Update heightmap of terrain by rebuilding the terrain's body and shape. There is a problem with just replacing the shape so this workaround will do for the moment but it will need to be resolved for mesh and hull switching.
| * | BulletSim: clean up some variable naming for consistancy.Robert Adams2012-08-314-102/+183
| | | | | | | | | | | | | | | | | | | | | Update DLL API for new terrain and shape/body pattern methods. Terrain creation and modification uses new shape/body pattern. Move debug logging callback set to initialization call so logging is per physics engine.
| * | BulletSim: fix line endings.Robert Adams2012-08-311-22/+22
| | |