Commit Graph

23100 Commits (8d9bfda72729b2967d9c12c23458c535600c6103)

Author SHA1 Message Date
Robert Adams 20c3ec7d92 BulletSim: localize vehicle property setting so the vehicle prim is only updated at the end of the vehicle simulation step and the push of the physics property update event only happens if the properties are actually changed. 2012-12-03 07:59:39 -08:00
Robert Adams b124aae05e BulletSim: Add DumpActivationInfo2 function. Change static objects from DISABLE_SIMULATION to ISLAND_SLEEPING. Update DLLs and SOs to add DumpActivationInfo2 function. 2012-12-01 15:39:13 -08:00
UbitUmarov 9c7c703360 Merge branch 'avination' into ubitwork 2012-12-01 12:39:55 +00:00
Robert Adams ec63e4ff29 BulletSim: remove time scaling of computed vehicle absolute velocity since Bullet will scale the movement by the time slice. Restore LIMIT_MOTOR_UP to definitition of BOAT simce some vehicle engines use it even for land vehicles. Push vehicle parameter updates through the regular property update to solve vehicles floating off when they should be stopped. 2012-11-29 22:21:45 -08:00
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 0bda35e18f BulletSim: add copyright header where it is missing. Remove some unnecessary 'using' requirements so testing framework is less complicated. 2012-11-29 09:53:59 -08: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 24b3b4df2e BulletSim: update DLLs and SOs to remove simulator crash when calling SetInterpolationAngularVelocity. 2012-11-28 09:48:41 -08:00
Robert Adams 0a66317fa6 BulletSim: move GetWaterLevelAtXYZ from BSScene to BSPhysTerrain. 2012-11-28 09:48:33 -08:00
Diva Canto d656ec8f33 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-27 21:11:19 -08:00
Diva Canto 92a766e8cb Bug fix in Offline IM for inventory transfers. The items were being placed twice in the receiver's inventory. 2012-11-27 21:10:58 -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
Justin Clark-Casey (justincc) 8a1d3b322f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-28 02:00:34 +00:00
Justin Clark-Casey (justincc) c17ea2049b Show many more primitive properties on console command "show part name/id/pos" 2012-11-28 01:42:58 +00:00
Diva Canto a82f699f43 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-27 14:43:01 -08:00
Diva Canto 2cd88787af Prevent the core Groups module from being enabled when its name doesn't match the "default" ini choice 2012-11-27 14:42:28 -08: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
Justin Clark-Casey (justincc) 16e4019eca Fix database service unit test failures by temporarily reverting BasicDataServiceTest extending OpenSimTestCase.
Mono 2.4.3 doesn't like this when running nunit, with nunit throwing
AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true.
and similar.  Mono 2.10.8.1 does not have this issue.
So will wait until min version of mono bumps before restoring.
2012-11-26 22:25:36 +00:00
Robert Adams 5685b33071 BulletSim: increase vehicle stability by suppressing Bullet's update to angular velocity. 2012-11-26 10:47:34 -08:00
BlueWall 88f2fbc8f1 Merge branch 'master' into connector_plugin 2012-11-26 06:55:03 -05: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 bd635e264a BulletSim: update DLLs and SOs with new collision margin setting function. 2012-11-25 20:04:31 -08:00
Robert Adams 9b98011714 BulletSim: update OpenSimDefaults.ini with current default values for friction and collision margin. Remove some of the BulletSim parameters that are very esoteric and dangerous. Most of the remaining parameters are features one can 'see'. 2012-11-25 20:04:30 -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
BlueWall c754003944 Merge branch 'master' into connector_plugin
Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs
2012-11-25 17:03:14 -05:00
Melanie cf670c01cc Merge branch 'avination' into careminster 2012-11-25 14:14:20 +00: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
teravus ae8d3815c7 Merge branch 'teravuswork' of careminster:/var/git/careminster into teravuswork 2012-11-24 22:10:15 -05:00
teravus a118001181 * Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339 2012-11-24 22:09:34 -05:00
teravus 1487d69734 * Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339 2012-11-24 22:01:34 -05:00
UbitUmarov 62244b5ea5 don't zero constant force and torque in selection 2012-11-24 22:46:24 +00:00
Justin Clark-Casey (justincc) 02db8b9adb Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are functionally identical.
Move TestDeleteSceneObjectAsync() and TestDeleteSceneObjectAsyncToUserInventory() from SceneObjectBasicTests -> SceneObjectDeRezTests
2012-11-24 03:49:23 +00:00
UbitUmarov f254af29ac avoid potencial NullReferenceException 2012-11-24 03:39:37 +00:00
Justin Clark-Casey (justincc) a4ce63d0cd Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a BasicInventoryAccessModule() and re-enable in test suite. 2012-11-24 03:38:15 +00:00