From a617159f8b7aeb79cc484126f081f53e1b5f1627 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Sun, 4 Jan 2015 13:52:14 -0800 Subject: BulletSim: correct some of the debugging input and output of PrimitiveBaseShape. Whoever defined that structure was really into esoteric coding. --- OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 6 ++++-- OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 238fcc2..f8e8f57 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs @@ -953,8 +953,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters float pathShearY = pbs.PathShearY < 128 ? (float)pbs.PathShearY * 0.01f : (float)(pbs.PathShearY - 256) * 0.01f; float pathBegin = (float)pbs.PathBegin * 2.0e-5f; float pathEnd = 1.0f - (float)pbs.PathEnd * 2.0e-5f; - float pathScaleX = (float)(pbs.PathScaleX - 100) * 0.01f; - float pathScaleY = (float)(pbs.PathScaleY - 100) * 0.01f; + float pathScaleX = (float)(200 - pbs.PathScaleX) * 0.01f; + float pathScaleY = (float)(200 - pbs.PathScaleY) * 0.01f; + float pathTaperX = pbs.PathTaperX * 0.01f; + float pathTaperY = pbs.PathTaperY * 0.01f; float profileBegin = (float)pbs.ProfileBegin * 2.0e-5f; float profileEnd = 1.0f - (float)pbs.ProfileEnd * 2.0e-5f; diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs index 4bec062..608a6e6 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs @@ -135,6 +135,8 @@ public class HullCreation : OpenSimTestCase pbs = PrimitiveBaseShape.CreateSphere(); pbs.ProfileShape = (byte)ProfileShape.Circle; pbs.PathCurve = (byte)Extrusion.Curve1; + pbs.PathScaleX = 100; // default hollow info as set in the viewer + pbs.PathScaleY = 25; pos = new Vector3(120.0f, 120.0f, 0f); pos.Z = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos) + 10f; ObjectInitPosition = pos; @@ -182,8 +184,8 @@ public class HullCreation : OpenSimTestCase prim.PhysScene.DetailLog("{0}, mesh, shapeInfo={1}", prim.Name, mShape.shapeInfo); break; case "OpenSim.Region.Physics.BulletSPlugin.BSShapeHull": - // BSShapeHull hShape = physShape as BSShapeHull; - // prim.PhysScene.DetailLog("{0}, hull, shapeInfo={1}", prim.Name, hShape.shapeInfo); + BSShapeHull hShape = physShape as BSShapeHull; + prim.PhysScene.DetailLog("{0}, hull, shapeInfo={1}", prim.Name, hShape.shapeInfo); break; case "OpenSim.Region.Physics.BulletSPlugin.BSShapeConvexHull": BSShapeConvexHull chShape = physShape as BSShapeConvexHull; -- cgit v1.1 From d3a74894ab9af13d07876e4ecd4e31355c2bf1ee Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Sun, 4 Jan 2015 14:21:43 -0800 Subject: BulletSim: update BulletSim DLLs and SOs to remove chatty debug log messages. --- bin/lib32/BulletSim.dll | Bin 1337856 -> 1337344 bytes bin/lib32/libBulletSim.so | Bin 2310508 -> 2310500 bytes bin/lib64/BulletSim.dll | Bin 1546752 -> 1546240 bytes bin/lib64/libBulletSim.so | Bin 2473989 -> 2473981 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 7d60776..342ccdf 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 5c9255f..87ecf1d 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 fbfd76d..60b3a22 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 bd6b9a2..5959df0 100755 Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ -- cgit v1.1 From 103aad27f278c0e4c77021cf05c3ce74b2393217 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Sun, 4 Jan 2015 14:26:50 -0800 Subject: BulletSim: comment out the reference to BSShapeHull in BulletSim tests which seems to cause the tests to fail when compiled on the OpenSim build system. It compiles and runs everywhere else. More research is needed. --- OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs index 608a6e6..ed7ff9b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs @@ -184,8 +184,8 @@ public class HullCreation : OpenSimTestCase prim.PhysScene.DetailLog("{0}, mesh, shapeInfo={1}", prim.Name, mShape.shapeInfo); break; case "OpenSim.Region.Physics.BulletSPlugin.BSShapeHull": - BSShapeHull hShape = physShape as BSShapeHull; - prim.PhysScene.DetailLog("{0}, hull, shapeInfo={1}", prim.Name, hShape.shapeInfo); + // BSShapeHull hShape = physShape as BSShapeHull; + // prim.PhysScene.DetailLog("{0}, hull, shapeInfo={1}", prim.Name, hShape.shapeInfo); break; case "OpenSim.Region.Physics.BulletSPlugin.BSShapeConvexHull": BSShapeConvexHull chShape = physShape as BSShapeConvexHull; -- cgit v1.1 From 383a1a6fe1e4859250d690e8ecb0294001fd1430 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sun, 4 Jan 2015 18:52:37 -0500 Subject: Fix typo in OpenSim.ini.example --- bin/OpenSim.ini.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 343f83d..045fa88 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -49,7 +49,7 @@ ;# {PublicPort} {} {PublicPort} {8002} "8002" PublicPort = "8002" - ;# {PrivatePort} {} {PublicPort} {8003} "8003" + ;# {PrivatePort} {} {PrivatePort} {8003} "8003" PrivatePort = "8003" -- cgit v1.1