aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorRobert Adams2015-01-04 13:52:14 -0800
committerRobert Adams2015-01-04 13:52:14 -0800
commita617159f8b7aeb79cc484126f081f53e1b5f1627 (patch)
treefaaa755dc0ec95f77e00bf4d575b1a34c999d492 /OpenSim/Region/Physics
parentRemoving the Wifi config example from Robust.HG.ini.example, because it is no... (diff)
downloadopensim-SC_OLD-a617159f8b7aeb79cc484126f081f53e1b5f1627.zip
opensim-SC_OLD-a617159f8b7aeb79cc484126f081f53e1b5f1627.tar.gz
opensim-SC_OLD-a617159f8b7aeb79cc484126f081f53e1b5f1627.tar.bz2
opensim-SC_OLD-a617159f8b7aeb79cc484126f081f53e1b5f1627.tar.xz
BulletSim: correct some of the debugging input and output of PrimitiveBaseShape.
Whoever defined that structure was really into esoteric coding.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs6
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs6
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
953 float pathShearY = pbs.PathShearY < 128 ? (float)pbs.PathShearY * 0.01f : (float)(pbs.PathShearY - 256) * 0.01f; 953 float pathShearY = pbs.PathShearY < 128 ? (float)pbs.PathShearY * 0.01f : (float)(pbs.PathShearY - 256) * 0.01f;
954 float pathBegin = (float)pbs.PathBegin * 2.0e-5f; 954 float pathBegin = (float)pbs.PathBegin * 2.0e-5f;
955 float pathEnd = 1.0f - (float)pbs.PathEnd * 2.0e-5f; 955 float pathEnd = 1.0f - (float)pbs.PathEnd * 2.0e-5f;
956 float pathScaleX = (float)(pbs.PathScaleX - 100) * 0.01f; 956 float pathScaleX = (float)(200 - pbs.PathScaleX) * 0.01f;
957 float pathScaleY = (float)(pbs.PathScaleY - 100) * 0.01f; 957 float pathScaleY = (float)(200 - pbs.PathScaleY) * 0.01f;
958 float pathTaperX = pbs.PathTaperX * 0.01f;
959 float pathTaperY = pbs.PathTaperY * 0.01f;
958 960
959 float profileBegin = (float)pbs.ProfileBegin * 2.0e-5f; 961 float profileBegin = (float)pbs.ProfileBegin * 2.0e-5f;
960 float profileEnd = 1.0f - (float)pbs.ProfileEnd * 2.0e-5f; 962 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
135 pbs = PrimitiveBaseShape.CreateSphere(); 135 pbs = PrimitiveBaseShape.CreateSphere();
136 pbs.ProfileShape = (byte)ProfileShape.Circle; 136 pbs.ProfileShape = (byte)ProfileShape.Circle;
137 pbs.PathCurve = (byte)Extrusion.Curve1; 137 pbs.PathCurve = (byte)Extrusion.Curve1;
138 pbs.PathScaleX = 100; // default hollow info as set in the viewer
139 pbs.PathScaleY = 25;
138 pos = new Vector3(120.0f, 120.0f, 0f); 140 pos = new Vector3(120.0f, 120.0f, 0f);
139 pos.Z = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos) + 10f; 141 pos.Z = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos) + 10f;
140 ObjectInitPosition = pos; 142 ObjectInitPosition = pos;
@@ -182,8 +184,8 @@ public class HullCreation : OpenSimTestCase
182 prim.PhysScene.DetailLog("{0}, mesh, shapeInfo={1}", prim.Name, mShape.shapeInfo); 184 prim.PhysScene.DetailLog("{0}, mesh, shapeInfo={1}", prim.Name, mShape.shapeInfo);
183 break; 185 break;
184 case "OpenSim.Region.Physics.BulletSPlugin.BSShapeHull": 186 case "OpenSim.Region.Physics.BulletSPlugin.BSShapeHull":
185 // BSShapeHull hShape = physShape as BSShapeHull; 187 BSShapeHull hShape = physShape as BSShapeHull;
186 // prim.PhysScene.DetailLog("{0}, hull, shapeInfo={1}", prim.Name, hShape.shapeInfo); 188 prim.PhysScene.DetailLog("{0}, hull, shapeInfo={1}", prim.Name, hShape.shapeInfo);
187 break; 189 break;
188 case "OpenSim.Region.Physics.BulletSPlugin.BSShapeConvexHull": 190 case "OpenSim.Region.Physics.BulletSPlugin.BSShapeConvexHull":
189 BSShapeConvexHull chShape = physShape as BSShapeConvexHull; 191 BSShapeConvexHull chShape = physShape as BSShapeConvexHull;