[simspark-cvs] simspark/spark/oxygen/physicsserver collider.cpp, 1.2.2.1, 1.2.2.1.2.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31418

Modified Files:
      Tag: projectx
	collider.cpp 
Log Message:
merge from HEAD


Index: collider.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/collider.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.1.2.1
diff -C2 -d -r1.2.2.1 -r1.2.2.1.2.1
*** collider.cpp	15 Feb 2007 21:00:18 -0000	1.2.2.1
--- collider.cpp	17 Jun 2007 08:14:43 -0000	1.2.2.1.2.1
***************
*** 68,72 ****
  
      // if we have a space add the geom to it
!     dSpaceID space = GetSpaceID();
      if (
          (space) &&
--- 68,72 ----
  
      // if we have a space add the geom to it
!     dSpaceID space = FindSpaceID();
      if (
          (space) &&
***************
*** 99,103 ****
  
      // remove collision geometry from space
!     dSpaceID space = GetSpaceID();
  
      if (
--- 99,103 ----
  
      // remove collision geometry from space
!     dSpaceID space = GetParentSpaceID();
  
      if (
***************
*** 109,119 ****
          }
  
!     if (
!         (space) &&
!         (dSpaceQuery(space, mODEGeom))
!         )
!         {
!             dSpaceRemove(space, mODEGeom);
!         }
  }
  
--- 109,116 ----
          }
  
!     if (space)
!     {
!         dSpaceRemove(space, mODEGeom);
!     }
  }
  
***************
*** 225,228 ****
--- 222,241 ----
  }
  
+ Vector3f Collider::GetPosition() const
+ {
+     const dReal* pos = dGeomGetPosition(mODEGeom);
+     return Vector3f(pos[0],pos[1],pos[2]);
+ }
+ 
+ dSpaceID Collider::GetParentSpaceID()
+ {
+     if (mODEGeom == 0)
+         {
+             return 0;
+         }
+ 
+     return dGeomGetSpace(mODEGeom);
+ }
+ 
  bool Collider::Intersects(boost::shared_ptr<Collider> collider)
  {