Melanie
70553a979e
Merge branch 'master' into vehicles
2009-10-12 15:12:15 +01:00
Melanie
50f509d600
Merge branch 'master' into vehicles
2009-10-12 15:11:01 +01:00
unknown
fe0940a22f
Optimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE enabled, the first Heartbeat loop call to UpdatePhysics takes 20 minutes. 75% of that time is spent in this sleep. (100k prims * 10ms)
2009-10-12 01:53:57 -07:00
dahlia
7b4183d7a0
sync PrimMesher with r46
2009-10-11 02:12:17 -07:00
dahlia
41b27ef064
disambiguate System.Path (preparation for new PrimMesher)
2009-10-11 01:30:24 -07:00
Teravus Ovares (Dan Olivares)
8271528b1f
* comment out the velocity test, using updates every 500 ms as set in ScenePresence.AddToPhysicalScene.
...
* This causes time to be counted in ODECharacter and, when a collision occurs, the physics scene will report the collisions only if the the difference of last time it reported the collisions from now was more then the set ms.
* This is cool because the time accrues while collisions are not taking place and when they do take place again, you get an immediate update.
2009-10-10 04:01:36 -04: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
8d5a40aad0
Merge branch 'master' into vehicles
2009-10-05 12:58:52 +01:00
Dan Lake
6d52974c5f
Eliminate pinned Mesh data on managed heap by using IntPtrs to memory allocated on the unmanaged heap. This prevents fragmentation of the managed heap and the resulting stress on GC. A region with ~150,000 prims using ODE and Meshmerizer saw memory remain flat around 1.2GB as opposed to 1.5GB and continually growing due to pinned memory. This patch complements the unique mesh dictionary patch applied to Meshmerizer but is independent. The net effect is a 60-75% reduction in memory for our largest regions.
2009-10-05 12:45:41 +01:00
Melanie
0744292b47
Merge branch 'master' into vehicles
2009-10-05 10:17:23 +01:00
dahlia
5c593f3892
only cache mesh if meshing was successful
...
re-enable sculpt mesh caching
2009-10-04 20:01:44 -07:00
dahlia
95ebb7794c
flexible extrusion shape defaults to linear
2009-10-04 02:59:12 -07:00
dahlia
0cbd9eee2f
Exclude sculpt proxies from mesh caching
2009-10-04 02:14:13 -07:00
Melanie
9eccea5777
Merge branch 'master' into vehicles
2009-10-02 19:53:42 +01:00
Melanie
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
Melanie
41ff39414b
Merge branch 'master' into vehicles
2009-10-01 14:08:15 +01:00
Diva Canto
1eb6f99d19
Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there.
2009-09-30 20:27:40 -07:00
Jeff Ames
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
Kitto Flora
07df0e0ab0
Merge branch '0.6.7-post-fixes' into vehicles
2009-09-30 19:07:18 +02: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
Jeff Ames
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
dahlia
fb2cabd6b3
corrections to viewerMode AddPos()
2009-09-25 13:01:48 -07:00
Dan Lake
1b2828f5d8
Meshmerizer stores dictionary of unique Meshes keyed on construction parameters. CreateMesh() returns a Mesh from the dictionary or creates a new Mesh if it has not been created before. Meshes are never purged from the dictionary. The raw Mesh data is discarded once the memory is pinned for ODE use. All copies of the same prim/mesh use the same pinned memory. ONLY IMPLEMENTED AND TESTED WITH MESHMERIZER AND ODE
...
Signed-off-by: dahlia <dahliaTrimble@gmailDotCom>
2009-09-24 18:20:59 -07:00
dahlia
daffb69174
modify BulletDotNETPrim.cs in preparation for Mantis #4181
2009-09-24 18:16:29 -07:00
nlin
56edbe9b60
Alternate algorithm for fixing avatar capsule tilt (Mantis #2905 )
...
Eliminate dynamic capsule wobble. Instead introduce a small, fixed
tilt, and allow the tilt to rotate with the avatar while moving; the
tilt always faces away from the direction of avatar movement. The
rotation while moving should eliminate direction-dependent behavior
(e.g. only being able to climb on top of prims from certain directions).
Falling animation is still too frequently invoked.
Ideally the tilt should be completely eliminated, but doing so
currently causes the avatar to fall through the terrain.
2009-09-18 11:39:08 +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
Teravus Ovares (Dan Olivares)
bb5857c4bb
* Fixes the function 'GetTerrainHeightAtXY'
2009-09-04 00:03:54 -04:00
dahlia
6cf610bc44
eliminate unnecessary storage of mesh objects which are no longer necessary after recent startup optimizations
2009-09-02 17:40:55 -07:00
Jeff Ames
56ddd6828c
Add copyright headers. Formatting cleanup.
2009-09-03 02:04:17 +09:00
Teravus Ovares (Dan Olivares)
9505297fb1
* One last attempt to get the bordercrossing/primcrossing/attachmentcrossing right in the new border framework.
...
* This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region.
2009-09-02 04:39:00 -04:00
Melanie
f32de6fe88
Thank you, dslake, for a set of patches to improve OpenSim startup
...
and idle performance.
2009-09-02 03:33:31 +01:00
Melanie
c89fc36f28
Applying Mantis #4079 . Thank you, dslake
2009-09-01 02:17:08 +01:00
Teravus Ovares (Dan Olivares)
54e05a083d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-26 11:48:05 -04:00
Jeff Ames
cf2d1b5c10
Add copy constructor to PhysicsVector.
2009-08-26 14:28:54 +09:00
Jeff Ames
256624566f
Formatting cleanup, minor refactoring.
2009-08-26 14:02:01 +09:00
Teravus Ovares (Dan Olivares)
e1b38ff001
* It turns out that Physics heightmap values were being stored in managed memory in _heightmap and using multiple heightmaps caused them all to overwrite each other and the last one was the heightmap for all of the regions. This fixes that. It also reduces the terrain resolution to half.
2009-08-21 13:22:49 -04:00
Teravus Ovares (Dan Olivares)
64dcb71c14
* Fixes Terrain issues with combined regions.
2009-08-20 23:26:40 -04:00
Teravus Ovares (Dan Olivares)
311b51a184
*remove conflicts
2009-08-18 11:09:43 -04:00
Teravus Ovares (Dan Olivares)
c54cb59a71
* Some Physics Scene Changes to prepare for larger regions
2009-08-18 11:05:07 -04:00
Melanie
9ad3e72ae1
Did I say that i don't like git? Remove some stuff that shouldn't have
...
gone in.
2009-08-17 22:06:51 +01:00
Melanie
644db1e540
Add System.Xml reference to the console project
2009-08-17 09:40:38 +01:00
Jeff Ames
9d9fcac038
Misc cleanup.
2009-08-16 17:14:21 +09:00
Teravus Ovares (Dan Olivares)
30ce56e721
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-15 13:10:21 -04:00
Teravus Ovares (Dan Olivares)
8000812700
* part one of adding physics combining
2009-08-15 13:10:10 -04:00
Jeff Ames
1123a326ab
Formatting cleanup. Fix some compiler warnings.
2009-08-13 15:43:24 +09:00
