ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-23 08:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,319 Commits 5 Branches 88 Tags
aeeaa3a0a9b965dfe5d1111b178234c94de9ba9d
Commit Graph

301 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
68a4ef5ef6 Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process. 2012-02-21 02:52:20 +00:00
Justin Clark-Casey (justincc)
9846a1e56e Report an error if the required native Windows ODE library can't be found. 2012-02-18 02:52:29 +00:00
Justin Clark-Casey (justincc)
b817c337dc On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit 
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box.  Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work.  Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
 2012-02-18 00:33:52 +00:00
Justin Clark-Casey (justincc)
71d221cdc0 Remove the unused CollisionLocker from ODE 
Despite its name, this wasn't actually being used in any collision checking
 2011-10-18 17:35:58 +01:00
Justin Clark-Casey (justincc)
36df9ae79a refactor: Separate the OdeScene class into its own file from OdePlugin.cs, to improve code readability 2011-07-08 18:16:48 +01:00
Justin Clark-Casey (justincc)
1dcad4ac66 minor: commented out log lines for future use and very small code tidy 2011-07-08 17:58:01 +01:00
dahlia
5c18ebf424 Allow physics proxy generation for meshes using new asset format. 
Fix an invalid cast exception while decoding new mesh asset format.
 2011-06-29 17:36:41 -07:00
dahlia
90b810c27e force mesh proxy for simple box prims with path cut 2011-04-12 22:47:30 -07:00
Teravus Ovares (Dan Olivares)
46db73b62b * Re-Adding Scene TimeDilation to Object Update Packets. 
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created.  The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire.  Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
 2010-12-23 03:30:09 -05:00
Diva Canto
1e7ce6dbce Hunting for the problem in #4777 2010-06-19 09:44:02 -07:00
Diva Canto
9b410f5e94 Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777. 2010-06-19 09:25:36 -07:00
Diva Canto
f0f684161e Reinstated the behavior of AddPrimShape *exactly* as it was as of December. Trying to fix mantis #4777 2010-06-19 08:57:58 -07:00
Melanie
47d5f90629 Remove an error in meshing error reporting. Now doesn't double-bomb 
anymore on a bad sculpt
 2010-06-18 19:49:14 +01:00
Melanie
ceac35bac1 Log and eat sculpt meshing exceptions caused by bad jp2 data. 2010-06-12 16:25:40 +01:00
Jeff Ames
70d5b1c34c Formatting cleanup. Add copyright headers. 2010-01-04 06:17:30 +09:00
Teravus Ovares (Dan Olivares)
781db43a76 * Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)]) 
* Adds a configurable maximum object mass before the mass is clamped.  Default is 10000.01.  Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section.
* Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations.  Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'.
 2009-12-03 20:21:10 -05:00
Teravus Ovares (Dan Olivares)
3ebb528c79 * Resolves mantis 4390 http://opensimulator.org/mantis/view.php?id=4390 2009-11-23 11:44:22 -05:00
Teravus Ovares (Dan Olivares)
21f80b6507 * Adds a test for if the collision is at the bottom of the capsule on avatar. This prevents the 'double jump' capability that's been occurring for ages when avatar collide with prim on the side. 2009-11-22 22:04:52 -05:00
Justin Clark-Casey (justincc)
a88a463b50 Following various discussions on irc and in the OpenSim dev OSGrid meeting last week, change av_capsule_tilted to false by default 
This appears to now give better ODE physics response (less sinking into the ground, etc.)
Please change it back if this is actually a bad idea for some reason
 2009-11-09 19:26:42 +00:00
Justin Clark-Casey (justincc)
af0e5d0974 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2009-11-03 19:11:09 +00:00
Justin Clark-Casey (justincc)
1d737b010c minor: remove some mono compiler warnings 2009-11-03 18:52:20 +00:00
John Hurliman
7132877075 * Log progress messages when loading OAR files with a lot of assets 
* Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars
* Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls
 2009-10-29 01:46:58 -07:00
John Hurliman
1c9696a9d2 Always send a time dilation of 1.0 while we debug rubberbanding issues 2009-10-28 15:11:01 -07:00
John Hurliman
a069a1ee68 Limit physics time dilation to 1.0 2009-10-28 14:44:05 -07:00
John Hurliman
a65c8cdc38 * Reduce the velocity tolerance on sending terse updates to avoid slowly drifting prims/avatars 
* Added contacts_per_collision to the ODE config section. This allows you to reduce the maximum number of contact points ODE will generate per collision and reduce the size of the array that stores contact structures
 2009-10-28 12:45:40 -07:00
John Hurliman
ee0f7e10c8 Fixed a bad check on velocity in the ODE near() callback (it was only checking for velocity in certain directions, and was calling the get_Velocity() function three times) 2009-10-28 12:20:34 -07:00
John Hurliman
0c466b28bb Move the calculation of time dilation from the scene to the physics engine. The scene is still the one reporting dilation so this does not break the API or remove flexibility, but it gets the calculation happening in the right place for the normal OpenSim usage. The actual calculation of physics time dilation probably needs tweaking 2009-10-27 16:24:43 -07:00
John Hurliman
d199767e69 Experimental change of PhysicsVector to Vector3. Untested 2009-10-26 18:23:43 -07:00
John Hurliman
ff4b45a1e3 Do case-insensitive comparisons on region names in LLStandaloneLoginModule 2009-10-26 15:12:43 -07:00
John Hurliman
ac7ccdf7d7 * Changed the watchdog timer to improve the speed of UpdateThread(), only track threads once the first call to UpdateThread() has been made, and allow re-tracking of threads that timed out but revived later 
* Added a commented out call to Watchdog.UpdateThread() in OdeScene. If it turns out that loading a large OAR file or some other operation is timing out the heartbeat thread, we'll need to uncomment it
 2009-10-26 14:41:27 -07:00
dslake
8ba3afb59b Patch from dslake http://opensimulator.org/mantis/view.php?id=4291 0004291: Inconsistent locking of ODE tainted prims 2009-10-23 12:14:05 -04:00
Melanie
c4969d47d9 Merge branch 'master' into vehicles 2009-10-22 07:12:10 +01:00
John Hurliman
72078195c2 Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into prioritization 2009-10-19 15:20:38 -07:00
John Hurliman
bd03cbd815 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization 2009-10-19 15:19:37 -07:00
Diva Canto
590d91e572 Forgot {} on last commit. 2009-10-19 15:03:55 -07:00
Diva Canto
2dd8a6beac More instrumentation in physics. 2009-10-19 14:48:17 -07:00
Melanie
ffd59868f5 Merge branch 'master' into vehicles 2009-10-19 21:58:51 +01:00
Jeff Ames
0d29614ca1 Formatting cleanup. 2009-10-19 08:58:03 +09:00
Diva Canto
baed19d068 A bit of instrumentation to figure out what's going on with physics actors. 2009-10-18 16:48:44 -07:00
Teravus Ovares (Dan Olivares)
0079d0a7c4 * One more attempt at the NullRef In The OdePlugin. This might fix it, but it will definitely get us closer to the root cause. 2009-10-16 14:30:55 -04:00
Melanie
50f509d600 Merge branch 'master' into vehicles 2009-10-12 15:11:01 +01:00
Teravus Ovares (Dan Olivares)
4ffe936ba8 * Make ODECharacter respect the scene's requested collision update time 
* Set the Scene collision update time to 500 ms
 2009-10-10 03:53:53 -04:00
Melanie
d06c7d90a1 Correct a build break caused by an optimization in trunk 2009-10-07 06:56:00 +01:00
Melanie
0374f1b144 Merge branch 'master' into vehicles 2009-10-06 17:44:59 +01:00
Justin Clark-Casey (justincc)
10c4b88ccf minor: remove mono compile warning 2009-10-05 18:20:37 +01:00
Melanie
41ff39414b Merge branch 'master' into vehicles 2009-10-01 14:08:15 +01:00
opensim
827b0fb199 Commit initial version of KittoFlora's vehicle changes 2009-09-30 18:51:02 +02:00
Jeff Ames
ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Justin Clark-Casey (justincc)
0683cf6e0d Add test to check behaviour if an iar is loaded where no user profile exists for the creators 
Disable generation of temporary profiles for now, instead record loading user as creator
 2009-09-09 18:03:49 +01:00
Teravus Ovares (Dan Olivares)
b93f512433 * Fix for GetTerrainHeightAtXY to make it compatible when Constants.RegionSize isn't 256 2009-09-04 02:48:07 -04:00