aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs96
1 files changed, 48 insertions, 48 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index eafce5a..21e514b 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Runtime.InteropServices; 31using System.Runtime.InteropServices;
32using System.Threading; 32using System.Threading;
33using Axiom.Math;
34using log4net; 33using log4net;
34using OpenMetaverse;
35using Ode.NET; 35using Ode.NET;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Region.Physics.Manager; 37using OpenSim.Region.Physics.Manager;
@@ -294,10 +294,10 @@ namespace OpenSim.Region.Physics.OdePlugin
294 setMass(); 294 setMass();
295 d.BodySetPosition(Body, _position.X, _position.Y, _position.Z); 295 d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
296 d.Quaternion myrot = new d.Quaternion(); 296 d.Quaternion myrot = new d.Quaternion();
297 myrot.W = _orientation.w; 297 myrot.X = _orientation.X;
298 myrot.X = _orientation.x; 298 myrot.Y = _orientation.Y;
299 myrot.Y = _orientation.y; 299 myrot.Z = _orientation.Z;
300 myrot.Z = _orientation.z; 300 myrot.W = _orientation.W;
301 d.BodySetQuaternion(Body, ref myrot); 301 d.BodySetQuaternion(Body, ref myrot);
302 d.GeomSetBody(prim_geom, Body); 302 d.GeomSetBody(prim_geom, Body);
303 m_collisionCategories |= CollisionCategories.Body; 303 m_collisionCategories |= CollisionCategories.Body;
@@ -1021,10 +1021,10 @@ namespace OpenSim.Region.Physics.OdePlugin
1021 { 1021 {
1022 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1022 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1023 d.Quaternion myrot = new d.Quaternion(); 1023 d.Quaternion myrot = new d.Quaternion();
1024 myrot.W = _orientation.w; 1024 myrot.X = _orientation.X;
1025 myrot.X = _orientation.x; 1025 myrot.Y = _orientation.Y;
1026 myrot.Y = _orientation.y; 1026 myrot.Z = _orientation.Z;
1027 myrot.Z = _orientation.z; 1027 myrot.W = _orientation.W;
1028 d.GeomSetQuaternion(prim_geom, ref myrot); 1028 d.GeomSetQuaternion(prim_geom, ref myrot);
1029 } 1029 }
1030 1030
@@ -1220,10 +1220,10 @@ namespace OpenSim.Region.Physics.OdePlugin
1220 public void rotate(float timestep) 1220 public void rotate(float timestep)
1221 { 1221 {
1222 d.Quaternion myrot = new d.Quaternion(); 1222 d.Quaternion myrot = new d.Quaternion();
1223 myrot.W = _orientation.w; 1223 myrot.X = _orientation.X;
1224 myrot.X = _orientation.x; 1224 myrot.Y = _orientation.Y;
1225 myrot.Y = _orientation.y; 1225 myrot.Z = _orientation.Z;
1226 myrot.Z = _orientation.z; 1226 myrot.W = _orientation.W;
1227 d.GeomSetQuaternion(prim_geom, ref myrot); 1227 d.GeomSetQuaternion(prim_geom, ref myrot);
1228 if (m_isphysical && Body != (IntPtr) 0) 1228 if (m_isphysical && Body != (IntPtr) 0)
1229 { 1229 {
@@ -1339,10 +1339,10 @@ namespace OpenSim.Region.Physics.OdePlugin
1339 setMesh(_parent_scene, mesh); 1339 setMesh(_parent_scene, mesh);
1340 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1340 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1341 d.Quaternion myrot = new d.Quaternion(); 1341 d.Quaternion myrot = new d.Quaternion();
1342 myrot.W = _orientation.w; 1342 myrot.X = _orientation.X;
1343 myrot.X = _orientation.x; 1343 myrot.Y = _orientation.Y;
1344 myrot.Y = _orientation.y; 1344 myrot.Z = _orientation.Z;
1345 myrot.Z = _orientation.z; 1345 myrot.W = _orientation.W;
1346 d.GeomSetQuaternion(prim_geom, ref myrot); 1346 d.GeomSetQuaternion(prim_geom, ref myrot);
1347 1347
1348 //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z); 1348 //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
@@ -1388,10 +1388,10 @@ namespace OpenSim.Region.Physics.OdePlugin
1388 //prim_geom = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z); 1388 //prim_geom = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z);
1389 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1389 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1390 d.Quaternion myrot = new d.Quaternion(); 1390 d.Quaternion myrot = new d.Quaternion();
1391 myrot.W = _orientation.w; 1391 myrot.X = _orientation.X;
1392 myrot.X = _orientation.x; 1392 myrot.Y = _orientation.Y;
1393 myrot.Y = _orientation.y; 1393 myrot.Z = _orientation.Z;
1394 myrot.Z = _orientation.z; 1394 myrot.W = _orientation.W;
1395 d.GeomSetQuaternion(prim_geom, ref myrot); 1395 d.GeomSetQuaternion(prim_geom, ref myrot);
1396 } 1396 }
1397 } 1397 }
@@ -1452,9 +1452,9 @@ namespace OpenSim.Region.Physics.OdePlugin
1452 // d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1452 // d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1453 // d.Quaternion myrot = new d.Quaternion(); 1453 // d.Quaternion myrot = new d.Quaternion();
1454 // myrot.W = _orientation.w; 1454 // myrot.W = _orientation.w;
1455 // myrot.X = _orientation.x; 1455 // myrot.X = _orientation.X;
1456 // myrot.Y = _orientation.y; 1456 // myrot.Y = _orientation.Y;
1457 // myrot.Z = _orientation.z; 1457 // myrot.Z = _orientation.Z;
1458 // d.GeomSetQuaternion(prim_geom, ref myrot); 1458 // d.GeomSetQuaternion(prim_geom, ref myrot);
1459 1459
1460 // //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z); 1460 // //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
@@ -1512,9 +1512,9 @@ namespace OpenSim.Region.Physics.OdePlugin
1512 // d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1512 // d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1513 // d.Quaternion myrot = new d.Quaternion(); 1513 // d.Quaternion myrot = new d.Quaternion();
1514 // myrot.W = _orientation.w; 1514 // myrot.W = _orientation.w;
1515 // myrot.X = _orientation.x; 1515 // myrot.X = _orientation.X;
1516 // myrot.Y = _orientation.y; 1516 // myrot.Y = _orientation.Y;
1517 // myrot.Z = _orientation.z; 1517 // myrot.Z = _orientation.Z;
1518 // d.GeomSetQuaternion(prim_geom, ref myrot); 1518 // d.GeomSetQuaternion(prim_geom, ref myrot);
1519 // } 1519 // }
1520 // } 1520 // }
@@ -1553,9 +1553,9 @@ namespace OpenSim.Region.Physics.OdePlugin
1553 // d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1553 // d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1554 // d.Quaternion myrot = new d.Quaternion(); 1554 // d.Quaternion myrot = new d.Quaternion();
1555 // myrot.W = _orientation.w; 1555 // myrot.W = _orientation.w;
1556 // myrot.X = _orientation.x; 1556 // myrot.X = _orientation.X;
1557 // myrot.Y = _orientation.y; 1557 // myrot.Y = _orientation.Y;
1558 // myrot.Z = _orientation.z; 1558 // myrot.Z = _orientation.Z;
1559 // d.GeomSetQuaternion(prim_geom, ref myrot); 1559 // d.GeomSetQuaternion(prim_geom, ref myrot);
1560 1560
1561 // //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z); 1561 // //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
@@ -1626,10 +1626,10 @@ namespace OpenSim.Region.Physics.OdePlugin
1626 setMesh(_parent_scene, mesh); 1626 setMesh(_parent_scene, mesh);
1627 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1627 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1628 d.Quaternion myrot = new d.Quaternion(); 1628 d.Quaternion myrot = new d.Quaternion();
1629 myrot.W = _orientation.w; 1629 myrot.X = _orientation.X;
1630 myrot.X = _orientation.x; 1630 myrot.Y = _orientation.Y;
1631 myrot.Y = _orientation.y; 1631 myrot.Z = _orientation.Z;
1632 myrot.Z = _orientation.z; 1632 myrot.W = _orientation.W;
1633 d.GeomSetQuaternion(prim_geom, ref myrot); 1633 d.GeomSetQuaternion(prim_geom, ref myrot);
1634 1634
1635 //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z); 1635 //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
@@ -1684,10 +1684,10 @@ namespace OpenSim.Region.Physics.OdePlugin
1684 //prim_geom = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z); 1684 //prim_geom = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z);
1685 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1685 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1686 d.Quaternion myrot = new d.Quaternion(); 1686 d.Quaternion myrot = new d.Quaternion();
1687 myrot.W = _orientation.w; 1687 myrot.X = _orientation.X;
1688 myrot.X = _orientation.x; 1688 myrot.Y = _orientation.Y;
1689 myrot.Y = _orientation.y; 1689 myrot.Z = _orientation.Z;
1690 myrot.Z = _orientation.z; 1690 myrot.W = _orientation.W;
1691 d.GeomSetQuaternion(prim_geom, ref myrot); 1691 d.GeomSetQuaternion(prim_geom, ref myrot);
1692 } 1692 }
1693 } 1693 }
@@ -1726,9 +1726,9 @@ namespace OpenSim.Region.Physics.OdePlugin
1726 // d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1726 // d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1727 // d.Quaternion myrot = new d.Quaternion(); 1727 // d.Quaternion myrot = new d.Quaternion();
1728 // myrot.W = _orientation.w; 1728 // myrot.W = _orientation.w;
1729 // myrot.X = _orientation.x; 1729 // myrot.X = _orientation.X;
1730 // myrot.Y = _orientation.y; 1730 // myrot.Y = _orientation.Y;
1731 // myrot.Z = _orientation.z; 1731 // myrot.Z = _orientation.Z;
1732 // d.GeomSetQuaternion(prim_geom, ref myrot); 1732 // d.GeomSetQuaternion(prim_geom, ref myrot);
1733 1733
1734 // //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z); 1734 // //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
@@ -2106,9 +2106,9 @@ namespace OpenSim.Region.Physics.OdePlugin
2106 _acceleration.Z = 0; 2106 _acceleration.Z = 0;
2107 2107
2108 //_orientation.w = 0f; 2108 //_orientation.w = 0f;
2109 //_orientation.x = 0f; 2109 //_orientation.X = 0f;
2110 //_orientation.y = 0f; 2110 //_orientation.Y = 0f;
2111 //_orientation.z = 0f; 2111 //_orientation.Z = 0f;
2112 m_rotationalVelocity.X = 0; 2112 m_rotationalVelocity.X = 0;
2113 m_rotationalVelocity.Y = 0; 2113 m_rotationalVelocity.Y = 0;
2114 m_rotationalVelocity.Z = 0; 2114 m_rotationalVelocity.Z = 0;
@@ -2154,10 +2154,10 @@ namespace OpenSim.Region.Physics.OdePlugin
2154 } 2154 }
2155 2155
2156 //System.Console.WriteLine("ODE: " + m_rotationalVelocity.ToString()); 2156 //System.Console.WriteLine("ODE: " + m_rotationalVelocity.ToString());
2157 _orientation.w = ori.W; 2157 _orientation.X = ori.X;
2158 _orientation.x = ori.X; 2158 _orientation.Y = ori.Y;
2159 _orientation.y = ori.Y; 2159 _orientation.Z = ori.Z;
2160 _orientation.z = ori.Z; 2160 _orientation.W = ori.W;
2161 m_lastUpdateSent = false; 2161 m_lastUpdateSent = false;
2162 if (!m_throttleUpdates || throttleCounter > _parent_scene.geomUpdatesPerThrottledUpdate) 2162 if (!m_throttleUpdates || throttleCounter > _parent_scene.geomUpdatesPerThrottledUpdate)
2163 { 2163 {
generated by cgit v1.1 at 2024-07-08 16:20:26 +0000