[simspark-svn] SF.net SVN: simspark:[108] branches/multiphys/spark/lib/oxygen

[<a-...@us...>]

Revision: 108
          http://simspark.svn.sourceforge.net/simspark/?rev=108&view=rev
Author:   a-held
Date:     2009-11-25 10:20:10 +0000 (Wed, 25 Nov 2009)

Log Message:
-----------
improved way for including files
removed some unneeded class declarations in some header files
completed the new inheritance tree

Modified Paths:
--------------
    branches/multiphys/spark/lib/oxygen/CMakeLists.txt
    branches/multiphys/spark/lib/oxygen/oxygen.cpp
    branches/multiphys/spark/lib/oxygen/oxygen.h
    branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.h
    branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/balljoint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/body.h
    branches/multiphys/spark/lib/oxygen/physicsserver/bodycontroller_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/collider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/collider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/collisionhandler.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/collisionhandler_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.h
    branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/dragcontroller_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/joint.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/joint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.h
    branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/planecollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/raycollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/recorderhandler.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/recorderhandler.h
    branches/multiphys/spark/lib/oxygen/physicsserver/recorderhandler_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/space.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/velocitycontroller_c.cpp

Added Paths:
-----------
    branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h
    branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h
    branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/softbody.h
    branches/multiphys/spark/lib/oxygen/physicsserver/softbody_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.h
    branches/multiphys/spark/lib/oxygen/physicsserver/staticbody_c.cpp

Modified: branches/multiphys/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- branches/multiphys/spark/lib/oxygen/CMakeLists.txt	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/CMakeLists.txt	2009-11-25 10:20:10 UTC (rev 108)
@@ -17,12 +17,21 @@
     physicsserver/physicsobject.h
     physicsserver/body.h
     physicsserver/rigidbody.h
+    physicsserver/staticbody.h
+    physicsserver/dynamicbody.h
+    physicsserver/softbody.h
     physicsserver/bodycontroller.h
     physicsserver/boxcollider.h
     physicsserver/ccylindercollider.h
+    physicsserver/cylindercollider.h
     physicsserver/collider.h
+    physicsserver/compoundcollider.h
+    physicsserver/concavecollider.h
+    physicsserver/conecollider.h
+    physicsserver/convexcollider.h
     physicsserver/collisionhandler.h
     physicsserver/contactjointhandler.h
+    physicsserver/emptycollider.h
     physicsserver/physicsserver.h
     physicsserver/planecollider.h
     physicsserver/raycollider.h
@@ -34,7 +43,9 @@
     physicsserver/dragcontroller.h
     physicsserver/velocitycontroller.h
     physicsserver/joint.h
+    physicsserver/generic6dofjoint.h
     physicsserver/balljoint.h
+    physicsserver/conetwistjoint.h
     physicsserver/hingejoint.h
     physicsserver/fixedjoint.h
     physicsserver/sliderjoint.h
@@ -113,6 +124,9 @@
     physicsserver/body_c.cpp
     physicsserver/rigidbody.cpp
     physicsserver/rigidbody_c.cpp
+    physicsserver/staticbody_c.cpp
+    physicsserver/dynamicbody_c.cpp
+    physicsserver/softbody_c.cpp
     physicsserver/bodycontroller.cpp
     physicsserver/bodycontroller_c.cpp
     physicsserver/transformcollider.cpp
@@ -121,12 +135,18 @@
     physicsserver/boxcollider_c.cpp
     physicsserver/ccylindercollider.cpp
     physicsserver/ccylindercollider_c.cpp
+    physicsserver/cylindercollider_c.cpp
     physicsserver/collider.cpp
     physicsserver/collider_c.cpp
+    physicsserver/compoundcollider_c.cpp
+    physicsserver/concavecollider_c.cpp
+    physicsserver/conecollider_c.cpp
+    physicsserver/convexcollider_c.cpp
     physicsserver/collisionhandler.cpp
     physicsserver/collisionhandler_c.cpp
     physicsserver/contactjointhandler.cpp
     physicsserver/contactjointhandler_c.cpp
+    physicsserver/emptycollider_c.cpp
     physicsserver/physicsserver.cpp
     physicsserver/physicsserver_c.cpp
     physicsserver/planecollider.cpp
@@ -147,8 +167,10 @@
     physicsserver/velocitycontroller_c.cpp
     physicsserver/joint.cpp
     physicsserver/joint_c.cpp
+    physicsserver/generic6dofjoint_c.cpp
     physicsserver/balljoint.cpp
     physicsserver/balljoint_c.cpp
+    physicsserver/conetwistjoint_c.cpp
     physicsserver/hingejoint.cpp
     physicsserver/hingejoint_c.cpp
     physicsserver/fixedjoint.cpp

Modified: branches/multiphys/spark/lib/oxygen/oxygen.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/oxygen.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/oxygen.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "oxygen.h"
+#include <oxygen/oxygen.h>
 
 using namespace oxygen;
 using namespace zeitgeist;
@@ -56,13 +56,18 @@
     zg.GetCore()->RegisterClassObject(new CLASS(PhysicsObject), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(Body), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(RigidBody), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(StaticBody), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(DynamicBody), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(SoftBody), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(BodyController), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(DragController), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(VelocityController), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(Space), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(World), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(Joint), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(Generic6DOFJoint), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(BallJoint), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(ConeTwistJoint), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(HingeJoint), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(FixedJoint), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(SliderJoint), "oxygen/");
@@ -71,9 +76,15 @@
 
     // collider
     zg.GetCore()->RegisterClassObject(new CLASS(Collider), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(CompoundCollider), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(ConcaveCollider), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(ConeCollider), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(ConvexCollider), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(EmptyCollider), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(TransformCollider), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(BoxCollider), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(CCylinderCollider), "oxygen/");
+    zg.GetCore()->RegisterClassObject(new CLASS(CylinderCollider), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(PlaneCollider), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(RayCollider), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(SphereCollider), "oxygen/");

Modified: branches/multiphys/spark/lib/oxygen/oxygen.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/oxygen.h	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/oxygen.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -22,78 +22,89 @@
 #ifndef OXYGEN_OXYGEN_H
 #define OXYGEN_OXYGEN_H
 
-#include "oxygen_defines.h"
-#include "agentaspect/agentaspect.h"
-#include "agentaspect/effector.h"
-#include "agentaspect/perceptor.h"
+#include <oxygen/oxygen_defines.h>
+#include <oxygen/agentaspect/agentaspect.h>
+#include <oxygen/agentaspect/effector.h>
+#include <oxygen/agentaspect/perceptor.h>
 
-#include "controlaspect/controlaspect.h"
+#include <oxygen/controlaspect/controlaspect.h>
 
-#include "gamecontrolserver/baseparser.h"
-#include "gamecontrolserver/gamecontrolserver.h"
-#include "gamecontrolserver/actionobject.h"
-#include "gamecontrolserver/behavior.h"
+#include <oxygen/gamecontrolserver/baseparser.h>
+#include <oxygen/gamecontrolserver/gamecontrolserver.h>
+#include <oxygen/gamecontrolserver/actionobject.h>
+#include <oxygen/gamecontrolserver/behavior.h>
 
 //abstract physics classes
 #include <oxygen/physicsserver/physicsobject.h>
-#include "physicsserver/body.h"
-#include "physicsserver/rigidbody.h"
-#include "physicsserver/bodycontroller.h"
-#include "physicsserver/dragcontroller.h"
-#include "physicsserver/velocitycontroller.h"
-#include "physicsserver/transformcollider.h"
-#include "physicsserver/boxcollider.h"
-#include "physicsserver/ccylindercollider.h"
-#include "physicsserver/collider.h"
-#include "physicsserver/physicsserver.h"
-#include "physicsserver/planecollider.h"
-#include "physicsserver/raycollider.h"
-#include "physicsserver/space.h"
-#include "physicsserver/spherecollider.h"
-#include "physicsserver/world.h"
-#include "physicsserver/collisionhandler.h"
-#include "physicsserver/contactjointhandler.h"
-#include "physicsserver/recorderhandler.h"
-#include "physicsserver/joint.h"
-#include "physicsserver/balljoint.h"
-#include "physicsserver/hingejoint.h"
-#include "physicsserver/fixedjoint.h"
-#include "physicsserver/sliderjoint.h"
-#include "physicsserver/universaljoint.h"
-#include "physicsserver/hinge2joint.h"
+#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
+#include <oxygen/physicsserver/staticbody.h>
+#include <oxygen/physicsserver/dynamicbody.h>
+#include <oxygen/physicsserver/softbody.h>
+#include <oxygen/physicsserver/bodycontroller.h>
+#include <oxygen/physicsserver/dragcontroller.h>
+#include <oxygen/physicsserver/velocitycontroller.h>
+#include <oxygen/physicsserver/transformcollider.h>
+#include <oxygen/physicsserver/boxcollider.h>
+#include <oxygen/physicsserver/ccylindercollider.h>
+#include <oxygen/physicsserver/cylindercollider.h>
+#include <oxygen/physicsserver/collider.h>
+#include <oxygen/physicsserver/compoundcollider.h>
+#include <oxygen/physicsserver/concavecollider.h>
+#include <oxygen/physicsserver/conecollider.h>
+#include <oxygen/physicsserver/convexcollider.h>
+#include <oxygen/physicsserver/emptycollider.h>
+#include <oxygen/physicsserver/physicsserver.h>
+#include <oxygen/physicsserver/planecollider.h>
+#include <oxygen/physicsserver/raycollider.h>
+#include <oxygen/physicsserver/space.h>
+#include <oxygen/physicsserver/spherecollider.h>
+#include <oxygen/physicsserver/world.h>
+#include <oxygen/physicsserver/collisionhandler.h>
+#include <oxygen/physicsserver/contactjointhandler.h>
+#include <oxygen/physicsserver/recorderhandler.h>
+#include <oxygen/physicsserver/joint.h>
+#include <oxygen/physicsserver/generic6dofjoint.h>
+#include <oxygen/physicsserver/balljoint.h>
+#include <oxygen/physicsserver/conetwistjoint.h>
+#include <oxygen/physicsserver/hingejoint.h>
+#include <oxygen/physicsserver/fixedjoint.h>
+#include <oxygen/physicsserver/sliderjoint.h>
+#include <oxygen/physicsserver/universaljoint.h>
+#include <oxygen/physicsserver/hinge2joint.h>
 
-#include "sceneserver/basenode.h"
-#include "sceneserver/camera.h"
-#include "sceneserver/fpscontroller.h"
-#include "sceneserver/scene.h"
-#include "sceneserver/sceneserver.h"
-#include "sceneserver/transform.h"
-#include "sceneserver/sceneimporter.h"
+#include <oxygen/sceneserver/basenode.h>
+#include <oxygen/sceneserver/camera.h>
+#include <oxygen/sceneserver/fpscontroller.h>
+#include <oxygen/sceneserver/scene.h>
+#include <oxygen/sceneserver/sceneserver.h>
+#include <oxygen/sceneserver/transform.h>
+#include <oxygen/sceneserver/sceneimporter.h>
 
-#include "simulationserver/simulationserver.h"
-#include "simulationserver/simcontrolnode.h"
-#include "simulationserver/netcontrol.h"
-#include "simulationserver/netmessage.h"
-#include "simulationserver/agentcontrol.h"
-#include "simulationserver/monitorcontrol.h"
-#include "simulationserver/monitorlogger.h"
-#include "simulationserver/traincontrol.h"
+#include <oxygen/simulationserver/simulationserver.h>
+#include <oxygen/simulationserver/simcontrolnode.h>
+#include <oxygen/simulationserver/netcontrol.h>
+#include <oxygen/simulationserver/netmessage.h>
+#include <oxygen/simulationserver/agentcontrol.h>
+#include <oxygen/simulationserver/monitorcontrol.h>
+#include <oxygen/simulationserver/monitorlogger.h>
+#include <oxygen/simulationserver/traincontrol.h>
 
-#include "geometryserver/geometryserver.h"
-#include "geometryserver/meshexporter.h"
-#include "geometryserver/meshimporter.h"
-#include "geometryserver/stdmeshimporter.h"
+#include <oxygen/geometryserver/geometryserver.h>
+#include <oxygen/geometryserver/meshexporter.h>
+#include <oxygen/geometryserver/meshimporter.h>
+#include <oxygen/geometryserver/stdmeshimporter.h>
 
 #ifdef HAVE_SPADES_HEADERS
-#include "spadesserver/spadesserver.h"
-#include "spadesserver/paramreader.h"
+#include <oxygen/spadesserver/spadesserver.h>
+#include <oxygen/spadesserver/paramreader.h>
 #endif
 
-#include "monitorserver/monitorserver.h"
-#include "monitorserver/monitorsystem.h"
-#include "monitorserver/custommonitor.h"
-#include "monitorserver/monitoritem.h"
-#include "monitorserver/monitorcmdparser.h"
+#include <oxygen/monitorserver/monitorserver.h>
+#include <oxygen/monitorserver/monitorsystem.h>
+#include <oxygen/monitorserver/custommonitor.h>
+#include <oxygen/monitorserver/monitoritem.h>
+#include <oxygen/monitorserver/monitorcmdparser.h>
 
 // control aspect
 #include <zeitgeist/zeitgeist.h>

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "angularmotor.h"
+#include <oxygen/physicsserver/angularmotor.h>
 #include <zeitgeist/logserver/logserver.h>
 
 using namespace oxygen;

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.h	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -25,7 +25,6 @@
 
 namespace oxygen
 {
-class RigidBody;
 
 /** An angular motor allows the relative angular velocities of two
     bodies to be controlled. The angular velocity can be controlled on

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor_c.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "angularmotor.h"
+#include <oxygen/physicsserver/angularmotor.h>
 
 using namespace boost;
 using namespace oxygen;

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -17,13 +17,13 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "balljoint.h"
+#include <oxygen/physicsserver/balljoint.h>
 
 using namespace oxygen;
 using namespace boost;
 using namespace salt;
 
-BallJoint::BallJoint() : Joint()
+BallJoint::BallJoint() : Generic6DOFJoint()
 {
 }
 

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.h	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -21,13 +21,12 @@
 #define OXYGEN_BALLJOINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include "joint.h"
+#include <oxygen/physicsserver/generic6dofjoint.h>
 
 namespace oxygen
 {
-class RigidBody;
 
-class OXYGEN_API BallJoint : public Joint
+class OXYGEN_API BallJoint : public Generic6DOFJoint
 {
 public:
     BallJoint();

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/balljoint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/balljoint_c.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/balljoint_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "balljoint.h"
+#include <oxygen/physicsserver/balljoint.h>
 
 using namespace boost;
 using namespace oxygen;
@@ -44,6 +44,6 @@
 
 void CLASS(BallJoint)::DefineClass()
 {
-    DEFINE_BASECLASS(oxygen/Joint);
+    DEFINE_BASECLASS(oxygen/Generic6DOFJoint);
     DEFINE_FUNCTION(setAnchor);
 }

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/body.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/body.h	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/body.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -26,6 +26,11 @@
 
 namespace oxygen
 {
+/** This is currently a placeholder class to comply with the 
+    inheritance tree. Once a Body class other than RigidBody has
+    been implemented, common functionality should be moved to this
+    common base class to reduce the amount of redundant code.
+*/ 
 
 class OXYGEN_API Body : public PhysicsObject
 {

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/bodycontroller_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/bodycontroller_c.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/bodycontroller_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "bodycontroller.h"
+#include <oxygen/physicsserver/bodycontroller.h>
 
 using namespace boost;
 using namespace oxygen;

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -20,12 +20,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "boxcollider.h"
+#include <oxygen/physicsserver/boxcollider.h>
 
 using namespace oxygen;
 using namespace salt;
 
-BoxCollider::BoxCollider() : Collider()
+BoxCollider::BoxCollider() : ConvexCollider()
 {
 }
 

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -23,14 +23,14 @@
 #define OXYGEN_BOXCOLLIDER_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/physicsserver/collider.h>
+#include <oxygen/physicsserver/convexcollider.h>
 
 namespace oxygen
 {
 
 /** BoxCollider encapsulates an ODE box geometry object.
  */
-class OXYGEN_API BoxCollider : public Collider
+class OXYGEN_API BoxCollider : public ConvexCollider
 {
     //
     // Functions

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider_c.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "boxcollider.h"
+#include <oxygen/physicsserver/boxcollider.h>
 
 using namespace boost;
 using namespace oxygen;
@@ -73,7 +73,7 @@
 
 void CLASS(BoxCollider)::DefineClass()
 {
-    DEFINE_BASECLASS(oxygen/Collider);
+    DEFINE_BASECLASS(oxygen/ConvexCollider);
     DEFINE_FUNCTION(setBoxLengths);
     DEFINE_FUNCTION(getBoxLength);
     DEFINE_FUNCTION(getPointDepth);

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,12 +19,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "ccylindercollider.h"
+#include <oxygen/physicsserver/ccylindercollider.h>
 
 using namespace oxygen;
 using namespace salt;
 
-CCylinderCollider::CCylinderCollider() : Collider()
+CCylinderCollider::CCylinderCollider() : ConvexCollider()
 {
 }
 

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider.h	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -23,7 +23,7 @@
 #define OXYGEN_CCYLINDERCOLLIDER_H
 
 #include <oxygen/oxygen_defines.h>
-#include "collider.h"
+#include <oxygen/physicsserver/convexcollider.h>
 
 namespace oxygen
 {
@@ -33,7 +33,7 @@
     half-sphere caps at its ends. This feature makes the internal
     collision detection code particularly fast and accurate.
  */
-class OXYGEN_API CCylinderCollider : public Collider
+class OXYGEN_API CCylinderCollider : public ConvexCollider
 {
     //
     // Functions

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider_c.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/ccylindercollider_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "ccylindercollider.h"
+#include <oxygen/physicsserver/ccylindercollider.h>
 
 using namespace oxygen;
 using namespace boost;
@@ -102,7 +102,7 @@
 
 void CLASS(CCylinderCollider)::DefineClass()
 {
-    DEFINE_BASECLASS(oxygen/Collider);
+    DEFINE_BASECLASS(oxygen/ConvexCollider);
     DEFINE_FUNCTION(setParams);
     DEFINE_FUNCTION(setRadius);
     DEFINE_FUNCTION(setLength);

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -18,14 +18,14 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "collider.h"
-#include "space.h"
-#include "rigidbody.h"
+#include <oxygen/physicsserver/collider.h>
+#include <oxygen/physicsserver/collisionhandler.h>
+#include <oxygen/physicsserver/space.h>
+#include <oxygen/physicsserver/transformcollider.h>
+#include <oxygen/physicsserver/rigidbody.h>
+#include <oxygen/sceneserver/scene.h>
 #include <zeitgeist/leaf.h>
-#include "collisionhandler.h"
-#include <oxygen/sceneserver/scene.h>
 #include <zeitgeist/logserver/logserver.h>
-#include "transformcollider.h"
 
 using namespace oxygen;
 using namespace salt;

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/collider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/collider.h	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/collider.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -23,14 +23,12 @@
 #define OXYGEN_COLLIDER_H
 
 #include <oxygen/physicsserver/physicsobject.h>
+#include <oxygen/oxygen_defines.h>
 #include <string>
 #include <set>
-#include <oxygen/oxygen_defines.h>
 
 namespace oxygen
 {
-class Space;
-class World;
 
 /** \class Collider encapsulates an ODE geometry object- geom for
     short. Geoms are the fundamental objects in the collision

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/collider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/collider_c.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/collider_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "collider.h"
+#include <oxygen/physicsserver/collider.h>
 
 using namespace oxygen;
 using namespace boost;

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/collisionhandler.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/collisionhandler.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/collisionhandler.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,12 +19,12 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "collisionhandler.h"
-#include "world.h"
-#include "space.h"
-#include "collider.h"
+#include <oxygen/physicsserver/collisionhandler.h>
+#include <oxygen/physicsserver/collider.h>
+#include <oxygen/physicsserver/world.h>
+#include <oxygen/physicsserver/space.h>
+#include <oxygen/sceneserver/scene.h>
 #include <zeitgeist/logserver/logserver.h>
-#include <oxygen/sceneserver/scene.h>
 
 using namespace oxygen;
 using namespace boost;

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/collisionhandler_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/collisionhandler_c.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/collisionhandler_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "collisionhandler.h"
+#include <oxygen/physicsserver/collisionhandler.h>
 
 using namespace oxygen;
 

Added: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,48 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2002,2003 Koblenz University
+   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+   $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef OXYGEN_COMPOUNDCOLLIDER_H
+#define OXYGEN_COMPOUNDCOLLIDER_H
+
+#include <oxygen/oxygen_defines.h>
+#include <oxygen/physicsserver/collider.h>
+
+namespace oxygen
+{
+/**
+    CompoundCollider is not yet implemented.
+*/
+
+class OXYGEN_API CompoundCollider : public Collider
+{
+    //
+    // Functions
+    //
+public:
+    CompoundCollider() : Collider(){};
+    virtual ~CompoundCollider(){};
+};
+
+DECLARE_CLASS(CompoundCollider);
+
+} //namespace oxygen
+
+#endif //OXYGEN_COMPOUNDCOLLIDER_H

Added: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,29 @@
+/* -*- mode: c++ -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2003 Koblenz University
+   $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <oxygen/physicsserver/compoundcollider.h>
+
+using namespace oxygen;
+
+void CLASS(CompoundCollider)::DefineClass()
+{
+        DEFINE_BASECLASS(oxygen/Collider);
+}

Added: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,48 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2002,2003 Koblenz University
+   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+   $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef OXYGEN_CONCAVECOLLIDER_H
+#define OXYGEN_CONCAVECOLLIDER_H
+
+#include <oxygen/oxygen_defines.h>
+#include <oxygen/physicsserver/collider.h>
+
+namespace oxygen
+{
+/**
+    ConcaveCollider is not yet implemented.
+*/
+
+class OXYGEN_API ConcaveCollider : public Collider
+{
+    //
+    // Functions
+    //
+public:
+    ConcaveCollider() : Collider(){};
+    virtual ~ConcaveCollider(){};
+};
+
+DECLARE_CLASS(ConcaveCollider);
+
+} //namespace oxygen
+
+#endif //OXYGEN_CONCAVECOLLIDER_H

Added: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,29 @@
+/* -*- mode: c++ -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2003 Koblenz University
+   $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <oxygen/physicsserver/concavecollider.h>
+
+using namespace oxygen;
+
+void CLASS(ConcaveCollider)::DefineClass()
+{
+        DEFINE_BASECLASS(oxygen/Collider);
+}

Added: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,48 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2002,2003 Koblenz University
+   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+   $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef OXYGEN_CONECOLLIDER_H
+#define OXYGEN_CONECOLLIDER_H
+
+#include <oxygen/oxygen_defines.h>
+#include <oxygen/physicsserver/convexcollider.h>
+
+namespace oxygen
+{
+/**
+    ConeCollider is not yet implemented.
+*/
+
+class OXYGEN_API ConeCollider : public ConvexCollider
+{
+    //
+    // Functions
+    //
+public:
+    ConeCollider() : ConvexCollider(){};
+    virtual ~ConeCollider(){};
+};
+
+DECLARE_CLASS(ConeCollider);
+
+} //namespace oxygen
+
+#endif //OXYGEN_CONECOLLIDER_H

Added: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,29 @@
+/* -*- mode: c++ -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2003 Koblenz University
+   $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <oxygen/physicsserver/conecollider.h>
+
+using namespace oxygen;
+
+void CLASS(ConeCollider)::DefineClass()
+{
+        DEFINE_BASECLASS(oxygen/ConvexCollider);
+}

Added: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,51 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2002,2003 Koblenz University
+   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+   $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef OXYGEN_CONETWISTJOINT_H
+#define OXYGEN_CONETWISTJOINT_H
+
+#include <oxygen/oxygen_defines.h>
+#include <oxygen/physicsserver/generic6dofjoint.h>
+
+namespace oxygen
+{
+/**
+    ConeTwistJoint is not yet implemented.
+*/
+
+class OXYGEN_API ConeTwistJoint : public Generic6DOFJoint
+{
+
+public:
+    ConeTwistJoint() : Generic6DOFJoint(){};
+    virtual ~ConeTwistJoint(){};
+    
+    //overwrite pure virtual methods inherited from Joint 
+    //to shut the compiler up
+    void SetParameter(int parameter, float value){};
+    float GetParameter(int parameter) const {};
+};
+
+DECLARE_CLASS(ConeTwistJoint);
+
+} //namespace oxygen
+
+#endif //OXYGEN_CONETWISTJOINT_H

Added: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,29 @@
+/* -*- mode: c++ -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2003 Koblenz University
+   $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <oxygen/physicsserver/conetwistjoint.h>
+
+using namespace oxygen;
+
+void CLASS(ConeTwistJoint)::DefineClass()
+{
+        DEFINE_BASECLASS(oxygen/Generic6DOFJoint);
+}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,11 +19,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "contactjointhandler.h"
-#include "collider.h"
-#include "world.h"
-#include "space.h"
-
+#include <oxygen/physicsserver/contactjointhandler.h>
+#include <oxygen/physicsserver/collider.h>
+#include <oxygen/physicsserver/space.h>
+#include <oxygen/physicsserver/world.h>
 #include <zeitgeist/logserver/logserver.h>
 
 using namespace oxygen;

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.h	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -23,7 +23,7 @@
 #define OXYGEN_CONTACTJOINTHANDLER_H
 
 #include <oxygen/oxygen_defines.h>
-#include "collisionhandler.h"
+#include <oxygen/physicsserver/collisionhandler.h>
 
 namespace oxygen
 {
@@ -153,5 +153,4 @@
 
 } //namespace oxygen
 
-
 #endif // OXYGEN_CONTACTJOINTHANDLER_H

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler_c.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "contactjointhandler.h"
+#include <oxygen/physicsserver/contactjointhandler.h>
 
 using namespace oxygen;
 

Added: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,45 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2002,2003 Koblenz University
+   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+   $Id: joint.h 107 2009-11-25 06:09:10Z a-held $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef OXYGEN_CONVEXCOLLIDER_H
+#define OXYGEN_CONVEXCOLLIDER_H
+
+#include <oxygen/oxygen_defines.h>
+#include <oxygen/physicsserver/collider.h>
+
+namespace oxygen
+{
+/** ConvexCollider is the common base class of all convex
+    geometry objects, such as spheres and boxes. 
+*/
+
+class OXYGEN_API ConvexCollider : public Collider
+{
+public:
+    ConvexCollider() : Collider(){};
+    virtual ~ConvexCollider(){};
+};
+
+DECLARE_ABSTRACTCLASS(ConvexCollider);
+
+} //namespace oxygen
+
+#endif //OXYGEN_CONVEXCOLLIDER_H

Added: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,29 @@
+/* -*- mode: c++ -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2003 Koblenz University
+   $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <oxygen/physicsserver/convexcollider.h>
+
+using namespace oxygen;
+
+void CLASS(ConvexCollider)::DefineClass()
+{
+        DEFINE_BASECLASS(oxygen/Collider);
+}

Added: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,48 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2002,2003 Koblenz University
+   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+   $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef OXYGEN_CYLINDERCOLLIDER_H
+#define OXYGEN_CYLINDERCOLLIDER_H
+
+#include <oxygen/oxygen_defines.h>
+#include <oxygen/physicsserver/convexcollider.h>
+
+namespace oxygen
+{
+/**
+    CylinderCollider is not yet implemented.
+*/
+
+class OXYGEN_API CylinderCollider : public ConvexCollider
+{
+    //
+    // Functions
+    //
+public:
+    CylinderCollider() : ConvexCollider(){};
+    virtual ~CylinderCollider(){};
+};
+
+DECLARE_CLASS(CylinderCollider);
+
+} //namespace oxygen
+
+#endif //OXYGEN_CYLINDERCOLLIDER_H

Added: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,29 @@
+/* -*- mode: c++ -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2003 Koblenz University
+   $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <oxygen/physicsserver/cylindercollider.h>
+
+using namespace oxygen;
+
+void CLASS(CylinderCollider)::DefineClass()
+{
+        DEFINE_BASECLASS(oxygen/ConvexCollider);
+}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/dragcontroller_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/dragcontroller_c.cpp	2009-11-25 06:09:10 UTC (rev 107)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/dragcontroller_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "dragcontroller.h"
+#include <oxygen/physicsserver/dragcontroller.h>
 
 using namespace oxygen;
 

Added: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,48 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2002,2003 Koblenz University
+   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+   $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef OXYGEN_DYNAMICBODY_H
+#define OXYGEN_DYNAMICBODY_H
+
+#include <oxygen/oxygen_defines.h>
+#include <oxygen/physicsserver/body.h>
+
+namespace oxygen
+{
+/**
+    DynamicBody is not yet implemented.
+*/
+
+class OXYGEN_API DynamicBody : public Body
+{
+    //
+    // Functions
+    //
+public:
+    DynamicBody() : Body(){};
+    virtual ~DynamicBody(){};
+};
+
+DECLARE_CLASS(DynamicBody);
+
+} //namespace oxygen
+
+#endif //OXYGEN_DYNAMICBODY_H

Added: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,29 @@
+/* -*- mode: c++ -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2003 Koblenz University
+   $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <oxygen/physicsserver/dynamicbody.h>
+
+using namespace oxygen;
+
+void CLASS(DynamicBody)::DefineClass()
+{
+        DEFINE_BASECLASS(oxygen/Body);
+}

Added: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,48 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2002,2003 Koblenz University
+   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+   $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef OXYGEN_EMPTYCOLLIDER_H
+#define OXYGEN_EMPTYCOLLIDER_H
+
+#include <oxygen/oxygen_defines.h>
+#include <oxygen/physicsserver/collider.h>
+
+namespace oxygen
+{
+/**
+    EmptyCollider is not yet implemented.
+*/
+
+class OXYGEN_API EmptyCollider : public Collider
+{
+    //
+    // Functions
+    //
+public:
+    EmptyCollider() : Collider(){};
+    virtual ~EmptyCollider(){};
+};
+
+DECLARE_CLASS(EmptyCollider);
+
+} //namespace oxygen
+
+#endif //OXYGEN_EMPTYCOLLIDER_H

Added: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp	2009-11-25 10:20:10 UTC (rev 108)
@@ -0,0 +1,29 @@
+/* -*- mode: c++ -*-
+
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2003 Koblenz University
+   $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See t...
 
[truncated message content]