Melanie
56b2bc7101
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/Manager/IMesher.cs
2012-11-30 01:54:13 +00:00
Melanie
daa1d99513
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-11-30 01:19:08 +00:00
Robert Adams
0cd99c74a7
BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables mesh caching. Since BulletSim caches and tracks the unmanaged memory version of meshes, the Meshmerizer itself does not need to cache built meshes once BulletSim has made the physical proxy mesh.
2012-11-29 09:24:53 -08:00
Robert Adams
b8a7cbb9e9
BulletSim: reverse direction of hover correction. Removes problem with vehicles being orbited.
2012-11-29 08:03:30 -08:00
Robert Adams
2ccd4c1302
BulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from TYPE_BOAT definition.
2012-11-28 09:48:48 -08:00
Robert Adams
0a66317fa6
BulletSim: move GetWaterLevelAtXYZ from BSScene to BSPhysTerrain.
2012-11-28 09:48:33 -08:00
Justin Clark-Casey (justincc)
aae76f7be4
Stop logging spurious asset data for {0} is zero length error for sculpts/mesh
...
ODEPrim, for instance, always hits this code path twice at the moment
Firstly before any sculpt data has been loaded (hence the spurious message)
Secondly when any sculpt data has been loaded or failed to load (when the message would be valid).
Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead
(though this is not ideal since it requires all physics plugins to copy/paste similar code).
2012-11-28 02:01:04 +00:00
Robert Adams
8e459a0346
BulletSim: reorganize linear movement routine into separate subroutines enabling external calibration routines and unit tests.
2012-11-27 10:04:00 -08:00
Robert Adams
a5100cafee
BulletSim: fix terrain mesh generation for problem with regions that have unequal edge heights. Thanks UBit.
2012-11-27 10:03:55 -08:00
Robert Adams
68fe7dff20
BulletSim: reorganize angular movement routine into separate subroutines enabling external calibration routines and unit testing.
2012-11-27 10:03:49 -08:00
Robert Adams
59554758b1
BulletSim: implementation of vertical attraction motor.
2012-11-27 10:03:44 -08:00
Robert Adams
9e0db36c82
BulletSim: add 'infinite' timescale that does not reduce motor target or friction.
2012-11-27 10:03:38 -08:00
Robert Adams
5685b33071
BulletSim: increase vehicle stability by suppressing Bullet's update to angular velocity.
2012-11-26 10:47:34 -08:00
Robert Adams
084e3926ca
BulletSim: use m_angularMotor to do the basic movement. Add the setting of same. Rename the angular forces and add comments to match MoveAngular to the form of MoveLinear.
2012-11-25 20:04:33 -08:00
Robert Adams
d7126a14e1
BulletSim: up the vehicle angular damping to 0.95. Still trying to overcome the movement added by Bullet.
2012-11-25 20:04:33 -08:00
Robert Adams
4c077a0694
BulletSim: organize MoveLinear code for understandability. Make LIMIT_MOTOR_UP contribution a velocity and not a force.
2012-11-25 20:04:32 -08:00
Robert Adams
f977131fe0
BulletSim: add ToString override to BSVMotor.
2012-11-25 20:04:32 -08:00
Robert Adams
319ec3235c
BulletSim: add BSVMotor as BSDynamics linear motor.
...
Properly limit *_MOTOR_DECAY_TIMESCALE to 120 as per specs.
Invode BSDynamics.Refresh() when vehicle type is changed. Previously
the vehicle properties weren't getting set because the physical
properties were set before the vehicle type was set.
Add a "use name" to BSMotors for identification while debugging.
Correct current and target confusion in BSVMotor design.
Rename CurrentValueReductionTimescale to FrictionTimescale.
Event more detailed logging.
2012-11-25 20:04:31 -08:00
Robert Adams
980edabc2e
BulletSim: clean up TODO list. It is kept somewhere wlse that should be more public. Add error logging for the detail log writer so a message is output when it cannot write to the specified logging directory. Modify friction defaults to be closer to ODE's values. Add new collision margin and vehicle angular damping parameters.
2012-11-25 20:04:29 -08:00
Robert Adams
9a42405944
BulletSim: small change to add position correction force with AddForce rather than just storing it in the variable
2012-11-25 20:04:28 -08:00
Robert Adams
22d5bf8ff9
BulletSim: complete vector motor. Correct line endings.
2012-11-25 20:04:28 -08:00
Robert Adams
d1480ac7ee
BulletSim: add terrain collision margin and vehicle angular damping
...
parameters to the parameter block.
New API call for setting collision margin.
2012-11-25 20:04:27 -08:00
Robert Adams
c3f30fef96
BulletSim: add parameter for terrain collision margin.
...
Add locking around unlikely but possible race conditions on terrain list.
2012-11-25 20:04:27 -08:00
Robert Adams
4ae30873ad
BulletSim: Add tables and initialization for different attributes for different materials. For the moment, the per material tables are not used.
2012-11-25 20:04:26 -08:00
Melanie
fd7a83f439
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
2012-11-25 14:13:50 +00:00
Justin Clark-Casey (justincc)
22d4c52ffc
Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests
2012-11-24 03:15:24 +00:00
Melanie
2bdd3eb918
Merge branch 'master' into careminster
2012-11-22 14:47:57 +00:00
Melanie
3b2caa63b0
Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it
...
conflicts with PhysicsShape type defined in later libOMV
2012-11-22 14:45:41 +00:00
Melanie
c4c6121752
Merge branch 'master' into careminster
2012-11-22 03:17:33 +00:00
Robert Adams
cbc7e7bf85
BulletSim: Make avatar capsule so it is not circular.
...
Simple attempt to make avatars better shaped.
Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth'
and 'avatarCapsuleDepth'.
More tweeking to avatar height calculation. A little better but
short avatar's feet are above the terrain and tall avatar's feet
are a little below the ground.
2012-11-21 16:43:53 -08:00
Robert Adams
4a0de01704
BulletSim: Properly position mesh terrain on creation (fixes terrain not appearing to be working). Centralize terrain shape creation logic. Remove very chatty detail log messages.
2012-11-21 16:43:45 -08:00
Robert Adams
a59368c4a1
BulletSim: add terrainImplementation parameter with default to Mesh.
2012-11-21 16:43:37 -08:00
Robert Adams
2dc7e9d3fa
BulletSim: fix line endings to be all Linux style (windows style keeps creeping in)
2012-11-21 16:43:29 -08:00
Robert Adams
34cbc738a8
BulletSim: enablement and debugging of mesh terrain.
2012-11-21 16:43:21 -08:00
Robert Adams
71b9640dfa
BulletSim: pull heightmap implementation out of the terrain manager so a mesh terrain can be implemented.
2012-11-21 16:43:14 -08:00
Robert Adams
8dd5813889
BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually having mesh avatars.
2012-11-21 16:43:06 -08:00
Robert Adams
65e55ada87
BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to same.
2012-11-21 16:42:58 -08:00
Robert Adams
d6db0d5740
BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to that enum.
2012-11-21 16:42:50 -08:00
Robert Adams
4d29488216
BulletSim: change PositionSanityCheck to apply a force to correct position corrections (below ground and floating).
2012-11-21 16:42:42 -08:00
Robert Adams
2f5fe4b88e
BulletSim: tweek avatar capsule parameters so avatar feet don't go below ground. This solves the bouncing, short avatar problem (Mantis 6403).
2012-11-21 16:42:34 -08:00
Melanie
9f2d232c71
Merge branch 'master' into careminster
2012-11-19 22:53:03 +00:00
Robert Adams
6c961d8add
BulletSim: Use base class constructors for initialization of BSShape and other classes.
2012-11-18 22:58:36 -08:00
Robert Adams
22be36be69
BulletSim: fix the problem with flying being disabled when crossing region boundries.
2012-11-18 22:57:26 -08:00
Robert Adams
079a1e704f
BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim libraries with code stripped of the obsolete code.
2012-11-18 18:17:30 -08:00
Melanie
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
Melanie
06fa1681ae
Merge branch 'master' into careminster
2012-11-15 00:43:26 +00:00
Diva Canto
aeeaa3a0a9
Added AssemblyInfos to every dll in the OpenSim.Region namespace.
2012-11-14 11:09:43 -08:00
Diva Canto
e4cb7af98a
Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file.
2012-11-13 19:26:43 -08:00
Melanie
415b89f434
Merge branch 'master' into careminster
2012-11-09 22:58:42 +00:00
Dan Lake
9bc0419679
ODECharacter overrides TargetVelocity. No change to existing behavior
2012-11-08 01:18:25 -08:00
