From 66a5b4d1205058cb66a7dc2d02f52a93175bcc57 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 21 Jul 2017 14:11:03 +0100 Subject: ubOde suport convex shapes on all normal prims and sculpts. Since code is experimental this is controled by options ConvexPrims and ConvexSculpts, on section Mesh, that can be set to false in case of problems --- bin/OpenSimDefaults.ini | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a7b9213..a94311a 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -935,18 +935,35 @@ [Mesh] - ; enable / disable Collada mesh support + ; enable / disable mesh asset uploads + ; mesh asset must conform to standard mesh format, with OpenSim extensions ; default is true AllowMeshUpload = true - ; if you use Meshmerizer and want collisions for meshies, setting this to true - ; will cause OpenSim to attempt to decode meshies assets, extract the physics - ; mesh, and use it for collisions. - UseMeshiesPhysicsMesh = true - ; Minimum user level required to upload meshes ;LevelUpload = 0 + ; suport meshs on physics + ;UseMeshiesPhysicsMesh = true + + ;suport convex shape type on normal prims + ; (ubOde only) + ;ConvexPrims = true + + ;suport convex shape type on sculpts + ; (ubOde only) + ;ConvexSculpts = true + + ; mesh cache settings: + ; (ubOde only) + ; do cache (keep true) + ;MeshFileCache = true + ; cache folder name relative to bin/ or absolute path + ;MeshFileCachePath = MeshCache + ;MeshFileCacheDoExpire = true; + ;MeshFileCacheExpireHours = 48 + + [Textures] ; If true, textures generated dynamically (i.e. through osSetDynamicTextureData() and similar OSSL functions) are reused where possible @@ -968,7 +985,7 @@ [ODEPhysicsSettings] ; ## - ; ## Physics stats settings + ; ## Physics stats settings ( most ignored by ubOde ) ; ; If collect_stats is enabled, then extra stat information is collected which is accessible via the MonitorModule -- cgit v1.1 From f6f0b1c51387acc89b0cd3d854cc65f94afa3897 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 21 Jul 2017 14:41:13 +0100 Subject: fix a few EN typos --- bin/OpenSimDefaults.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a94311a..9fb74dc 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -943,14 +943,14 @@ ; Minimum user level required to upload meshes ;LevelUpload = 0 - ; suport meshs on physics + ; support meshs on physics ;UseMeshiesPhysicsMesh = true - ;suport convex shape type on normal prims + ;support convex shape type on normal prims ; (ubOde only) ;ConvexPrims = true - ;suport convex shape type on sculpts + ;support convex shape type on sculpts ; (ubOde only) ;ConvexSculpts = true @@ -1472,7 +1472,7 @@ ; active_trees allows module to change its trees in time. ; some will be deleted, others created and rest may grow - ; default is false. You can change it with console comand tree active true | false later + ; default is false. You can change it with console command tree active true | false later active_trees = false ; the trees change execution time rate (in ms) update_rate = 1000 @@ -2064,7 +2064,7 @@ ;XmlRpcServiceWriteKey = 1234 ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests, - ; only set to false it if you absolute sure regions and groups server suport it. + ; only set to false it if you absolute sure regions and groups server support it. ; XmlRpcDisableKeepAlive = true ; Minimum user level required to create groups -- cgit v1.1 From 93582523a739262ae3e7b459703db90b0a4214e4 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 22 Jul 2017 01:44:29 +0100 Subject: ubOde: make option MinSizeToMeshmerize visible in OpenSimDefaults.ini --- bin/OpenSimDefaults.ini | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 9fb74dc..164eae6 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1158,12 +1158,14 @@ ; ## additional meshing options ; ## - ; Physical collision mesh proxies are normally created for complex prim shapes, - ; and collisions for simple boxes and spheres are computed algorithmically. - ; If you would rather have mesh proxies for simple prims, you can set this to - ; true. Note that this will increase memory usage and region startup time. - ; Default is false. - ;force_simple_prim_meshing = false + ; Physics needs to create internal meshs (or convert the object meshs or scultps) + ; for all prims except simple boxes and spheres. + + ; collisions of small objects againts larger ones can have a increased CPU load cost + ; so this are represented by a simple BOX + ; if all their scale dimensions are lower or equal to this option. Default is 0.1m + ; (ubOde only) + ; MinSizeToMeshmerize = 0.1 [BulletSim] -- cgit v1.1 From 324bda8ab96f4c6b17c221ea73842ca599270c00 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 27 Jul 2017 16:23:08 +0100 Subject: mantis 8218 make Meshmerizer UseMeshiesPhysicsMesh defualt to true, to match stated on ini files. --- bin/OpenSimDefaults.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 164eae6..3747fcf 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -943,7 +943,7 @@ ; Minimum user level required to upload meshes ;LevelUpload = 0 - ; support meshs on physics + ; support meshes on physics ;UseMeshiesPhysicsMesh = true ;support convex shape type on normal prims -- cgit v1.1 From 169a50286bfd113e29623ab6ed88ca66acb842bf Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 29 Jul 2017 00:08:40 +0100 Subject: upload ODE lib for linux. Plz keep previus version in case something goes wrong. Thanks jakdaniels for the compilation --- bin/lib32/libode.so | Bin 4401180 -> 4386269 bytes bin/lib64/libode-x86_64.so | Bin 5802413 -> 5813749 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/lib32/libode.so b/bin/lib32/libode.so index 47991ae..35cb027 100755 Binary files a/bin/lib32/libode.so and b/bin/lib32/libode.so differ diff --git a/bin/lib64/libode-x86_64.so b/bin/lib64/libode-x86_64.so index 17502c5..663ff5d 100755 Binary files a/bin/lib64/libode-x86_64.so and b/bin/lib64/libode-x86_64.so differ -- cgit v1.1 From e9b79719291567b92a9d5111b5939df20137469c Mon Sep 17 00:00:00 2001 From: Kevin Cozens Date: Sat, 5 Aug 2017 14:52:56 -0400 Subject: Remove profile from basic configuration --- bin/config-include/GridHypergrid.ini | 3 --- 1 file changed, 3 deletions(-) (limited to 'bin') diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 68f2eb1..709c462 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -36,9 +36,6 @@ SimulationServiceInConnector = true LibraryModule = true -[Profile] - Module = "BasicProfileModule" - [SimulationDataStore] LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService" -- cgit v1.1 From 2afd158b1de8668fe9bf1db46b885fd954c61a24 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Wed, 9 Aug 2017 13:43:44 -0700 Subject: Update BulletSim with Bullet V2.86. Should be no functional changes. --- bin/lib32/BulletSim.dll | Bin 1338880 -> 1483776 bytes bin/lib32/libBulletSim.so | Bin 2312132 -> 2367998 bytes bin/lib64/BulletSim.dll | Bin 1547264 -> 1651712 bytes bin/lib64/libBulletSim.so | Bin 2475617 -> 2535591 bytes 4 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 6d006bf..71e1b16 100755 Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index ec29f58..b623929 100755 Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 82774a2..85834b0 100755 Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index 8b09275..d78fd58 100755 Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ -- cgit v1.1 From 76c29cb106b54bcb8a4c6bdb6f37a80676b17892 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Mon, 14 Aug 2017 18:46:16 -0700 Subject: Update BulletSim with corrected collision computations. A fix for Mantis 8010. --- bin/lib32/BulletSim.dll | Bin 1483776 -> 1483776 bytes bin/lib32/libBulletSim.so | Bin 2367998 -> 2368603 bytes bin/lib64/BulletSim.dll | Bin 1651712 -> 1651712 bytes bin/lib64/libBulletSim.so | Bin 2535591 -> 2536668 bytes 4 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 71e1b16..5c3ccd0 100755 Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index b623929..97dd73c 100755 Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 85834b0..eea1020 100755 Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index d78fd58..3987835 100755 Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ -- cgit v1.1 From bf84e46c59a91e48b39c8d78a2c244acae33829d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 15 Aug 2017 16:01:56 +0100 Subject: update libode for MAC, thanks again Gavin Hird --- bin/lib32/libode.dylib | Bin 2632228 -> 2490468 bytes bin/lib64/libode.dylib | Bin 2632228 -> 2490468 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/lib32/libode.dylib b/bin/lib32/libode.dylib index fa3c070..49e205e 100755 Binary files a/bin/lib32/libode.dylib and b/bin/lib32/libode.dylib differ diff --git a/bin/lib64/libode.dylib b/bin/lib64/libode.dylib index fa3c070..49e205e 100755 Binary files a/bin/lib64/libode.dylib and b/bin/lib64/libode.dylib differ -- cgit v1.1