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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 165
          http://simspark.svn.sourceforge.net/simspark/?rev=165&view=rev
Author:   a-held
Date:     2010-02-17 05:04:55 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
Undo changes made to physicsserver made in r164 and r163
implemented first and thought later. Sorry :-(

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/int/angularmotorint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/staticbodyint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/universaljointint.h
    branches/multiphys/spark/lib/oxygen/physicsserver/int/worldint.h

Removed Paths:
-------------
    branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/spherecolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/staticbodyint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/transformcolliderint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/universaljointint_c.cpp
    branches/multiphys/spark/lib/oxygen/physicsserver/int/worldint_c.cpp

Modified: branches/multiphys/spark/lib/oxygen/CMakeLists.txt
===================================================================

--- branches/multiphys/spark/lib/oxygen/CMakeLists.txt	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/CMakeLists.txt	2010-02-17 05:04:55 UTC (rev 165)
@@ -265,44 +265,8 @@
     physicsserver/hinge2joint.cpp
     physicsserver/hinge2joint_c.cpp
     physicsserver/angularmotor.cpp
-    physicsserver/angularmotor_c.cpp
+    physicsserver/angularmotor_c.cpp    
     
-    #interfaces
-    physicsserver/int/angularmotorint_c.cpp
-    physicsserver/int/balljointint_c.cpp
-    physicsserver/int/bodyint_c.cpp
-    physicsserver/int/boxcolliderint_c.cpp
-    physicsserver/int/capsulecolliderint_c.cpp
-    physicsserver/int/colliderint_c.cpp
-    physicsserver/int/compoundcolliderint_c.cpp
-    physicsserver/int/concavecolliderint_c.cpp
-    physicsserver/int/conecolliderint_c.cpp
-    physicsserver/int/conetwistjointint_c.cpp
-    physicsserver/int/contactjointhandlerint_c.cpp
-    physicsserver/int/convexcolliderint_c.cpp
-    physicsserver/int/cylindercolliderint_c.cpp
-    physicsserver/int/dynamicbodyint_c.cpp
-    physicsserver/int/emptycolliderint_c.cpp
-    physicsserver/int/fixedjointint_c.cpp
-    physicsserver/int/generic6dofjointint_c.cpp
-    physicsserver/int/hinge2jointint_c.cpp
-    physicsserver/int/hingejointint_c.cpp
-    physicsserver/int/jointint_c.cpp
-    physicsserver/int/physicsobjectint_c.cpp
-    physicsserver/int/physicsserverint_c.cpp
-    physicsserver/int/planecolliderint_c.cpp
-    physicsserver/int/raycolliderint_c.cpp
-    physicsserver/int/rigidbodyint_c.cpp
-    physicsserver/int/sliderjointint_c.cpp
-    physicsserver/int/softbodyint_c.cpp
-    physicsserver/int/spaceint_c.cpp
-    physicsserver/int/spherecolliderint_c.cpp
-    physicsserver/int/staticbodyint_c.cpp
-    physicsserver/int/transformcolliderint_c.cpp
-    physicsserver/int/universaljointint_c.cpp
-    physicsserver/int/worldint_c.cpp
-    
-    
     #ODE-specific files
     physicsserver/ode/odeangularmotor.cpp
     physicsserver/ode/odeballjoint.cpp

Modified: branches/multiphys/spark/lib/oxygen/oxygen.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/oxygen.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/oxygen.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -94,41 +94,6 @@
     zg.GetCore()->RegisterClassObject(new CLASS(CollisionHandler), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(ContactJointHandler), "oxygen/");
     zg.GetCore()->RegisterClassObject(new CLASS(RecorderHandler), "oxygen/");
-    
-    // implementations
-    zg.GetCore()->RegisterClassObject(new CLASS(AngularMotorInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(BallJointInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(BodyInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(BoxColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(CapsuleColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(ColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(CompoundColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(ConcaveColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(ConeColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(ConeTwistJointInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(ContactJointHandlerInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(ConvexColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(CylinderColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(DynamicBodyInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(EmptyColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(FixedJointInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(Generic6DOFJointInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(Hinge2JointInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(HingeJointInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(JointInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(PhysicsObjectInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(PhysicsServerInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(PlaneColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(RayColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(RigidBodyInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(SliderJointInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(SoftBodyInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(SpaceInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(SphereColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(StaticBodyInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(TransformColliderInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(UniversalJointInt), "oxygen/");
-    zg.GetCore()->RegisterClassObject(new CLASS(WorldInt), "oxygen/");
 
     // agentaspect
     zg.GetCore()->RegisterClassObject(new CLASS(AgentAspect), "oxygen/");

Modified: branches/multiphys/spark/lib/oxygen/oxygen.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/oxygen.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/oxygen.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -74,42 +74,6 @@
 #include <oxygen/physicsserver/universaljoint.h>
 #include <oxygen/physicsserver/hinge2joint.h>
 
-//implementations
-#include <oxygen/physicsserver/int/angularmotorint.h>
-#include <oxygen/physicsserver/int/balljointint.h>
-#include <oxygen/physicsserver/int/bodyint.h>
-#include <oxygen/physicsserver/int/boxcolliderint.h>
-#include <oxygen/physicsserver/int/capsulecolliderint.h>
-#include <oxygen/physicsserver/int/colliderint.h>
-#include <oxygen/physicsserver/int/compoundcolliderint.h>
-#include <oxygen/physicsserver/int/concavecolliderint.h>
-#include <oxygen/physicsserver/int/conecolliderint.h>
-#include <oxygen/physicsserver/int/conetwistjointint.h>
-#include <oxygen/physicsserver/int/contactjointhandlerint.h>
-#include <oxygen/physicsserver/int/convexcolliderint.h>
-#include <oxygen/physicsserver/int/cylindercolliderint.h>
-#include <oxygen/physicsserver/int/dynamicbodyint.h>
-#include <oxygen/physicsserver/int/emptycolliderint.h>
-#include <oxygen/physicsserver/int/fixedjointint.h>
-#include <oxygen/physicsserver/int/generic6dofjointint.h>
-#include <oxygen/physicsserver/int/hinge2jointint.h>
-#include <oxygen/physicsserver/int/hingejointint.h>
-#include <oxygen/physicsserver/int/jointint.h>
-#include <oxygen/physicsserver/int/physicsobjectint.h>
-#include <oxygen/physicsserver/int/physicsserverint.h>
-#include <oxygen/physicsserver/int/planecolliderint.h>
-#include <oxygen/physicsserver/int/raycolliderint.h>
-#include <oxygen/physicsserver/int/rigidbodyint.h>
-#include <oxygen/physicsserver/int/sliderjointint.h>
-#include <oxygen/physicsserver/int/softbodyint.h>
-#include <oxygen/physicsserver/int/spaceint.h>
-#include <oxygen/physicsserver/int/spherecolliderint.h>
-#include <oxygen/physicsserver/int/staticbodyint.h>
-#include <oxygen/physicsserver/int/transformcolliderint.h>
-#include <oxygen/physicsserver/int/universaljointint.h>
-#include <oxygen/physicsserver/int/worldint.h>
-
-
 #include <oxygen/sceneserver/basenode.h>
 #include <oxygen/sceneserver/camera.h>
 #include <oxygen/sceneserver/fpscontroller.h>

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -25,7 +25,6 @@
 
 #include <salt/vector.h>
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
@@ -38,7 +37,7 @@
     rotation about those axes.
 */
 
-class OXYGEN_API AngularMotorInt : public BaseNode
+class OXYGEN_API AngularMotorInt
 {
 public:
     /** Creates a new angular motor within the physics world specified
@@ -107,8 +106,6 @@
     virtual float GetAxisAngleRate(int idx, long jointID) = 0;
 };
 
-DECLARE_ABSTRACTCLASS(AngularMotorInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_ANGULARMOTORINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/angularmotorint.h>
-
-using namespace oxygen;
-
-void CLASS(AngularMotorInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -25,14 +25,13 @@
 
 #include <salt/vector.h>
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 class RigidBody;
 class Joint;
 
-class OXYGEN_API BallJointInt : public BaseNode
+class OXYGEN_API BallJointInt
 {
 public:    
 
@@ -60,8 +59,6 @@
     virtual long CreateBallJoint(long worldID) =  0;
 };
 
-DECLARE_ABSTRACTCLASS(BallJointInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_BALLJOINTINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/balljointint.h>
-
-using namespace oxygen;
-
-void CLASS(BallJointInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_BODYINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API BodyInt : public BaseNode
+class OXYGEN_API BodyInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_ABSTRACTCLASS(BodyInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_BODYINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/bodyint.h>
-
-using namespace oxygen;
-
-void CLASS(BodyInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -25,12 +25,11 @@
 
 #include <salt/vector.h>
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API BoxColliderInt : public BaseNode
+class OXYGEN_API BoxColliderInt
 {
 
 public:    
@@ -51,8 +50,6 @@
     virtual long CreateBox() = 0;
 };
 
-DECLARE_ABSTRACTCLASS(BoxColliderInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_BOXCOLLIDERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/boxcolliderint.h>
-
-using namespace oxygen;
-
-void CLASS(BoxColliderInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,13 +24,12 @@
 #define OXYGEN_CAPSULECOLLIDERINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 #include <salt/vector.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API CapsuleColliderInt : public BaseNode
+class OXYGEN_API CapsuleColliderInt
 {
 public:
 
@@ -67,8 +66,6 @@
     virtual long CreateCapsule() = 0;
 };
 
-DECLARE_ABSTRACTCLASS(CapsuleColliderInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_CAPSULECOLLIDERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/capsulecolliderint.h>
-
-using namespace oxygen;
-
-void CLASS(CapsuleColliderInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,7 +24,6 @@
 #define OXYGEN_COLLIDERINT_H
 
 #include <oxygen/physicsserver/ode/odewrapper.h>
-#include <oxygen/sceneserver/basenode.h>
 #include <oxygen/oxygen_defines.h>
 #include <salt/matrix.h>
 #include <set>
@@ -34,7 +33,7 @@
 {
 class Collider;
 
-class OXYGEN_API ColliderInt : public BaseNode
+class OXYGEN_API ColliderInt
 {
 
 public:
@@ -96,8 +95,6 @@
     virtual void RemoveFromSpace(long geomID, long spaceID) = 0;
 };
 
-DECLARE_ABSTRACTCLASS(ColliderInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_COLLIDERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/colliderint.h>
-
-using namespace oxygen;
-
-void CLASS(ColliderInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_COMPOUNDCOLLIDERINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API CompoundColliderInt : public BaseNode
+class OXYGEN_API CompoundColliderInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_ABSTRACTCLASS(CompoundColliderInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_COMPOUNDCOLLIDERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/compoundcolliderint.h>
-
-using namespace oxygen;
-
-void CLASS(CompoundColliderInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_CONCAVECOLLIDERINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API ConcaveColliderInt : public BaseNode
+class OXYGEN_API ConcaveColliderInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_ABSTRACTCLASS(ConcaveColliderInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_CONCAVECOLLIDERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/concavecolliderint.h>
-
-using namespace oxygen;
-
-void CLASS(ConcaveColliderInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_CONECOLLIDERINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API ConeColliderInt : public BaseNode
+class OXYGEN_API ConeColliderInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_CLASS(ConeColliderInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_CONECOLLIDERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/conecolliderint.h>
-
-using namespace oxygen;
-
-void CLASS(ConeColliderInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_CONETWISTJOINTINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API ConeTwistJointInt : public BaseNode
+class OXYGEN_API ConeTwistJointInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_ABSTRACTCLASS(ConeTwistJointInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_CONETWISTJOINTINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/conetwistjointint.h>
-
-using namespace oxygen;
-
-void CLASS(ConeTwistJointInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,14 +24,14 @@
 #define OXYGEN_CONTACTJOINTHANDLERINT_H
 
 #include <oxygen/physicsserver/ode/odewrapper.h>
-#include <oxygen/sceneserver/basenode.h>
+
 #include <oxygen/oxygen_defines.h>
 #include <oxygen/physicsserver/genericphysicsobjects.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API ContactJointHandlerInt : public BaseNode
+class OXYGEN_API ContactJointHandlerInt
 {
 public:    
     /** Returns a pointer to a SurfaceParameter class whose values were initialized
@@ -135,8 +135,6 @@
     virtual float MixValues(const float v1, const float v2, const int n) const = 0;
 };
 
-DECLARE_ABSTRACTCLASS(ContactJointHandlerInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_CONTACTJOINTHANDLERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/contactjointhandlerint.h>
-
-using namespace oxygen;
-
-void CLASS(ContactJointHandlerInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_CONVEXCOLLIDERINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API ConvexColliderInt : public BaseNode
+class OXYGEN_API ConvexColliderInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_CLASS(ConvexColliderInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_CONVEXCOLLIDERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/convexcolliderint.h>
-
-using namespace oxygen;
-
-void CLASS(ConvexColliderInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_CYLINDERCOLLIDERINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API CylinderColliderInt : public BaseNode
+class OXYGEN_API CylinderColliderInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_CLASS(CylinderColliderInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_CYLINDERCOLLIDERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/cylindercolliderint.h>
-
-using namespace oxygen;
-
-void CLASS(CylinderColliderInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_DYNAMICBODYINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API DynamicBodyInt : public BaseNode
+class OXYGEN_API DynamicBodyInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_CLASS(DynamicBodyInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_DYNAMICBODYINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/dynamicbodyint.h>
-
-using namespace oxygen;
-
-void CLASS(DynamicBodyInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_EMPTYCOLLIDERINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API EmptyColliderInt : public BaseNode
+class OXYGEN_API EmptyColliderInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_ABSTRACTCLASS(EmptyColliderInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_EMPTYCOLLIDERINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/emptycolliderint.h>
-
-using namespace oxygen;
-
-void CLASS(EmptyColliderInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -21,12 +21,10 @@
 #define OXYGEN_FIXEDJOINTINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen{
 
-class OXYGEN_API FixedJointInt : public BaseNode
-{
+class OXYGEN_API FixedJointInt{
 
 public:
     /** Creates a fixed joint within the physics world specified 
@@ -40,8 +38,6 @@
     virtual void SetFixed(long jointID) = 0;
 };
 
-DECLARE_ABSTRACTCLASS(FixedJointInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_FIXEDJOINTINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/fixedjointint.h>
-
-using namespace oxygen;
-
-void CLASS(FixedJointInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -24,18 +24,15 @@
 #define OXYGEN_GENERIC6DOFJOINTINT_H
 
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API Generic6DOFJointInt : public BaseNode
+class OXYGEN_API Generic6DOFJointInt
 {
     /** This class is currently not implemented. */
 };
 
-DECLARE_ABSTRACTCLASS(Generic6DOFJointInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_GENERIC6DOFJOINTINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/generic6dofjointint.h>
-
-using namespace oxygen;
-
-void CLASS(Generic6DOFJointInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -21,13 +21,11 @@
 #define OXYGEN_HINGE2JOINTINT_H
 
 #include <salt/vector.h>
-#include <oxygen/sceneserver/basenode.h>
 #include <oxygen/oxygen_defines.h>
 
 namespace oxygen{
 
-class OXYGEN_API Hinge2JointInt : public BaseNode
-{
+class OXYGEN_API Hinge2JointInt{
 
 public:
     /** Creates a hinge2joint within the physics world specified 
@@ -69,8 +67,6 @@
     virtual float GetAngleRate2(long jointID) = 0;
 };
 
-DECLARE_ABSTRACTCLASS(Hinge2JointInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_HINGE2JOINTINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/hinge2jointint.h>
-
-using namespace oxygen;
-
-void CLASS(Hinge2JointInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -22,12 +22,10 @@
 
 #include <salt/vector.h>
 #include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen{
 
-class OXYGEN_API HingeJointInt : public BaseNode
-{
+class OXYGEN_API HingeJointInt{
 
 public:
     /** Creates a new hingejoint within the physics world specified
@@ -71,8 +69,6 @@
     virtual float GetAngleRate(long jointID) const = 0;
 };
 
-DECLARE_ABSTRACTCLASS(HingeJointInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_HINGEJOINTINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/hingejointint.h>
-
-using namespace oxygen;
-
-void CLASS(HingeJointInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -25,7 +25,6 @@
 
 #include <oxygen/physicsserver/genericphysicsobjects.h>
 #include <oxygen/physicsserver/ode/odewrapper.h>
-#include <oxygen/sceneserver/basenode.h>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <salt/vector.h>
 #include <oxygen/oxygen_defines.h>
@@ -36,9 +35,8 @@
 class RigidBody;
 class Joint;
 
-class OXYGEN_API JointInt : public BaseNode
+class OXYGEN_API JointInt
 {
-
 public:
     /** Returns a pointer to the Joint object that manages the joint
         specified by \param jointID.
@@ -245,8 +243,6 @@
     virtual void OnLink(long jointID, Joint* joint) = 0;
 };
 
-DECLARE_ABSTRACTCLASS(JointInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_JOINTINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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/int/jointint.h>
-
-using namespace oxygen;
-
-void CLASS(JointInt)::DefineClass()
-{
-        DEFINE_BASECLASS(oxygen/BaseNode);
-}

Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h	2010-02-17 05:04:55 UTC (rev 165)
@@ -27,12 +27,11 @@
 #include <salt/matrix.h>
 #include <oxygen/oxygen_defines.h>
 #include <oxygen/physicsserver/genericphysicsobjects.h>
-#include <oxygen/sceneserver/basenode.h>
 
 namespace oxygen
 {
 
-class OXYGEN_API PhysicsObjectInt : public BaseNode
+class OXYGEN_API PhysicsObjectInt
 {
 
 public:    
@@ -45,8 +44,6 @@
     virtual void ConvertRotationMatrix(const GenericPhysicsMatrix* matrix, salt::Matrix& rot) const = 0;
 };
 
-DECLARE_ABSTRACTCLASS(PhysicsObjectInt);
-
 } //namespace oxygen
 
 #endif //OXYGEN_PHYSICSOBJECTINT_H

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint_c.cpp	2010-02-16 04:21:16 UTC (rev 164)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint_c.cpp	2010-02-17 05:04:55 UTC (rev 165)
@@ -1,29 +0,0 @@
-/* -*- 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 ...
 
[truncated message content]