Changeset 4762 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jul 2, 2005, 1:34:42 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: PhysicsInterface should now make a usefull cast: PhysicsInterface→BaseObject→PNode()

Location:

orxonox/trunk/src/lib

Files:

• particles/particle_system.cc (modified) (2 diffs)
• physics/physics_interface.cc (modified) (3 diffs)
• physics/physics_interface.h (modified) (2 diffs)

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -39 +39 @@
    \param type The Type of the ParticleSystem
 */
-ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type) : PhysicsInterface(this)
+ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
 {
   this->init();
@@ -51 +51 @@
   \param root: the XML-element to load from
  */
-ParticleSystem::ParticleSystem(const TiXmlElement* root) : PhysicsInterface(this)
+ParticleSystem::ParticleSystem(const TiXmlElement* root)
 {
   this->init();

orxonox/trunk/src/lib/physics/physics_interface.cc

@@ -36 +36 @@
    \brief standard constructor
  */
-PhysicsInterface::PhysicsInterface (void* objectPointer)
+PhysicsInterface::PhysicsInterface ()
 {
   this->setClassID(CL_PHYSICS_INTERFACE, "PhysicsInterface");
-  this->objectPointer = objectPointer;
 
   this->mass = 1;
@@ -96 +95 @@
 void PhysicsInterface::applyField(Field* field)
 {
-  PNode* tmp = (PNode*) objectPointer;
+  PNode* tmp = dynamic_cast<PNode*>((BaseObject*)this);
   this->forceSum += field->calcForce(tmp->getAbsCoor());
   this->bForceApplied = true;
@@ -108 +107 @@
 {
   //  Vector acc = this->forceSum / ( this->massChildren + this->mass );
-  PNode* coorTick =  (PNode*)(this->objectPointer);
+  PNode* coorTick =  dynamic_cast<PNode*>((BaseObject*)this);
   if (this->bForceApplied && coorTick)
   {

orxonox/trunk/src/lib/physics/physics_interface.h

@@ -29 +29 @@
 {
  public:
-  PhysicsInterface(void* objectPointer);
+  PhysicsInterface();
   virtual ~PhysicsInterface();
   /** \param mass the mass to set for this node. */
@@ -46 +46 @@
 
  private:
-  void*          objectPointer;         //!< A Pointer to the object we handel (actually should be this)
-
-
   float          mass;                  //!< Mass of this object
   float          massChildren;          //!< Sum of the masses of the children nodes