[simspark-cvs] simspark/spark/oxygen/physicsserver space.h, 1.1.2.1, 1.1.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-serv29666

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


Index: space.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/space.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -C2 -d -r1.1.2.1 -r1.1.2.1.2.1
*** space.h	15 Feb 2007 21:00:19 -0000	1.1.2.1
--- space.h	17 Jun 2007 08:08:21 -0000	1.1.2.1.2.1
***************
*** 59,72 ****
      void Collide();
  
      /** callback to handle a potential collision between two contained
          geoms. It will look up and notify the corresponding colliders
          for a potential collision.
      */
!     virtual void HandleCollide(dGeomID obj1, dGeomID obj2);
  
!     /** destroy the managed ODE object */
!     virtual void DestroyODEObject();
  
- protected:
      /** creates them managed ODE space and a contact joint group */
      virtual bool ConstructInternal();
--- 59,88 ----
      void Collide();
  
+     /** destroy the managed ODE object */
+     virtual void DestroyODEObject();
+ 
+     /** returns the ODE handle ID of the containing parent space */
+     virtual dSpaceID GetParentSpaceID();
+ 
+     /** returns true if this is the top global, i.e. top level space object */
+     bool IsGlobalSpace();
+ 
+ protected:
+     static void collisionNearCallback (void *data, dGeomID obj1, dGeomID obj2);
+ 
+     /** registers the managed space to the containing parent space */
+     virtual void OnLink();
+ 
      /** callback to handle a potential collision between two contained
          geoms. It will look up and notify the corresponding colliders
          for a potential collision.
      */
!     void HandleCollide(dGeomID obj1, dGeomID obj2);
  
!     /** handle the collision between two geoms from which at least one
!         is a space geom
!     */
!     void HandleSpaceCollide(dGeomID obj1, dGeomID obj2);
  
      /** creates them managed ODE space and a contact joint group */
      virtual bool ConstructInternal();