[simspark-cvs] simspark/spark/oxygen/physicsserver odeobject.h, 1.1.2.2, 1.1.2.2.2.1

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

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

Modified Files:
      Tag: projectx
	odeobject.h 
Log Message:
merge from HEAD


Index: odeobject.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/odeobject.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -C2 -d -r1.1.2.2 -r1.1.2.2.2.1
*** odeobject.h	15 Feb 2007 20:59:41 -0000	1.1.2.2
--- odeobject.h	17 Jun 2007 08:10:15 -0000	1.1.2.2.2.1
***************
*** 51,56 ****
      dWorldID GetWorldID();
  
!     /** returns the ODE space handle */
!     dSpaceID GetSpaceID();
  
      /** destroy the managed ODE object */
--- 51,59 ----
      dWorldID GetWorldID();
  
!     /** returns the nearest parent space ODE handle */
!     dSpaceID FindSpaceID();
! 
!     /** returns the ODE handle ID of the containing parent space */
!     virtual dSpaceID GetParentSpaceID();
  
      /** destroy the managed ODE object */
***************
*** 61,65 ****
      boost::shared_ptr<World> GetWorld();
  
!     /** returns the space node */
      boost::shared_ptr<Space> GetSpace();
  
--- 64,68 ----
      boost::shared_ptr<World> GetWorld();
  
!     /** finds the nearest parent space node */
      boost::shared_ptr<Space> GetSpace();