diff options
| author | KittoFlora | 2009-10-27 22:42:55 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-10-27 22:42:55 +0100 |
| commit | 1113b3b6ebba3e358326a7be90b338d8c95af688 (patch) | |
| tree | d923340600e5a2699ceaceeb52fd6c45994f334a /OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs | |
| parent | llRotLookAt Pt 2 (diff) | |
| parent | Merge branch 'master' into vehicles (diff) | |
| download | opensim-SC_OLD-1113b3b6ebba3e358326a7be90b338d8c95af688.zip opensim-SC_OLD-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.gz opensim-SC_OLD-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.bz2 opensim-SC_OLD-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.xz | |
Merge branch 'vehicles' into tests
Conflicts:
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs index cdd38c4..69e2d03 100644 --- a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs +++ b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs | |||
| @@ -76,8 +76,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 76 | public void CreateAndDropPhysicalCube() | 76 | public void CreateAndDropPhysicalCube() |
| 77 | { | 77 | { |
| 78 | PrimitiveBaseShape newcube = PrimitiveBaseShape.CreateBox(); | 78 | PrimitiveBaseShape newcube = PrimitiveBaseShape.CreateBox(); |
| 79 | PhysicsVector position = new PhysicsVector(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 128); | 79 | Vector3 position = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f), 128f); |
| 80 | PhysicsVector size = new PhysicsVector(0.5f, 0.5f, 0.5f); | 80 | Vector3 size = new Vector3(0.5f, 0.5f, 0.5f); |
| 81 | Quaternion rot = Quaternion.Identity; | 81 | Quaternion rot = Quaternion.Identity; |
| 82 | PhysicsActor prim = ps.AddPrimShape("CoolShape", newcube, position, size, rot, true); | 82 | PhysicsActor prim = ps.AddPrimShape("CoolShape", newcube, position, size, rot, true); |
| 83 | OdePrim oprim = (OdePrim)prim; | 83 | OdePrim oprim = (OdePrim)prim; |