Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[163] branches/multiphys/spark/lib
|
From: <a-...@us...> - 2010-02-15 05:00:29
|
Revision: 163
http://simspark.svn.sourceforge.net/simspark/?rev=163&view=rev
Author: a-held
Date: 2010-02-15 05:00:21 +0000 (Mon, 15 Feb 2010)
Log Message:
-----------
Derive all Interfaces from BaseNode and register them with Zeitgeist
Modified Paths:
--------------
branches/multiphys/spark/lib/kerosin/renderserver/renderserver.cpp
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
Modified: branches/multiphys/spark/lib/kerosin/renderserver/renderserver.cpp
===================================================================
--- branches/multiphys/spark/lib/kerosin/renderserver/renderserver.cpp 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/kerosin/renderserver/renderserver.cpp 2010-02-15 05:00:21 UTC (rev 163)
@@ -23,7 +23,6 @@
#include <oxygen/sceneserver/sceneserver.h>
#include <oxygen/sceneserver/scene.h>
#include <oxygen/sceneserver/camera.h>
-#include <oxygen/physicsserver/spherecollider.h>
#include <kerosin/openglserver/openglwrapper.h>
#include <kerosin/sceneserver/staticmesh.h>
#include <kerosin/sceneserver/light.h>
@@ -250,13 +249,6 @@
void
RenderServer::RenderScene(boost::shared_ptr<BaseNode> node, unsigned pass)
{
-#if 0
- shared_ptr<SphereCollider> collider = shared_dynamic_cast<SphereCollider>(node);
- if (collider != 0)
- {
- std::cerr << "RenderScene (spherecollider radius: " << collider->GetRadius() << ")\n";
- }
-#endif
shared_ptr<RenderNode> renderNode = shared_dynamic_cast<RenderNode>(node);
if (renderNode.get() != 0 &&
((pass == 0 && !renderNode->IsTransparent()) || (pass == 1 && renderNode->IsTransparent()))
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -25,6 +25,7 @@
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
@@ -37,7 +38,7 @@
rotation about those axes.
*/
-class OXYGEN_API AngularMotorInt
+class OXYGEN_API AngularMotorInt : public BaseNode
{
public:
/** Creates a new angular motor within the physics world specified
@@ -106,6 +107,8 @@
virtual float GetAxisAngleRate(int idx, long jointID) = 0;
};
+DECLARE_ABSTRACTCLASS(AngularMotorInt);
+
} //namespace oxygen
#endif //OXYGEN_ANGULARMOTORINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -25,13 +25,14 @@
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
class RigidBody;
class Joint;
-class OXYGEN_API BallJointInt
+class OXYGEN_API BallJointInt : public BaseNode
{
public:
@@ -59,6 +60,8 @@
virtual long CreateBallJoint(long worldID) = 0;
};
+DECLARE_ABSTRACTCLASS(BallJointInt);
+
} //namespace oxygen
#endif //OXYGEN_BALLJOINTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_BODYINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API BodyInt
+class OXYGEN_API BodyInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_ABSTRACTCLASS(BodyInt);
+
} //namespace oxygen
#endif //OXYGEN_BODYINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -25,11 +25,12 @@
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API BoxColliderInt
+class OXYGEN_API BoxColliderInt : public BaseNode
{
public:
@@ -50,6 +51,8 @@
virtual long CreateBox() = 0;
};
+DECLARE_ABSTRACTCLASS(BoxColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_BOXCOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,12 +24,13 @@
#define OXYGEN_CAPSULECOLLIDERINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
#include <salt/vector.h>
namespace oxygen
{
-class OXYGEN_API CapsuleColliderInt
+class OXYGEN_API CapsuleColliderInt : public BaseNode
{
public:
@@ -66,6 +67,8 @@
virtual long CreateCapsule() = 0;
};
+DECLARE_ABSTRACTCLASS(CapsuleColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_CAPSULECOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,6 +24,7 @@
#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>
@@ -33,7 +34,7 @@
{
class Collider;
-class OXYGEN_API ColliderInt
+class OXYGEN_API ColliderInt : public BaseNode
{
public:
@@ -95,6 +96,8 @@
virtual void RemoveFromSpace(long geomID, long spaceID) = 0;
};
+DECLARE_ABSTRACTCLASS(ColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_COLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_COMPOUNDCOLLIDERINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API CompoundColliderInt
+class OXYGEN_API CompoundColliderInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_ABSTRACTCLASS(CompoundColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_COMPOUNDCOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_CONCAVECOLLIDERINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API ConcaveColliderInt
+class OXYGEN_API ConcaveColliderInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_ABSTRACTCLASS(ConcaveColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_CONCAVECOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_CONECOLLIDERINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API ConeColliderInt
+class OXYGEN_API ConeColliderInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_CLASS(ConeColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_CONECOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_CONETWISTJOINTINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API ConeTwistJointInt
+class OXYGEN_API ConeTwistJointInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_ABSTRACTCLASS(ConeTwistJointInt);
+
} //namespace oxygen
#endif //OXYGEN_CONETWISTJOINTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -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
+class OXYGEN_API ContactJointHandlerInt : public BaseNode
{
public:
/** Returns a pointer to a SurfaceParameter class whose values were initialized
@@ -135,6 +135,8 @@
virtual float MixValues(const float v1, const float v2, const int n) const = 0;
};
+DECLARE_ABSTRACTCLASS(ContactJointHandlerInt);
+
} //namespace oxygen
#endif //OXYGEN_CONTACTJOINTHANDLERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_CONVEXCOLLIDERINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API ConvexColliderInt
+class OXYGEN_API ConvexColliderInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_CLASS(ConvexColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_CONVEXCOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_CYLINDERCOLLIDERINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API CylinderColliderInt
+class OXYGEN_API CylinderColliderInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_CLASS(CylinderColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_CYLINDERCOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_DYNAMICBODYINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API DynamicBodyInt
+class OXYGEN_API DynamicBodyInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_CLASS(DynamicBodyInt);
+
} //namespace oxygen
#endif //OXYGEN_DYNAMICBODYINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_EMPTYCOLLIDERINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API EmptyColliderInt
+class OXYGEN_API EmptyColliderInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_ABSTRACTCLASS(EmptyColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_EMPTYCOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -21,10 +21,12 @@
#define OXYGEN_FIXEDJOINTINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen{
-class OXYGEN_API FixedJointInt{
+class OXYGEN_API FixedJointInt : public BaseNode
+{
public:
/** Creates a fixed joint within the physics world specified
@@ -38,6 +40,8 @@
virtual void SetFixed(long jointID) = 0;
};
+DECLARE_ABSTRACTCLASS(FixedJointInt);
+
} //namespace oxygen
#endif //OXYGEN_FIXEDJOINTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_GENERIC6DOFJOINTINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API Generic6DOFJointInt
+class OXYGEN_API Generic6DOFJointInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_ABSTRACTCLASS(Generic6DOFJointInt);
+
} //namespace oxygen
#endif //OXYGEN_GENERIC6DOFJOINTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -21,11 +21,13 @@
#define OXYGEN_HINGE2JOINTINT_H
#include <salt/vector.h>
+#include <oxygen/sceneserver/basenode.h>
#include <oxygen/oxygen_defines.h>
namespace oxygen{
-class OXYGEN_API Hinge2JointInt{
+class OXYGEN_API Hinge2JointInt : public BaseNode
+{
public:
/** Creates a hinge2joint within the physics world specified
@@ -67,6 +69,8 @@
virtual float GetAngleRate2(long jointID) = 0;
};
+DECLARE_ABSTRACTCLASS(Hinge2JointInt);
+
} //namespace oxygen
#endif //OXYGEN_HINGE2JOINTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -22,10 +22,12 @@
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen{
-class OXYGEN_API HingeJointInt{
+class OXYGEN_API HingeJointInt : public BaseNode
+{
public:
/** Creates a new hingejoint within the physics world specified
@@ -69,6 +71,8 @@
virtual float GetAngleRate(long jointID) const = 0;
};
+DECLARE_ABSTRACTCLASS(HingeJointInt);
+
} //namespace oxygen
#endif //OXYGEN_HINGEJOINTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -25,6 +25,7 @@
#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>
@@ -35,8 +36,9 @@
class RigidBody;
class Joint;
-class OXYGEN_API JointInt
+class OXYGEN_API JointInt : public BaseNode
{
+
public:
/** Returns a pointer to the Joint object that manages the joint
specified by \param jointID.
@@ -243,6 +245,8 @@
virtual void OnLink(long jointID, Joint* joint) = 0;
};
+DECLARE_ABSTRACTCLASS(JointInt);
+
} //namespace oxygen
#endif //OXYGEN_JOINTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -27,11 +27,12 @@
#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
+class OXYGEN_API PhysicsObjectInt : public BaseNode
{
public:
@@ -44,6 +45,8 @@
virtual void ConvertRotationMatrix(const GenericPhysicsMatrix* matrix, salt::Matrix& rot) const = 0;
};
+DECLARE_ABSTRACTCLASS(PhysicsObjectInt);
+
} //namespace oxygen
#endif //OXYGEN_PHYSICSOBJECTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_PHYSICSSERVERINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API PhysicsServerInt
+class OXYGEN_API PhysicsServerInt : public BaseNode
{
};
+DECLARE_ABSTRACTCLASS(PhysicsServerInt);
+
} //namespace oxygen
#endif //OXYGEN_PHYSICSSERVERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -26,11 +26,12 @@
#include <salt/matrix.h>
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API PlaneColliderInt
+class OXYGEN_API PlaneColliderInt : public BaseNode
{
public:
/** sets the parameters of the plane equation a*x+b*y+c*z = d ,
@@ -54,6 +55,8 @@
virtual long CreatePlane() = 0;
};
+DECLARE_ABSTRACTCLASS(PlaneColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_PLANECOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -25,11 +25,12 @@
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API RayColliderInt
+class OXYGEN_API RayColliderInt : public BaseNode
{
/** RayCollider encapsulates an ODE ray geometry "object".
@@ -52,6 +53,8 @@
virtual long CreateRay() = 0;
};
+DECLARE_ABSTRACTCLASS(RayColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_RAYCOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -25,12 +25,13 @@
#include <oxygen/oxygen_defines.h>
#include <oxygen/physicsserver/genericphysicsobjects.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
class RigidBody;
-class OXYGEN_API RigidBodyInt
+class OXYGEN_API RigidBodyInt : public BaseNode
{
public:
@@ -249,6 +250,8 @@
virtual long CreateBody(long worldID) = 0;
};
+DECLARE_ABSTRACTCLASS(RigidBodyInt);
+
} //namespace oxygen
#endif //OXYGEN_RIGIDBODYINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -25,12 +25,13 @@
#include <boost/smart_ptr/shared_ptr.hpp>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
class RigidBody;
-class OXYGEN_API SliderJointInt
+class OXYGEN_API SliderJointInt : public BaseNode
{
public:
/** Creates a Slider Joint within the given world */
@@ -50,6 +51,8 @@
virtual void SetSliderAxis(salt::Vector3f& up, long jointID) = 0;
};
+DECLARE_ABSTRACTCLASS(SliderJointInt);
+
} //namespace oxygen
#endif //OXYGEN_SLIDERJOINTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_SOFTBODYINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API SoftBodyInt
+class OXYGEN_API SoftBodyInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_ABSTRACTCLASS(SoftBodyInt);
+
} //namespace oxygen
#endif //OXYGEN_SOFTBODYINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -26,6 +26,7 @@
#include <set>
#include <oxygen/oxygen_defines.h>
#include <oxygen/physicsserver/genericphysicsobjects.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
@@ -34,7 +35,7 @@
class Collider;
class Space;
-class OXYGEN_API SpaceInt
+class OXYGEN_API SpaceInt : public BaseNode
{
public:
@@ -89,6 +90,8 @@
long geomID1, long geomID2) = 0;
};
+DECLARE_ABSTRACTCLASS(SpaceInt);
+
} //namespace oxygen
#endif //OXYGEN_SPACEINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/spherecolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/spherecolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -25,11 +25,12 @@
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/physicsserver/spherecollider.h>
namespace oxygen
{
-class OXYGEN_API SphereColliderInt
+class OXYGEN_API SphereColliderInt : public BaseNode
{
public:
@@ -50,6 +51,8 @@
virtual long CreateSphere() = 0;
};
+DECLARE_ABSTRACTCLASS(SphereColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_SPHERECOLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/staticbodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/staticbodyint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/staticbodyint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,15 +24,18 @@
#define OXYGEN_STATICBODYINT_H
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API StaticBodyInt
+class OXYGEN_API StaticBodyInt : public BaseNode
{
/** This class is currently not implemented. */
};
+DECLARE_ABSTRACTCLASS(StaticBodyInt);
+
} //namespace oxygen
#endif //OXYGEN_STATICBODYINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/transformcolliderint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/transformcolliderint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,6 +24,7 @@
#define OXYGEN_TRANSFORMCOLLIDERINT_H
#include <oxygen/physicsserver/ode/odewrapper.h>
+#include <oxygen/sceneserver/basenode.h>
#include <oxygen/oxygen_defines.h>
#include <set>
#include <string>
@@ -31,7 +32,7 @@
namespace oxygen
{
-class OXYGEN_API TransformColliderInt
+class OXYGEN_API TransformColliderInt : public BaseNode
{
/** TransformCollider encapsulates a transform geometry object
that encapsulates another geom. It allows the encapsulated geom to
@@ -59,6 +60,8 @@
virtual void SetColliderParameters(int cleanup, int info, long geomID) = 0;
};
+DECLARE_ABSTRACTCLASS(TransformColliderInt);
+
} //namespace oxygen
#endif //OXYGEN_COLLIDERINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/universaljointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/universaljointint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/universaljointint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -25,11 +25,12 @@
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API UniversalJointInt
+class OXYGEN_API UniversalJointInt : public BaseNode
{
public:
@@ -95,6 +96,8 @@
virtual float GetAngleRate2(long jointID) const = 0;
};
+DECLARE_ABSTRACTCLASS(UniversalJointInt);
+
} //namespace oxygen
#endif //OXYGEN_UNIVERSALJOINTINT_H
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/worldint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/worldint.h 2010-02-10 03:50:40 UTC (rev 162)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/worldint.h 2010-02-15 05:00:21 UTC (rev 163)
@@ -24,11 +24,12 @@
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
+#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
-class OXYGEN_API WorldInt
+class OXYGEN_API WorldInt : public BaseNode
{
/** World encapsulates a world object. It is a container for
rigid bodies and joints. Objects in different worlds can not
@@ -100,6 +101,8 @@
virtual void DestroyWorld(long worldID) = 0;
};
+DECLARE_ABSTRACTCLASS(WorldInt);
+
}
#endif //OXYGEN_WORLDINT_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
