Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31042
Modified Files:
Tag: projectx
collider.h
Log Message:
merge from HEAD
Index: collider.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/collider.h,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.h 15 Feb 2007 21:00:18 -0000 1.2.2.1
--- collider.h 17 Jun 2007 08:14:03 -0000 1.2.2.1.2.1
***************
*** 101,104 ****
--- 101,107 ----
virtual void SetPosition(const salt::Vector3f& pos);
+ /** returns the absolute position of the managed geom */
+ salt::Vector3f GetPosition() const;
+
/** sets the relative orientation of the managed geom directly. If
the geom is connected to a body, the orientation of the body
***************
*** 112,115 ****
--- 115,121 ----
bool Intersects(boost::shared_ptr<Collider> collider);
+ /** returns the ODE handle ID of the containing parent space */
+ virtual dSpaceID GetParentSpaceID();
+
protected:
/** registers the managed geom to the Space of the Scene and to
|
